Use subslots with readline/mpfr.

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

3 files changed, 24 insertions, 21 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 6555f684c883..512bc2137fe3 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.184 2015/07/02 07:08:29 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.185 2015/07/14 07:38:38 vapier Exp $
+
+  14 Jul 2015; Mike Frysinger <vapier@gentoo.org> gawk-4.1.3.ebuild:
+  Use subslots with readline/mpfr.
 
   02 Jul 2015; Lars Wendler <polynomial-c@gentoo.org>
   files/gawk-4.1.3-bsd_configure_readline.patch:
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 01e47dfa03d7..67d964dbb88c 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX filefuncs/Makefile 1226 SHA256 a3b91ceefd4d659d9ffdc0c8502c7de10e7d4f9daee4e297cb2d8da11257c77e SHA512 7238b64971d6345d99d24b75363f9d842befa140c3373709c0ddfceb566666fbf75dfa10aea032028b1a7ffe94180d389fb922b23f79ccf8f319a76d23b2c96d WHIRLPOOL 3557762a538e26484a3203fac09b6094e4eef306dfa6fa414a5722bf738accadd0f893787d102cefd5b1132db7d12511ec0378c958ef51370ee618f25aaf3698
 AUX filefuncs/filefuncs.c 10992 SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309 SHA512 07caa4dfe83716de8218f9035b893778461a8c709a538a0a3f45dc6a08f99387a9bf15967b849cdad8ccfe1fb94fc4c3de790457f6460998275afe20f8c16a94 WHIRLPOOL 6b2078a9538691871c6441a5d828d17246a97640ad8c3d080e9b24f324488500e2da4058bdb387ee857d849ec9f4a0be36f77fc335357c4a48f24ca9bb5271bf
@@ -12,23 +12,23 @@ DIST gawk-4.1.3.tar.xz 2311268 SHA256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d
 EBUILD gawk-3.1.8.ebuild 1899 SHA256 e744223da8960e3a7d6cb6a7ad33e286be8d0b611bf88df4a55bd8e6b8cdbe45 SHA512 64f8018d3548784044188170589d20049c7dfd91090f3be709f1d405f638fb5585e2a846e69b6993ae05cd1e880ab51513617044ea11c933800e9a31828a8778 WHIRLPOOL a4382af5d5538f8638f28d76e746799a905d3ab6899562fa437c60ded1657cb2a84a79ed65c48e78ad26262dd8849786affa4e844f76437d2678bcae9ad73210
 EBUILD gawk-4.0.2.ebuild 2264 SHA256 7136d6883bd88a6afc0fdc08b80249500469d1701247653117225a1567361779 SHA512 ad0c0e04b1470b7b93d45d420e0d6c8ffd89836400814eea0cea670bb3901ecda80f96f055e91620e2b2d875caffecc27a3b2e499cf03a5e4963e9b643f0b999 WHIRLPOOL d4491d84b12c30aa0b2983346598aac85c01b0928c09e43042f1b2b63457e40cf73976e80ecf463484bd00126f16c791336629b5b0344721505a94d5efb533a1
 EBUILD gawk-4.1.2.ebuild 2307 SHA256 20f9b8f4d0f1832407cca08cd96d718fe6bba8eedc9e9292fc60b3254c720635 SHA512 66c149a6572186cc751fdf95523780cf7d48095d733cf1fba9f69800b9bccd2b08aa45a8647e2850e1039bbd8bd10a6a9e39c11bd3315978685811c03f68217d WHIRLPOOL 48012177a9626711eca7c5352c10137d43b248fd0461c97fa235be199d30d7a72ddc45eb9f63362425cf7184d5c92b9f055e4b5745726aaf2a1eb98633c7bcc5
-EBUILD gawk-4.1.3.ebuild 2392 SHA256 491b3df2e2084262eaea1d76f21e267aa7f0fd459e2b110ce970bde9d1d801aa SHA512 4147de24cb1d1e99d6c6811f346c8941f3ca166e9b805faec717c042f1064de89186d0fd1d3b862d97ef98b0e540177cb758cf0ab1fe3f9508ff433f61f18b4c WHIRLPOOL 4697cb6d76640f70f2873be148390375aa398546f5a8d5828581533e3cb070fb22330122f1d5aa0e78fc287729456e58c748b38a1ae3b2b3c14a59b82506502d
-MISC ChangeLog 25136 SHA256 2f2b570aeb76affcd4610bf0137f1aeb1c1b366d3f63f61e17041e0b3baca6c9 SHA512 139f8bf0329c1a27582762227c77de5e2970fee6b7124cbc7aa9ae01e62d7d007a56e2105a16ddbd5de8cb72dfe51f2e2586420b94ae2d6b237090d5cbc08d01 WHIRLPOOL 61fc444bf3ea984d94fa5a9fbf608cf72ea80cbd833114d78f52e95f02301debf6243d0244af9953c4487055ecff590a9b45f068dca5f3aaa9570a2cac992068
+EBUILD gawk-4.1.3.ebuild 2392 SHA256 45fb228e133130e8ab263a53aa62c88e34ecc590300924d2c1bcc0540cfd1d09 SHA512 8dd1eb5558e619d3b5ab8cf3092fb177281f82493164a812c39df5b01ced440818c332254864594422995a43d4921891fc9c850f63a6221ce82f24a7fb764697 WHIRLPOOL c0b188e32a687f398792e160a14d3f7d4e81347f47571e68e2fb551cc0c6bc380aa47eb26003743f00bda404be6cf83cb983b77db9824b1a91dff6a32174d504
+MISC ChangeLog 25235 SHA256 bde68cfbf1ddb7ec621042d675bab7b5aeffed7f3f092dc278b0c0ac2cd602de SHA512 243495808dbef55124b5a8d02e27b87550ad40104b427ed9bb63d3c8785a84d0acd3675a8d15c8579553c22f06809a47d19530eea0300a0b616ed2e3fb527dee WHIRLPOOL 70afaf3d02a4f5a3e4b4b13bb3c9f912d55c4b4c6f06beb10412f52b59fd82e5b6bfb9548fbe1a625e933750e903cb179cf31267b4abba103b3539d95622e8d8
 MISC metadata.xml 258 SHA256 741574d9acaca0b5556f6cfa01e8754daa3519c18c5903e17a6fb8874bcfa451 SHA512 e63162871aee375c0b000a9052cb944072b43b400c532a0eff50599e40f010ada30675e68c60d0497226f5b593220235b9b6357e1f1f8859ea71852e532822b8 WHIRLPOOL 75d54aeff7b6adb2760941a8c12fbba6f1a67f9167d938e267bb61046770c9508bbcc9b732c564983c27eb6450780edbe2cd4ac19b2aa317d97e0a6e4da49d9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJVlONuAAoJEPiazRVxLXTFtPMQAKb+5b8krdmS7te1uc1cEhRN
-RydjneqlTuz7W+z4qOdG2kUvmFfIkwA+5g8FNCCbjGOugPlytte2rNDqzvd9M44A
-nPeK0iWLWHO4UpBJDindTgoEyX6M4/Lm9i9ZsJvs4c3UsVe0lCSTzPEZ0fdNxF+J
-DnqPzOZVgw6AVGB+d+Zn0gDeA5/iXVlwzNfMVesdFm9kbBNaREYuKIr+bFLILP/L
-qbyd94cCKBVx44j0BrSRcQGUJLhCO+o6Nmhs5mjiQS6uvCxYcQNDPuT9RlXvL7ZG
-DOpR3bCX80DI807cFvLIvYZW6Nma6GDUnaUZWiHuUVvSsVSgtvSOjTSalCnUurRZ
-/YObIjG/20xuOer+OceNsIx6Zo5fOisCT20qGvbD7NGqpk/HKrXaJ7Y81t0P8yvj
-VWrU4DxlbAL2D4u3Dg8WKP3Lcrip+4mIUVggcYY7j1MY+AI93UVY4G5rF7gvGJsf
-cD/fktCza0kHK/VyN8TSsUI492gXhlQrzhzUIacto6yMCXnTIHDryVxnTqtfRg6r
-9HtOcoGWJFeB4KTbP13hMXzTIsfR8GMXA14bZmJjrWMlDe+kflnJ1T1EcyJN1pYz
-OXIBxA+6I5rtFzcPnB4R/PJjIvqGiwXm4cS8gpbUy6zGjqBJ5/OyQAua/pSYV48A
-Z5myMqBFZAVAOrfaJ9sr
-=VXan
+iQIcBAEBCAAGBQJVpLx+AAoJEPGu1DbS6WIASbcP/RtXcQFoVfwqLOIJv6quqW7l
+yF0P4NOpsGVHzkyuBkImFT2RNCxGnDns/AkMj7mIgKmvzNTTW3eR52bwS56WKyj6
+EldPhTutZ25hryR7KGg74j0YyOdr/dNjjMwrKAz/Qlo5Zq/U2KrBvF3GkGvC9Uf4
+u3ijMKP1QEZKIJXWGN8QJfOVI4Zi31+HplS0pMnvP/ZyBY5KjqwEvw3sBO7Q6ULy
+YDGJQ2cqawYbunQjwhPuzFh/SEX061tDkxOs4Iiri5TmztW7ZIJCfRujfdGOEp6l
+2S/3MvQcl8Y9hK6dNrh88XOFDGv0i6VUtk1UyZPLfuVD0hW6csL9FqKZkFsFKyeC
+RSkHs7qn9ylCSmbApYCv2nubnjr/IrxDRh/flDmvB/cuKtpO02SJJqme6uF6gss5
+cBl0rkdguG3s4GLtnvJ9Bk3mSelwfUlpNzR+exsonaIdVm55a7BQFGqcE+iJeyqX
+7sQsmJh3KqqudxTif9PQpGGDKFRsDKsvBtB6HkSDQxZKg6b1N98d32r7eRKdqlSu
+lWR10y/Rweccv4saTVqHESB6QYVQ3zXjddy6oSvHAGtXRw2ElTNoSspjmy5AnYIG
+i5VHVVRkypf1DWp4o754n9lXWFvnds70QKn7CK//6HUgTVVPfc2k2whTllNDg9Mu
+4Ktk5d9EBwAAY988Gki5
+=rD/1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/gawk-4.1.3.ebuild b/sys-apps/gawk/gawk-4.1.3.ebuild
index bcdb50181b97..4655ad4aa359 100644
--- a/sys-apps/gawk/gawk-4.1.3.ebuild
+++ b/sys-apps/gawk/gawk-4.1.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.3.ebuild,v 1.2 2015/06/30 20:31:53 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.3.ebuild,v 1.3 2015/07/14 07:38:38 vapier Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib
 
@@ -15,8 +15,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
-RDEPEND="mpfr? ( dev-libs/mpfr )
-	readline? ( sys-libs/readline )"
+RDEPEND="mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"