Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug #513718.

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

5 files changed, 45 insertions, 40 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 5191a9ca5b00..85dc6c456c3f 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,11 @@
 # 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.616 2014/06/12 15:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.617 2014/06/18 20:44:03 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
+  cups-1.7.3.ebuild, cups-9999.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   12 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 dbbfa240e3d6..9add1766ab69 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -12,27 +12,27 @@ AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486
 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
 EBUILD cups-1.7.1-r1.ebuild 9367 SHA256 c53c059d2b73d4daf6c55e3d152bcc4d8a7956f8f95673bd3974af8119bf6e9c SHA512 f4410d2923ed7cd0a64db20eee1b73a5c1103b0425f02959a0c7aa36d2201d1b9846f0afea7d12a3169c42df9a292510eafb675672989187eede14032a01ac98 WHIRLPOOL 142be888cad5bfae60c4075fe9f04093b0408ea8b28c9b355b6a9ed87c1cd3a847d7af1a6a4e40dabcbb0f0ac71276b643c783f714910d158d2e67c6cd573c1e
-EBUILD cups-1.7.1-r2.ebuild 10391 SHA256 2ffe2a246412adf34bf1f1b031409494d59c870a2b316137b84465f651aac068 SHA512 68488bb773a0a6a2886106cfda1b14c4d8be34a1b1ce243da562691ffc0454f9f0f12bc27bf606654a762fdcf61459d60bb11aef671169bac29ebc85f1bedc21 WHIRLPOOL 2d4588fd0a4d893faa8037b8b03527e7e065de3efdd846cdbe8ed1d011ae018541e21efc6a18f88628c073a070a7b1a762463f6d97cab73c9224afd37bc27424
-EBUILD cups-1.7.3.ebuild 10359 SHA256 7212018fff2ecf4c58bb7d3a197f1030854a1ee22ae4a4e1efaf1739bda51c7f SHA512 5b7da7284d32666e18180f9974f0928e4e43ac04cfb66abab3bba458867180e206b579be96fafdfda468e258b0c8f003e97938228525a461daad4236cee1f5e2 WHIRLPOOL 94904d081d0780af032c0c748ce1d93ff9535e06a49c1a93a44e7aebdf0b06e0baf2c9f20c22a5c10c5c3660e48ec711c2d8cb18153be4883b81a9cbcfd617c7
-EBUILD cups-9999.ebuild 10318 SHA256 5d4c743533bd3b7397d8778cc1c3bb67421dd17bf97f7ce2839a41021e9c7a91 SHA512 831e5596d221d853e632ea1dcf61e202b9de11e044eebc90a0cd27994cb7ce2c059fcef8b782e6f9fdc4c5b58f1e6ec6398eccd8d1ec38e92599a828a3931fe5 WHIRLPOOL 9ba643c41f9ee20546f47295cd35ecac2f7021fe2bd56efdb1410d02570c3653fca76fdd6b6c87858f393a64f4e44d22aca239371f23dfce8f6a531e3fce38e1
-MISC ChangeLog 93383 SHA256 e7a8b4dca9d4743e210128ff49d262dddec6136864371058150b6453bb2ec2da SHA512 12a5df08b6cc3b00843c81a9504707d70c0f4cfb476256ba53ffd8bd8da64e6fa11555d71c716d1692d0e29fe229f46c17f7df23008e296cfbf7eeca29d70d28 WHIRLPOOL d237caed71af010496b0091d5bacfb030492e5fab214d8c7e1c4985ecccf2a3a6d357d13bc2c6010535b87f754824aa5e358d017745b7dace2aba968ec2ee461
+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-9999.ebuild 10373 SHA256 b1ad06fbea0629c0f290723a999fc5d79a56d2caf5916b7dbe5b15a66945ea6f SHA512 f4815ee78c338e5ffa1c9217988f56c980bd902593beb37493dfce4bfbde11ba0eafbc94d86345e59cd03c9c0da4dde6e381d78c38f9f489fa20d5884d80b129 WHIRLPOOL 05b352d32f2104fc8d69b26df7805abd045ea22c192ecb7d8bda6d2e87a86feb358c70a2595968ee9bcf0a6ea812e5b965fdee8ec42aa2f50e7ac9eb2e85ad10
+MISC ChangeLog 93582 SHA256 104b9b68ac0f8100bc5ec87ca931761f5b11670c62b89aaf3ddda961f4cb865a SHA512 728a57116f7de88f5588aa0c29d34085ccab0dd63474eb15719dfe96ce7d2c8e88a3103f81729fe55dce5a2429c303f7f3bbaef1842d1db6577f822e1503a638 WHIRLPOOL e081a9829a64bb8ef2f1a66da8af8a309ec7f8d506dcd90c33c451f679158ffa5e8ff4160e56b827263697416e6dfe1cbe8e4af032e4363ee6b03633e8288c8c
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmcI2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ7BAEBCABmBQJTofocXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO8PgQAJ4kNLhrmo60zOYDsG7gZfAH
-ilUMucVJhDeLYTMOK6OIYUtsRBPDeoXiadSV2yW8v4u8PhRDYOMccBQvdwFTgyUG
-eQD/7rTDsuPwEkQ6SAVsNKKz2pIHJZyiB3FKv86T6vuzlOWEASxEbh1F0j/R0Lmz
-1Lof4944t99TvxdC9UzL52viJHsHKa2j4DGkjSo3SKzjaNlGqTWxNBAK2qGLKk9J
-LMwTo2Ky5yw3LmS7dVIVzqXWNgf1+GLzZSeCU+cK5ByFNNsqoazMSSZngkfuteUp
-4KeNreoCBL/nUeMHy1vFwb6m/s03Sa8G2MZFD31yKL5GgCLvVpE9GQSh6TEc90Hn
-v0/96Rcs3Ju4HV3hYUBy4rf7S8IB7KU39RLjqTqTV5rrEHwcr6xrieIl1PBTJpt2
-ejDcImmCn2oWh+V3JJOPF7NFm1Um+JaTFXHbIgOospb1mY7L+1rifGIER7RFnnZX
-g5SKWejkW171ufdulxJoN6HcjeD0Xr4NApGeBvTUhwTEsRNEkvfhQVZD2bSjaWiM
-mL/4/54r2zbFW5RfIOFWwCn+0pWCDw4WEZufB5HUJx+hTeGlPlt9n549KzKds7i6
-B7WPwu6/Eone+wBAGN7VEHQ0bA0KQkCVi5H5YsmInJH/1VvBWAHtqFadijXc58H6
-IcfVhtsySpnHoYfxPWhm
-=ekCN
+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
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.7.1-r2.ebuild b/net-print/cups/cups-1.7.1-r2.ebuild
index ebfcabfd4a8f..4553a6b2c875 100644
--- a/net-print/cups/cups-1.7.1-r2.ebuild
+++ b/net-print/cups/cups-1.7.1-r2.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.4 2014/06/12 15:07:30 mgorny Exp $
+# $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 $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
@@ -57,15 +57,15 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
-			dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
-			net-libs/gnutls[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
+		!gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 	)
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -73,7 +73,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 PDEPEND="
diff --git a/net-print/cups/cups-1.7.3.ebuild b/net-print/cups/cups-1.7.3.ebuild
index 9f6f2ccc1494..9b05c8ef321f 100644
--- a/net-print/cups/cups-1.7.3.ebuild
+++ b/net-print/cups/cups-1.7.3.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.3.ebuild,v 1.2 2014/06/12 15:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.3.ebuild,v 1.3 2014/06/18 20:44:03 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
@@ -57,15 +57,15 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
-			dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
-			net-libs/gnutls[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
+		!gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 	)
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -73,7 +73,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 PDEPEND="
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index b2f0ea06f9ab..726638967aa8 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.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-9999.ebuild,v 1.59 2014/06/12 15:07:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.60 2014/06/18 20:44:03 mgorny Exp $
 
 EAPI=5
 
@@ -48,7 +48,7 @@ RDEPEND="
 			sys-apps/attr
 		)
 	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
@@ -57,15 +57,15 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-cups )
 	ssl? (
 		gnutls? (
-			dev-libs/libgcrypt:0[${MULTILIB_USEDEP}]
-			net-libs/gnutls[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}]
+			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
 		)
-		!gnutls? ( >=dev-libs/openssl-0.9.8g[${MULTILIB_USEDEP}] )
+		!gnutls? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
 	)
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
-	zeroconf? ( net-dns/avahi[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140508
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -73,7 +73,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 "
 
 PDEPEND="