Update to EAPI=5 and use subslots on readline/openssl/ncurses.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 29 insertions, 26 deletions

diff --git a/net-ftp/ftp/ChangeLog b/net-ftp/ftp/ChangeLog
index cdb14eac8e62..2ddc02cdc087 100644
--- a/net-ftp/ftp/ChangeLog
+++ b/net-ftp/ftp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/ftp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.38 2012/09/29 16:41:57 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.39 2015/07/14 07:29:39 vapier Exp $
+
+  14 Jul 2015; Mike Frysinger <vapier@gentoo.org> ftp-0.17.23.0.2.1.ebuild:
+  Update to EAPI=5 and use subslots on readline/openssl/ncurses.
 
   29 Sep 2012; Ulrich Müller <ulm@gentoo.org> ftp-0.17-r7.ebuild,
   ftp-0.17.23.0.2.1.ebuild:
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 00c2347f827f..f70f0a389fbf 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST netkit-ftp-0.17-patches-1.tar.bz2 17549 SHA256 5de0537b109040862f57538ee73a2493674c60d260daf26a8dbeefe49bada326
+DIST netkit-ftp-0.17-patches-1.tar.bz2 17549 SHA256 5de0537b109040862f57538ee73a2493674c60d260daf26a8dbeefe49bada326 SHA512 0344316cade2cfe35a9987582e0e381177d412f9be296d1ba4b917699f5112ec48c90e8480a009acf9ba7f14fb5f42a76d9d3551db7d9f8a036eb3ce8fce2113 WHIRLPOOL 8d076a842fca933ad0b5694780044af7b950d6d94efa153a1410e4538e2afd922f8e546ac108771e98772e59910d2d114eedbf6a1fcaccd1b87a744c30a54070
 DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 SHA256 8d47f0c9c4aec0a37f4caa554c8625a1927045a37125cea9f86b84c7af65b09e SHA512 6a9adfd33eae4ac2e1a9e070ed89467804dc484eda084694398bb7e3ebbaf04bf70d00ffaa637bace078c4c0024115ba3620fd75d4a3558a44dc991798885461 WHIRLPOOL 62e4aa120259bb1639fc2ca38296cd05b17672c724502b907d7ac565caa2ce8a90e75e9c2f05f1628ea6fd37fd2d78a2af9419949699a7f59a3c420d9a693a3c
 DIST netkit-ftp-0.17.tar.gz 53934 SHA256 61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554 WHIRLPOOL fa60506e817ac0e61a3deb41dc7a143a4506e49c91e81aea03ec58f31802c8cbb7025712d13fc164f931e275c01fb88b787991e89f7a75b5e9d8c88058cb88c2
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 SHA256 82f2c3f6d999df6e1014c6016a6a3c861a861b2eca1c1143530603f44e2f0574 SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228 WHIRLPOOL c4024d406ce1002fe8b9184f5a29ebe1f5c678488fab2166523655762e305f6bdff0aaddfc052f2433fb27c101a29af2d092ea4712ce11d0ced89a9b6de3fbfe
 EBUILD ftp-0.17-r7.ebuild 1204 SHA256 19247f6119f4150ba82c6d5c8c6c6ba2d2c2c48f2c53b847f24e0efa9d729071 SHA512 c1201867d2368817b7e894f3750f2d16c9bcfb4fde53dc4f0eb6190781b49a99ee09632466e782d7487f15162dc182c0713dca866ee66c802e3c601c8a4e0094 WHIRLPOOL 9ba7cddc6f9407431540471dd4e86d1c92f021cee21e315432faf09e7b29bf046449431529048a0a7bb489fb5b477e5384584eb760bdff6a76886cf4e8e9a7f4
-EBUILD ftp-0.17.23.0.2.1.ebuild 1538 SHA256 f2083dfa7357526223bb66bf439132fde6b1c5eb82fed3cb67fc025e38bcd253 SHA512 2ee23d34ff2f8a99a696f7796d4ab364d8556b15748fcddc08b0791549daae3d14b8c86ff1e54443a683fcfe2186b98b5f982d89cceb2af09710b5df0a11b677 WHIRLPOOL 265041317fc3a667d63a34890bf75b3dc9041e72726980e202d3b1ee351cde77de75c29b94a3e57297ce85048300fbb5a66509c0d79f170a8c3ddd8eb1feef23
-MISC ChangeLog 6238 SHA256 424c82a2d54555310ff61c7cce034d284d2381edb4543218c1491a774bc2764a SHA512 19d6e77b8b1a995d04176347b2bdcff59054f2fe5d4bb94167efa4640857e59915301a56ed25e69659f3f62d8bb32a3e353713b67c59ad73d2c6e28886170a11 WHIRLPOOL a1a508ae051676b48258a10110c00ce8fd65c04698b83a403635ce6ab8b8f55f36e5b8624fab2320d84787eef977029e052cd32eea101f22b66604a10aff4888
+EBUILD ftp-0.17.23.0.2.1.ebuild 1542 SHA256 f4fd3e5c968ca84982fb10e090dc97d8cf507be68e4f43c6e25a8c45b58a96e2 SHA512 e6ea04a196f713407b17ab6d10263ab7f7185ae5bae54459282b95d4bf9fa8cbd6b42db1fb8b6a72a03aa8fecff05271278a8e721bb251cc2f2a52e3a38245ba WHIRLPOOL 22f8eee87d6aa255810d6865f778f3aeda26c1d358881495edc65300aa1f8f54812569913494474bbd57b6cb15a91094efc87359090a604e1412e51a0737b650
+MISC ChangeLog 6383 SHA256 5f85bc4798b11dd94092c8ebd85846d6a07395cfd9641920b62180c64b0a7267 SHA512 831d9fed6359759e57e29216ee9816d7b9e72c4d3238e41155fcb46218b3c30d5fcd3a654cb3d994e467e70ff46e8b12320c1c34dc8d633f1b9b370cad6581aa WHIRLPOOL c4ca122b8f010ce8fc5ed75612a39feb355cf9f9216b83ded8591af8480b7f8a137ed8443d30d7a13e359a8001e299e691d4b072d2865343cd9e74d61e3789e1
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJQZyb5AAoJEDxpGckxwJCBcD0QAJEKzKO4SuXU80o1HDTfMO8z
-iYsH93WXcWcmwLa+4Ai36kkl7BIi/xlMtNernVHIi7tnd2gB+mmYveeQD5FR8xUN
-7wJ2qjzZC5MVJ050gke04OdbmKSL6AiDamLuzGRSiKA2jo+f4qXBblvTeCGK2syi
-4NkTvvU8uYQK+34wiuDQrAkLPq/J85HuJAXGduQOfJotL8RZQQRYr7LzGAYHHlUs
-wUCRaIgnVObS/QxHHOF2hT2xmbz4Hl/hFfhD0j8m5b3sXE42s2c54gpEOUN5YYkD
-eKewu/O9fA7mPqByUfPFiSGDw0s3F9/Eb/ricJ+OQuyIgttSqFohe4fC9pdAghXj
-DOneUM9j6iewznFhVhN8+BnMGaYZNTeXmUWWtdEMCG2qROw8zzWKwDoyoRrV53wW
-/nMydFKGonv304kWK6JCRts/HY3SicDcyvawOqEt0WQeE14P2RA9wqDJpS6iSwQQ
-NQkvD11u55KYIrgGgLdasjCFQ+5+0jC0gFE56AWXKaiY8aKMNX6hWLuOQFgu6b/6
-5aQ540RV6hhlqsm4lgMvRT75NmVNkPRGQW2jr0KjOlc/gnBLA6bKGxXJaaX6WMpG
-6TpLu9XMggPwh7aNqmV+C6nIigh5zV7MfGD4TK51eLFWuc4n80gltUaxlZ6GQ3gM
-WYLh5E7e6ykpNeZpRJPc
-=unmK
+iQIcBAEBCAAGBQJVpLpjAAoJEPGu1DbS6WIAKD0P/RRbsLnPmUCawwHSLaYG0ykz
+oINDw6NvOI1JB2ZJ90+pmdzvPRMX0MNwMRDc2CsN1eYDbYSmcDHpb6CFi+WvD0DV
+2wWejBk6FWmLxT9NTb3e+7WqhYmMpPNZeHIe3SuMOndRS8xMqi5MOJcrwYM6rUIJ
+sp76B83NCX/B6vkgi7uJTI5rsFrI7zQp+CdUXDMDNEXuqK422MnXXjsSRr5UnkON
+9TVvhFzUYcGRaGtYl7akfkdiXHaTd2Cxzk2dUMHXndp19YQzAgGRhMYJApq+ERku
+d40cbVd443cvdJypPWcPxclBZkhwZfIWU83eXXhBkvDAI9amsEWcbwcHl0tDixKx
+lKrZYy2lDNyrWs9CAZN+jOCX7vaYDNf9EICFCIIJWHP3tlpM1Xv3NTUNhkn/baP3
+e0Z+CK5Fdx51rS4VKFq2EGgqyqrPCnbGliRU+2pZGbBFOLBuDL09HgJOonlJmqUf
+iyOWSmYtFgnaX/8RpbA+A9Cvq3sFvjHfLcHGdeapsio0JYXjFrOAvqB5Q9yRVxqf
+O3zjQQT34GErT7EkiI8JjI5Q+BCNtAmnTTTxoA6ucjLM8rBzixH8kqF/B8a6cn4Q
+8EOO+8snLIgzL9fHm+1e9U2EXkRxH+CsQcHmpqH0VCsPAxIes/Mopv67Q+oz1hzi
+3QDexetvA3KSF8ISGhXX
+=PYdt
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 95bcd6f4b530..d38fedf3b8ba 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild,v 1.2 2012/09/29 16:41:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild,v 1.3 2015/07/14 07:29:39 vapier Exp $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs flag-o-matic versionator
 
@@ -23,9 +23,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ipv6 readline ssl"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	readline? ( sys-libs/readline )
-	ssl? ( dev-libs/openssl )"
+RDEPEND=">=sys-libs/ncurses-5.2:=
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -47,7 +47,7 @@ src_configure() {
 }
 
 src_install() {
-	dobin ftp/ftp || die
+	dobin ftp/ftp
 	doman ftp/ftp.1 ftp/netrc.5
 	dodoc ChangeLog README BUGS
 }