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!

3 files changed, 42 insertions, 36 deletions

diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 48da0e4ad4c3..1aaccfdfd2e1 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/curl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.364 2014/06/15 15:51:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.365 2014/06/18 20:42:17 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> curl-7.37.0-r1.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   15 Jun 2014; Anthony G. Basile <blueness@gentoo.org> curl-7.37.0-r1.ebuild,
   curl-7.37.0.ebuild:
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e2becf313bb1..0f83af437321 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -12,24 +12,26 @@ DIST curl-7.36.0.tar.bz2 2809266 SHA256 1fbe82b89bcd6b7ccda8cb0ff076edc60e911595
 DIST curl-7.37.0.tar.bz2 2870197 SHA256 24502492de3168b0556d8e1a06f14f7589e57b204917d602a572e14239b3e09e SHA512 67f0eafec79790753227e31c875f62e760041d5053d368a189d84ea4ef764112b87f17504e33d1e8d5212966d34ef0cc5626139857d9384cfa7b7ed55bfd0639 WHIRLPOOL 25c328e4246779db1d877f7ace0bf7859e8834b0f6f25a2203e249c9227a90f6552eebe2ad5940ab004136bbe96ff768b65658e74216e17b13cfcc2abc9c38a4
 EBUILD curl-7.36.0-r1.ebuild 6661 SHA256 4e14ccc1b9112c5e43165d9c0d080281a72db216134a3357301591601b4fb6a0 SHA512 9c60cf93929b0ad5e2af1537696184f3693eb9c6350ddb06ed27dc47fd9a985194568413aadc2de932e44387f08efe9aa8ec6498473f97ec35d8b74475441c5b WHIRLPOOL f399a10b3dd05bedde56fd32eddf046143cd50841d8f9b19c9c5a490b96375a295a6b49598137329971e68439ae33c34ebad31e58acb307fd0c2238c826b7a04
 EBUILD curl-7.36.0.ebuild 6428 SHA256 c488ae43defefbd2753b7053e6889be6c4aba21d31b971b4bfceb4e19634425d SHA512 4c82e9aec33c04310e3a64517d446c276c59c5ad4e013db87e17de1faa8db33b1835c66e2e5f5393683e4b3fbb8770a08fed594b6d577c8d171f2af60afb2130 WHIRLPOOL 42e21a5caf72569e5ae2e95cb789179791f6a6c592d73cbcb1aca65cc5ab0a45e584277bee7c3f42d62b32efcad815c1803e53ba798f23cd81a3e57eaff99693
-EBUILD curl-7.37.0-r1.ebuild 7278 SHA256 a7e5a5e39f3760d6e63d45948d36a663b111678cbe12292a3ce1476c5a12ace3 SHA512 c9b065305b9d19f4f76e5217d05c83c3fefb0c23381ea370bf742637a112a53239cd329d6b12b296b36f5281e1a7a0e0da24db252c210f0a930662ddf4a85412 WHIRLPOOL 991fc76d40e8383495ae63f6b5197136d60dcf40cbcc4d6057058d7d0503783c9133a663bdcca871116085f8674dd7ddbc66e723a447b9159d4ce04af03471a8
+EBUILD curl-7.37.0-r1.ebuild 7426 SHA256 c2015bdb2729643d9d245ec22913a37ce83af794dd158c8806d8a7822665e2eb SHA512 d86ffe8f54b5f673ab0990ddc619321adc09af671587783f829dde1561a0fd750dce00c1f68c373742580ded34793315dfff151df4eb786e34a4d463dc140d4c WHIRLPOOL 3013bc8e639b0a4075f3b5b2920f82906f823d3f75272d2d0e9b2e32a29f215a81b28a1230628aa0287328fcb65c50b3650be7cafc34bd4b55d55ae161ed0a7f
 EBUILD curl-7.37.0.ebuild 6661 SHA256 4779b52d1e9610ba90576ffe2ed18f2a296e302b1e964783b8781fd5e464821d SHA512 0ceb1a96938ea9c8b295e566b462364fef34ff4ff668ee71cf3607bb0da78f2d08d4c2195a2419640e7b2c77e5d528c7c4b33fd1da121598b515aadcd6c10dac WHIRLPOOL 787e97ed99418a0b6198b97fd73fe9111187047f5b442ff12dab79d5b8b3b63d5be511f9547dd9d92c7487ae339f5fc9f1cff443fb34e2bb589c414843303862
-MISC ChangeLog 54653 SHA256 139c58219a64205f154286aa91a14b2abd4e5ed1bb4b394c2d3164f108b405b7 SHA512 76a808b9a051e7ae199ba199d46c1b70406368df22dc3946c280624b7e4cd1e948af83d66cd465ab4c514c4eff8f00ea391435f2849ecba09896c7cdcf91b78e WHIRLPOOL ea3faf349ddc9a8637135eaf9a63fb9c7869a12c3bd9e949c3825dfd8e3502d3b1e3367cb3172548d22b2117028d7fa546eb45b87d9ab9843887e96ced652bde
+MISC ChangeLog 54812 SHA256 b4ba3d6af478eb460bd5a58d24b96e5c509e490474ad78611ed277be6e0b56c8 SHA512 05e18847b052c01461ea9c23a8d7dbe38217bfe63da7c3c86274305354d10555d34504f43c547ca0e7623998fcf944007e6d93c567a0440f597496ce61d90921 WHIRLPOOL b5ecb536a5cde0e8b3e810a2b7b76ef61a254e745b73d4cc81a3190484767c5f4d3e59b34febf8010595ebc834edb11377a6bc4ae02a7ca552ca49fbe45ea51a
 MISC metadata.xml 868 SHA256 df66fe73acfdaff0fda0595656e112e6cfd4aebde2c52237c868c8031306e12e SHA512 a948ea9d372475d680c6f6fe4617ea5151d4378b1d5ea09e0566a88e403c9ed0a562c5426340bb1b03cf58a99c1f22411973bf215aa37ce8d30662a0e0101e4b WHIRLPOOL 0e058b6bb29d6c997a36a2563402b969b6dfa06912c3f8b854f8d89eb4113aa7fb376594ac0c756f1b59b3080aa508dab09426a9dfa982de56733f097baf9f37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTncECAAoJEJOE+m71LUu6+3YP+wfEq5hSvY8rjYcYtQyMR6uG
-rABz3k+Igx/xCtub4N1Uur/iecF34+D41dz1QXkOlIsaeVU9l9LdrKAOq3oH9U3n
-5lHFSXVTMgKjbP84tqC7uw8cz7FqcZj+Q7syt/P5NFOdMZV7bu2UHFUVkZonaq6l
-lK3O2gR9GkjpP1bnKed/V7bdG7sswYRMiLbYRSn+0ykPcNUwX83J+NWY64u7w71L
-CYWLNPejbjtJVvqc90xR8RamKz747xVhtkemQmWqUPQBAJ0TBKbxIeCNUMA16c3h
-5Fgh/rWpcVp8rfG98ua3BuFgHRKDzPKG8aczY56EqMq30OL2gk96OEq1hXNBN62H
-Mq4ImN6lkxClpoBfmm5SKa5OAbowrTR1tMiZ796CPkYLuR3iWJfsjfXLwZp3gvnf
-FqTPPlg+U12rjSBRFT4u3Z+hI37dec0MfRtCBnaaY1g051mhQfejFWRzI46m+8Jm
-pZVALR6PjVvt4ikZcytninzgv126e5g0/L2kwnFjmTtztx9fPElV5lSn/z+PiCS2
-OQSoyR9fDvz3yYW7gqE+VbLnGIob2Fq/W/TEJgh7Bxn7hnOMFYTuDhWdZnbD30Ao
-6Qww9ttdULvdDbp6fTIK0RHUTJA040If/bbC62OoEZwEGDw7yGaB1RZ+1+Yu/xgc
-KIGW+MtdlmdThmSblbug
-=d/qY
+iQJ8BAEBCABmBQJTofmrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO79EQAIX+akXvr6smUZ+eOR4rmdWY
+hLEN8/M5FAGgm6lgiXAJ8ST8ZLegXI7ZdK7IEZd6iqD1a7l1St4dFmL0jAtqaO42
+87zcbzuN7Na/xEtP8PTUxW3uJisim/iaGTI4xFRXKqWEadDYfhE9P3/kDfcuyYAq
+kicOqzmj6RHaa3Q2BDDOU4ky3rTt8k7goEs3ZV2U0YX0RYls4RuYeTWI53UO/BCZ
+ny56VihOVhMmyd49f3ijw/V88nnNUK5eSIqUeUFg0fH53fClj4naKBT1UEson2gs
+bx2uB+F5Nrvkldfc38y2HWKiU6aEzubNPrGCwCXIHrG8JPGgysEyGGphQfFNJGcJ
+x8+iCwvlfGryZPy/kGacH5Da0AOZkPCSHBBbb3ZnXZv8JOZrXdiR56TxRwHRw2Yr
+O9Y54py7OQxfcdSvpvMhvY8kq09HlXBwffx8/cHcyRQDcUcyzkFnNceFioKXjKV1
+DzoS9d2cA965NEusJ3OwKXkz4xbgj398jVaX6RA5YxmC/7r7sfakqb0h3BQhvlvG
+k2B93KZReJzXcqVLThHSKA0/dcn3/B1ugewWOXY1fnKDJXZQhPY/Xx4Oh4+dcERQ
+Lnukck+5/gRIMlyOMK1gHk8jCF+hwygr1ucvlYt5rUnYdbWlYpRBdkwdVvHUyfHS
+uY8DUFPWHhuw1MacOTa7
+=vjvP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/curl/curl-7.37.0-r1.ebuild b/net-misc/curl/curl-7.37.0-r1.ebuild
index 0f2f94bd9acf..e5f68f0ee22e 100644
--- a/net-misc/curl/curl-7.37.0-r1.ebuild
+++ b/net-misc/curl/curl-7.37.0-r1.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-misc/curl/curl-7.37.0-r1.ebuild,v 1.2 2014/06/15 15:51:04 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.37.0-r1.ebuild,v 1.3 2014/06/18 20:42:17 mgorny Exp $
 
 EAPI="5"
 
@@ -20,48 +20,48 @@ IUSE="${IUSE} elibc_Winnt"
 #lead to lots of false negatives, bug #285669
 RESTRICT="test"
 
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	ssl? (
 		curl_ssl_axtls? (
-			net-libs/axtls[${MULTILIB_USEDEP}]
+			>=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}]
 			app-misc/ca-certificates
 		)
 		curl_ssl_gnutls? (
 			|| (
 				(
-					>=net-libs/gnutls-3[static-libs?,${MULTILIB_USEDEP}]
-					dev-libs/nettle[${MULTILIB_USEDEP}]
+					>=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
 				)
 				(
 					=net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}]
-					dev-libs/nettle[${MULTILIB_USEDEP}]
+					>=dev-libs/nettle-2.6[${MULTILIB_USEDEP}]
 				)
 				(
 					=net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}]
-					dev-libs/libgcrypt[static-libs?,${MULTILIB_USEDEP}]
+					>=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}]
 				)
 			)
 			app-misc/ca-certificates
 		)
 		curl_ssl_openssl? (
-			dev-libs/openssl[static-libs?,${MULTILIB_USEDEP}]
+			>=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}]
 		)
 		curl_ssl_nss? (
-			dev-libs/nss[${MULTILIB_USEDEP}]
+			>=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}]
 			app-misc/ca-certificates
 		)
 		curl_ssl_polarssl? (
-			net-libs/polarssl:=[${MULTILIB_USEDEP}]
+			>=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}]
 			app-misc/ca-certificates
 		)
 	)
-	idn? ( net-dns/libidn[static-libs?,${MULTILIB_USEDEP}] )
-	adns? ( net-dns/c-ares[${MULTILIB_USEDEP}] )
-	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	metalink? ( >=media-libs/libmetalink-0.1.0[${MULTILIB_USEDEP}] )
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
-	sys-libs/zlib[${MULTILIB_USEDEP}]
+	idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] )
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20131008-r10
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -80,7 +80,7 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 # krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	test? (
 		sys-apps/diffutils
 		dev-lang/perl
@@ -145,7 +145,7 @@ multilib_src_configure() {
 		fi
 		if use curl_ssl_gnutls; then
 			einfo "SSL provided by gnutls"
-			if has_version ">=net-libs/gnutls-3[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
+			if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then
 				einfo "gnutls compiled with dev-libs/nettle"
 				myconf+=( --with-gnutls --with-nettle )
 			else