Version bump; remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

3 files changed, 27 insertions, 23 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 85dc6c456c3f..3ee22b6cdeae 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.617 2014/06/18 20:44:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.618 2014/07/18 16:04:42 dilfridge Exp $
+
+*cups-1.7.4 (18 Jul 2014)
+
+  18 Jul 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.1-r2.ebuild,
+  +cups-1.7.4.ebuild:
+  Version bump; remove old
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
   cups-1.7.3.ebuild, cups-9999.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9add1766ab69..5ef409aa78c8 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -11,28 +11,27 @@ AUX cups-1.7.3-noavahi.patch 1400 SHA256 63e1e2b2cf7c86eef9d39553873b157d66800d5
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
 DIST cups-1.7.1-source.tar.bz2 8738002 SHA256 f52bec893d9daf92b6029be79c07e6c516b4c85ffae3e6e01885cc85e9081681 SHA512 e52f98f00e8b2c0eb7a8b29a8ed5e33b14b1a68a18f3f4558e473d8146c2dfd659c9a96ae07257c456d7a34dcc7bcabf858dcf719e8557173c8849d734711e57 WHIRLPOOL b715560357b22d0cc5887059137b79132e1f46a9adc76410d3ad2e8a1a16047fd2179372632f544b1d798a03a3d41410071f09d2ed82aeda66afe789c080cb04
 DIST cups-1.7.3-source.tar.bz2 8792641 SHA256 fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31 SHA512 78e5275682322a52c5e10d87c106059900595c4fd167924bece30d32b646c304ecc0f5051c53cb983b75d5a5ab76fd5b81931fb6f191b9e936f2528ca869798e WHIRLPOOL e988fe293c709f43313f37477eb35990b47d2eb0eb1d141b52ec0fa2e39b0b90021d4fb4916a286f0da811b3e092afff2978a812d470d083f19c6bd2acd716dc
+DIST cups-1.7.4-source.tar.bz2 8792324 SHA256 358fc7f22395a9ba07efcfc0d34a057ab5e9182b6e3297f71263a6b68fb41378 SHA512 af86076cbaa008e2c4b9a144d2999a0f1a77d801a256fd4021d4d830bb59322542181e58b54b8b36d929215e1c0db1e3f79cf58a448df64361baf46c05f84d65 WHIRLPOOL a2d6024c9bf13f66093c3f3cd99f03913ebc5400f53baec2666eb4fc5b1f834959025409c3a3786fafd527afc97de38ea1fe1c08ceffbb006018f63caca4a1a4
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
-EBUILD cups-1.7.1-r2.ebuild 10446 SHA256 df125f19c6683e4c3564f8395e3f51fa49487ec45f5a500cd136cdadf952f497 SHA512 ab0f58da369f320e6ac2ae90678c80346680f1493fe68c6f04146a1d4c4276b35491fdfcc5692e875aa2536a426a2edeba257b4f11a9b126f926f962a2484cd6 WHIRLPOOL 19b937ee74e791c3735bf2df88b1b4159cbdb23acd2e469b019206de468655fff23843d278019fbd51db20ab4f68d0c669fe334c1082ea772a69f3c098d16ca0
 EBUILD cups-1.7.3.ebuild 10414 SHA256 8abc15d79a64a0715e7830d42dfc888b76c769547eedc0df0170e274134a061c SHA512 eb4409ba7d8626d3f9d6686bb5cd7a3269aed0f16ecfb5953c9e373ed28ebf2af8275692072f7c503bd9a26f69d717a39c7baa0ee54ba44a7a6c3bd92a0d5b97 WHIRLPOOL d94f929959aa1fe923fbc5846c9af2e586495d53b8cbdb015de6d21c9601bc1ff0ea4b3837dcd9131c9828e990ec7f309368fb502ee24e94dd9850692ac5ec65
+EBUILD cups-1.7.4.ebuild 10376 SHA256 c3d1f6d145436b32a67e9d5db280e9664bdc169d73c6c5d3e305405d40561185 SHA512 580c05de3639e3800d5ec17c8219c5d4f0624e8e1db05ab547b0ac5153d24c01d2219a98fcdd62c57e147292d5e3a6f84e5b0ccfe7d687cb3139a877e08fd4af WHIRLPOOL 14d0a9a0b8fe916949d35aba46d35384d46154ce63307a5f784b40926af5db0a18de93e47907184d7d47c53b98d807f9285a6e41b9ae3b54938308372a90d866
 EBUILD cups-9999.ebuild 10373 SHA256 b1ad06fbea0629c0f290723a999fc5d79a56d2caf5916b7dbe5b15a66945ea6f SHA512 f4815ee78c338e5ffa1c9217988f56c980bd902593beb37493dfce4bfbde11ba0eafbc94d86345e59cd03c9c0da4dde6e381d78c38f9f489fa20d5884d80b129 WHIRLPOOL 05b352d32f2104fc8d69b26df7805abd045ea22c192ecb7d8bda6d2e87a86feb358c70a2595968ee9bcf0a6ea812e5b965fdee8ec42aa2f50e7ac9eb2e85ad10
-MISC ChangeLog 93582 SHA256 104b9b68ac0f8100bc5ec87ca931761f5b11670c62b89aaf3ddda961f4cb865a SHA512 728a57116f7de88f5588aa0c29d34085ccab0dd63474eb15719dfe96ce7d2c8e88a3103f81729fe55dce5a2429c303f7f3bbaef1842d1db6577f822e1503a638 WHIRLPOOL e081a9829a64bb8ef2f1a66da8af8a309ec7f8d506dcd90c33c451f679158ffa5e8ff4160e56b827263697416e6dfe1cbe8e4af032e4363ee6b03633e8288c8c
+MISC ChangeLog 93742 SHA256 06ee685cf8885c4aebf928d4d3a5941b1bbec47c5dd2d412d2712be2417b063d SHA512 43523e7badf1e206e5cff993ca76427a364fda06391b8dda20a7a68736f3ca316a40723a0989f76a2afc7143dbb05d8da3e8cfa2dd7c142bc9b664c97061db2d WHIRLPOOL 8aff6d808c7fedb512eb4b642e9b69a26739c6d4160ccabcc871609e500088a8e6b8ee78f11bfc9e03bbdb499d650f555ddcdd58ed053c81fd6fde9a1aa69b23
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ7BAEBCABmBQJTofocXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOmEEP+Pyd6n1umVIxtYVTjcJR7iW+
-p7B3ca2gKwMF3Ph9GUa4WCQ59df35rcgurYk0mwJCcXWpK9/kXmH8QhTkzFz9Fc+
-F0A9Mr/wavjZY2Dlhs8c2mm0iRuAeemleB3hQ1MXY6cGQoV2DffwOzgC9Oy0EXVS
-aDjrJSU3hilBvRCcT8eXze1+V4EJgIFm/+akvvPdmnVeVM2Uu1Erb7TbGqfkXX3H
-cglrkDqEKUnhHxbv1K/wGmI1Sm9yiiVAB2c3/Y+KwJoeeVm7ooYcIS9vlxF6jCyT
-1gyV3Vl3lKcaNiUVxNmNCZlnUb3Dzwy9DkCKoNrenEUoZd27y+4AyPiAqwHoq7cK
-WPN3b2mmNBKqK/KVFHuCHn6KJko/pz1sf9fPyg3BHsTfdHJg9JhZhKajlvqOv6d4
-VH+ox5qQuPOHwxau0/P1E75zG0iryHLLTI8hmZTZb4oI+Fq+Gp6sp7Ol4HcwPmGX
-sO6NfZLJX7uk5zYCER2xShY64KQJY4+UeE4hr6aMiWbRGXk0Ml5VfrekrM2FTFeV
-6aQGCbUWzn64CnWjrbqgafZQlffcZLkplKbqcmi5/Mu4EM2oVkYjiqZx0HtU8wUa
-zwBL3sQlneZktBj/5V1EPmBOKJaLPSzCq8e9rXJy4HFWpd6PI7P0LyHMRg3sVdfy
-kGRqLX39n3BDvz/BzgU=
-=QcYr
+iQIcBAEBCAAGBQJTyUWdAAoJEJS/30SErRQvhEkP/A5ezUz351LPYZ6ZNDsZdMI5
+aohdiO6xpiD+zlYgMLUiNl6YuJqMAlhCfYlMYWa/JnIEYQXy0/5cl+XIptcNIqMg
+ZlEbeptuBk/h6Sj837mU2M7eDjKWle6ODrRZdXFA0O1rb3Vf/HR/kj726jZdyymR
+PZ00roI7/MeFG9JRKQk/czWC8CymA2dfB3gj2DqPv/+WZgiqeKYuvkzYbPjdlRql
+FcMteZVPXC59iHBG6ngnl6ijCWK1sfbpSDlWI6//2BOq888c2WQG9WF0Srn94FaZ
+KyYu9EN/G7tQ/51SRgV4gBWXxuUB/PHz6JIp0ksPw8K20ICEzbir8FTv5kHYMWpv
+fz20MhI0lL06drxUZPIhFIl1pSENdQCycbLJmqwIjYeGzCS31yhAe7atd52iGd1j
+MaKQQ0epuuw2LYLcQAGT1AEcjgzsh6Wdx78sM6W685TyxoBLQ3QFTKu4FcNsujpI
+EOlfhJ8rKaeXKi8RJESgBoAyGClsLHVbijBnlSJiqLuq2BCEHdXU4xPPeN3JU6sv
+ZR02k4/xYwESvA62T4ABxqe76JtszwRugDvrCoYX0nyv6AwjSc83ZvL+vQCGFDox
+C0C+9brLbKJ265EnXeQd7kBU4T7rz8xGRc8ebZRAbgfofcH6JQIYYHNtJYCjGiY6
+aTHi/BsUMWMJhPrHC5ev
+=c5DO
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1-r2.ebuild b/net-print/cups/cups-1.7.4.ebuild
index 4553a6b2c875..2f6d60327331 100644
--- a/net-print/cups/cups-1.7.1-r2.ebuild
+++ b/net-print/cups/cups-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.5 2014/06/18 20:44:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.4.ebuild,v 1.1 2014/07/18 16:04:42 dilfridge Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ if [[ ${PV} == *9999 ]]; then
 	if [[ ${PV} != 9999 ]]; then
 		EGIT_BRANCH=branch-${PV/.9999}
 	fi
-	KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
+	KEYWORDS=""
 else
 	SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint"
@@ -35,7 +35,7 @@ SLOT="0"
 IUSE="acl dbus debug gnutls java kerberos lprng-compat pam
 	python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
-LANGS="ca es fr it ja ru"
+LANGS="ca es fr it ja pt_BR ru"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} +linguas_${X}"
 done
@@ -97,7 +97,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-1.7.1-str4356.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -150,7 +149,7 @@ pkg_setup() {
 
 src_prepare() {
 	base_src_prepare
-	use systemd && epatch "${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch"
+	use systemd && epatch "${FILESDIR}/${PN}-1.7.2-systemd-socket-2.patch"
 
 	# Fix install-sh, posix sh does not have 'function'.
 	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"