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!

4 files changed, 35 insertions, 30 deletions

diff --git a/net-libs/libssh/ChangeLog b/net-libs/libssh/ChangeLog
index 87f2152ada90..bea87b9ead7d 100644
--- a/net-libs/libssh/ChangeLog
+++ b/net-libs/libssh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libssh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.107 2014/06/18 17:35:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/ChangeLog,v 1.108 2014/06/18 20:38:27 mgorny Exp $
+
+  18 Jun 2014; Michał Górny <mgorny@gentoo.org> libssh-0.6.3-r1.ebuild,
+  libssh-9999.ebuild:
+  Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
+  #513718.
 
   18 Jun 2014; Michał Górny <mgorny@gentoo.org> libssh-9999.ebuild:
   Update the live ebuild. Use git-r3.
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index acf7da4f0a8a..6f292c574570 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -9,27 +9,27 @@ DIST libssh-0.6.1.tar.xz 279324 SHA256 0dcced0faa74bcededfbaeb14898ab85bfcd39e73
 DIST libssh-0.6.3.tar.xz 279492 SHA256 2bb5d7c595059f990a8915c190169257328ffa828ced0c05b09bbe186092cacb SHA512 8a9afd0add4f7e4b8ca237badaa9e248153cb3d069eeb3a5e752703545eda44a2556f93a4c60d3eadb3e950bc0848caa114fc54572e6372d740cbf8a63ab3b93 WHIRLPOOL cfa84307291196409367167ab223b2312db1760da53cec8a4279cd6db7867f173dc900e1159e00ef7ce91a571c5d8ac04f58816ca5cf44176885c82c10118bbc
 EBUILD libssh-0.5.5.ebuild 1964 SHA256 8569c65bd9318df61e07214610282683d84b5e8008db9b2fddeaecefcf45ebc5 SHA512 b47dc0400d4a4c32c015d33bc74af1537e2de7436c0f874e1bedeb2e32c3e0f38ea382dae6e933bf805ca9a8c48f2ef18a6b13e97ced3c981560549219f92548 WHIRLPOOL 761b931385c04d208b3233070e038ae620e37befee96ef11d2ba7780d3662cfdaf699346cb77c3be784d53ff402452aa05c06c92c3b89f2218e29fe368424549
 EBUILD libssh-0.6.1.ebuild 2115 SHA256 aab52e0247f7ae22dc82b1c1be14d5ed7e23e09567f88ad3f7dc2f19e0106de8 SHA512 8f3bd606cbafd3b124a5a24d5bfb2a06d9b0885c1c0dc02ba757fc5aac90b957a9a1c6b7ec769a86b4754b799fa0b91bdc8235d8bf1e5640d76f359b5954f91c WHIRLPOOL 706382b3fbb64fb82dfe77503d1612c7ecb554b6d072d4ac11223d113a1c1700c7daa89ab5133a58877b307930c0180ba100940f0641b5900e02d4fa39d93e08
-EBUILD libssh-0.6.3-r1.ebuild 2335 SHA256 fba8da0018d4c8cf3dcab4b7d71a3e91819aa00e9ee856a4ea2469732a4ceab0 SHA512 8affaf165b099f6ad70a4cd068c033b61cfd27d7189af105cccd4c990770aa2963ffc7c0ec46f4ecf5c53f5dcc326bcb4fe3fcfedacce2f50a463fd93f868956 WHIRLPOOL d5d80b7cfd5d57230ce453b015d4f77ac217d4a601a49ebf2fbd82e5de116f85e0d1b843d3cfa39b335ef417943f707b199ee7292d27111c6f725115088ba0bd
+EBUILD libssh-0.6.3-r1.ebuild 2361 SHA256 f323b8e88f72277647606f23db07e32469fbb55b284a846c0283e90a77966ca1 SHA512 b62c40de41c463208eec7f72f22f5ecab7809a74b1105b45f1d131c4191b12fd60d40b30db128b0a5a24ce8f406b0465fede4a0246a4a1e27154828f12da791e WHIRLPOOL 7a848bd51341acfc1d9a65c3214e08124a0ac1f8e00056e0011c1d91e749287833faf63171b624be70b94dbb867ab860c7d7ca6c8068edcff4f758f621ccc2f8
 EBUILD libssh-0.6.3.ebuild 2118 SHA256 509bf1d8f6e79b9d6d51e7074722c905b9b8c0ac3d824e138d7a317fdbe7d866 SHA512 4ec9fa7fba64f19b883f7bdbbc693605c1750bf1adf7353c0cf7a2d952cf22175bf19ee2f8e7f8262eb03932a4493a89e7fd315859fab7a4565378240ae01a5a WHIRLPOOL bb7c456f6a93bdcb00b7fde3ac6223448e1b173768565f264f1aa043483f96824b2734aa131a7e50aae6722b7e5e065a6b151b0becd4611d7e7ba0f32883b004
-EBUILD libssh-9999.ebuild 2139 SHA256 cabb07573a89245c179b846c7768577c3385f2ae9aded62cf919d8434863982a SHA512 360f39127f1f25b3c09fb8fbde59d3c0193e555610601b7186abdbda3b7face8d1cf4cf47d9ce28b437cd2030db751bd8653821ef134d6454af9b8aea3fd403f WHIRLPOOL 1c8dab2f97cf347970f24099331142da32ae06758dc4820d91272cb6bec6c91bf4c55c19184cd34a3a0e9566fe372cedcd9f23d8bb17a27c294e3904d68dcac9
-MISC ChangeLog 14986 SHA256 2246465e0afcfbd5a803063671c541b72fc06213fa980b67f6a5e90e79d49ea5 SHA512 20b2ae5bede86ac701f8e73a3fedd83edee28c2e6d5ab31bf6dd80333a2188d064dcb6e16959d6022cdab67fb94e0d5c7c91afc29155f37fc9ca5aa108860083 WHIRLPOOL 64e8e290b3e770a4bfc9b336181eef74376a68314dfe3b758966c098e3cb2fbe7230d117b5ec2fed35d1a1ebd9f2fcf533d2e298098851bd8cef494368a476a1
+EBUILD libssh-9999.ebuild 2165 SHA256 19217cf4a65823f37239ed541e83e6ec8ded43668fe7bb6bdb0fe3900de22009 SHA512 92222628c3851d025bc645ced70092687af28c1f264621d3ac230e87d4b2269f8e09838f1cafd53191457fbab4b8e683914f25213c46dd673e012d2c36d23665 WHIRLPOOL c2dd2212aaef30e06abec149f8e4cc661998feb89c4eeafad6b67ea37ccce597e907fd1bcd02a9d27dca8febf0eeaf9c5c4edaa81f6566c2603131f52e13edbf
+MISC ChangeLog 15170 SHA256 2797516e83ffe1a26782958b8dab35dd5a798ae85ef7ea9650533b9a74df3b34 SHA512 5bb91cfa485b2b12a944f7c146c4c9c962c99a38470b6e2f6b91fd93408536c21df8851b44814349779c1a36315ddb3a17b3274dbe801e3bcbbe1949ab17125c WHIRLPOOL addc4e23b707184bffbe6ba798f0fc75293aae567d259b7a8bcdefb765b907aaea4f55631d453aa9b5a887ec1d1b0378971c8f408bc735dc52a214945ed962d5
 MISC metadata.xml 670 SHA256 8981afe1391313974f7ad026510fd41912ab51fd2944875d74f5d10ac0437571 SHA512 ff239db00413a0a8bda4c056627fc99442e1b37ca91d1cd32b86f616885c7003bc8585954c54584bd260dec8fe3d8335b413e47884bd35d4dc58d46689ae8267 WHIRLPOOL 0f7a409bcd626ab9dceee9050f6c23eb56388925ef08b3f9fd5776dabd26afa8ba3e55674e94a886b9b2ca01dd51cf5fb027094283726744d7efe971192fde3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToc3SXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTofjHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOnGAP/Rb/89hjGoQWIWESl8kA7NK8
-3OqUvMDwP2kXE41OuA5Dra9S5yE1b97cJ5DGyRwcM4a5zZ81X9BWVvyTKYTD7f0+
-YFMHIAP+g6KFq5mmPCUGhukntLE+EJQuoo8weyZEDhlYAgioyCIpsbtq7q0HuXUi
-3tA6d24XG2f+kbs768yLgm2sJ8qJxfVto3ijGKgMqeSMxvFNy1E4/3WwqGrNABxb
-mjYfy9yUi7u/ta96f83d+8ZQO0N3XpVujyIKs5ddv+XYM5dmZtz+870QNrOIw/ZW
-i08CX0KTH/nflOnanbeP7vS0N1q5MqcQeqFRU6ml06YzJJAL9zN61nrw2V/hncnH
-xaY/haBJ2iHHDJeJWF7TCXOE7pttcKgHMqyA8ADDOd5uiqFLQ3o3/So6T9x3CfRd
-vJK4kcsPwJ5DKS2R6P111in9bdORMKfnf85kmEZrAFAK0rRYb/Al6NeJO/SK0vDj
-Km0W7wZtPVlBXo7dVVa/ME7ERhfVnCNfMM6D3AMa1/mZokQrZnnrjwxFYZjfjcr4
-kHe0ZBpY4LelsPxCrPniPw88bERL+hbkgPfhp821sZOkG4QPdnUOh4sPUO/pWzUr
-XDhvEDAhGj7XFuie57Sji7H4JyiIvtsAUCmK2Tu7JmI5w1qakvSOfaLeIhmJqx5M
-4w5S6A4g8uTnjTkkWse5
-=9bq+
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONq4QAMERdtkp1WaQDneLVK23LTw9
+Qx9lQD8KT9k5fhmc7eUUNo7HM+rBg6nz3C1MbRcJadQfykG9WJHgLduTu6BswSG/
+6YE7YRZMiCVQrvdAZ5ULjoZUsMPZSrcZy3+dQ/JXaATJ6zggVwjV3BROJfN/V25E
+xhSj8PryOnLkyb1inN3dyulNhHaiMu3pjvt8wdF3nXDE4oeobirFu58NpPLP7LaE
+z8k4ThgRqUwCfDR+byHxFurKyoM2en0LCkm9jxOgA/YbZpQdVTMSl3IBW0iybzKD
+qzZm7mOlpHqhc5gZ1XwzJ42hfet2qFuCUTndrSRW3IIsVx9J2AksZZxX2JjS1RRO
+15G5vrRfRzLZScN18qskh16cubWn3fJv2EmPjmHpW4UrARWv6jTp8dqIpYBmO55/
+x4UELpOLWIZoBksq24lQ4ilJTnpr2YoxCf1kOVna2ibJ7vr3oIwuubQw+PEatems
+suKYmBwmapUDP7nJNkSE7wnygSYvJisGIacfU7/xL0ZXYvDhknj2MLSL3rBmp0Kh
+mI96LZN56ZhxOs5UsJmHUBQnkfRl15e7x15EcpFmg2bKQTj411z1Zegqm7IUsQ4N
+ASVtE9n+c13QdA3McmwTOGTJsYkH46vjVxN+mU5vYtzHWj89E/zJvUb1/WmBEbSo
+Io0IYR1CfrBcgfVGMK4T
+=JV6V
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libssh/libssh-0.6.3-r1.ebuild b/net-libs/libssh/libssh-0.6.3-r1.ebuild
index b8f833edfeb4..0a838095060b 100644
--- a/net-libs/libssh/libssh-0.6.3-r1.ebuild
+++ b/net-libs/libssh/libssh-0.6.3-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-libs/libssh/libssh-0.6.3-r1.ebuild,v 1.1 2014/06/11 19:53:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-0.6.3-r1.ebuild,v 1.2 2014/06/18 20:38:27 mgorny Exp $
 
 EAPI=5
 
@@ -18,14 +18,14 @@ IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test z
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2[${MULTILIB_USEDEP}] )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5:0[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
 DOCS=( AUTHORS README ChangeLog )
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 0c8119723540..900fe30bec8b 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-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-libs/libssh/libssh-9999.ebuild,v 1.7 2014/06/18 17:35:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libssh/libssh-9999.ebuild,v 1.8 2014/06/18 20:38:27 mgorny Exp $
 
 EAPI=5
 
@@ -17,14 +17,14 @@ IUSE="debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test z
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
 RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2[${MULTILIB_USEDEP}] )
-	!gcrypt? ( >=dev-libs/openssl-0.9.8[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.5:0[${MULTILIB_USEDEP}] )
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	!gcrypt? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka[${MULTILIB_USEDEP}] )
+	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
 DOCS=( AUTHORS README ChangeLog )