bump for multilib gettext

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

6 files changed, 268 insertions, 162 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 6264b3b9d53c..ca42ca4ed62e 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.175 2014/01/27 13:18:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.176 2014/01/30 22:24:42 axs Exp $
+
+*emul-linux-x86-baselibs-20131008-r12 (30 Jan 2014)
+
+  30 Jan 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +emul-linux-x86-baselibs-20131008-r12.ebuild,
+  +files/remove-native-20131008-r12,
+  -emul-linux-x86-baselibs-20131008-r10.ebuild,
+  -emul-linux-x86-baselibs-20131008-r8.ebuild,
+  -emul-linux-x86-baselibs-20131008-r9.ebuild:
+  bump for multilib gettext
 
 *emul-linux-x86-baselibs-20131008-r11 (27 Jan 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index faac7f41a412..d0fa9d04d847 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -2,25 +2,20 @@
 Hash: SHA256
 
 AUX remove-native 6879 SHA256 3b088e7445c29979622cce52abad0c52636b1984c46bd3251c331418a10f62e6 SHA512 4ee893d357997e170e3d0009ef8efcfc607edaaac468ec0e4b65b352343eb7d5df2089f1dc496ca5863d8c2c04ee3cf78c04cc5a2e39309084c4b79044bd8d47 WHIRLPOOL 2f28786a823e63b86b9cb190deabe3049efda5c148a998f84429fd88be4664feaa68e41035266af0f61b274fb62b95604a283a7acf36d7ad537f109ba273cea0
+AUX remove-native-20131008-r12 6962 SHA256 72107946302de7210783628827f3f00ddde7fcf0ec4d528b8deb64cf225d539e SHA512 ff08992a323079bfd3761ac4176a3aa0a93b0a87f35e61f208f2e017a1e69c7f3c8cc0455035b1c2547d6c84228b4ee95617fab65c8cf659b726a0ed7e2fa828 WHIRLPOOL 6acab0c7f39f2e4fad5c3ebd6f2aac49c56d8d15dccfd48b62cbd384da7a186c4d18d00eb536241f26da44c0300187b72e53f11178706b68d01cde61fcdb3238
 AUX remove-native-20131008-r6 6437 SHA256 45f8a25fe1335a5d9269e9476a292eef757cb55c57de7c9f78953a574f502120 SHA512 398e903b473336dafb154f4e24aae448adc540778fb5b8c3f4600e9a85d5d80f46ccaef5a485b1daf53b3a2ebfe99514ba7404af4b363ce352328223a763c6de WHIRLPOOL 59b0da70ac0eed8fd862bc5e1731cfe6767749e05d2596f704bddbfea9f1bc62f1695b1b4ec81a6ea7f1456ee776e628222a339612836788d325bc3f6bb3fa0b
 DIST emul-linux-x86-baselibs-20130224.tar.xz 41844860 SHA256 4f303b9d73ff1c0040e034922229bdbe4c0587cade9532ec900f55faf92875a1 SHA512 baa649128fc68ae718f1d105ed2b78641990547686aeb3c6539ef6314b255ec0f4a407e36d4b32926fce0b72f186bfb0633a9d6eb939bc0884f099afc3bcefaa WHIRLPOOL 3c2779524095a3791d08e4b0668b3b76bac427857695d7004e28eedea910a3ea5973390598aea244b23a836e918ed383b1ad3b03b03b4beaff95f42584aec219
 DIST emul-linux-x86-baselibs-20131008.tar.xz 55992196 SHA256 83c077c2d0668502c26abb4c30e1bd9ebd3eb4d2fdb2bab3ec57331a3df2b449 SHA512 4ec890f8bab877a576024c4d932906a486b5d584026c8a89563735d520258dce6a47a47e41ec5cae32be89d697a903844f15b9c2a16338a0d34c4cc46cd781ef WHIRLPOOL 0ec725072c8fbd1b0e8649f715e6a4e26ea9462c9ed290f0f42a5b606cdfa6736f839396ac6a967cfce9c864e5da4cc2082ce2db83cc4a9cb49824e7b975bb20
 EBUILD emul-linux-x86-baselibs-20130224.ebuild 1049 SHA256 f97fb9dbbaf9c1ffcf23466b3540f491ba94a7c9cb514f93a2221aa91284569b SHA512 89280d3e3f91e8b8de001a1d1de3eb143b232d44e92110a67e07e0996683ca7a2b4bf1e23d5946be70dd45432f9a449779787741ef7aca84147bdb71621ad553 WHIRLPOOL 3ddc44d25f36e7ea70d8460712bef445da3bab8f92899893aff32db8223edd3d79e5c2709ac9862afdc3cf71695db25dff82de757e43ac46ba7b2475cc9195b4
-EBUILD emul-linux-x86-baselibs-20131008-r10.ebuild 2751 SHA256 c263d87f29ad535dc8cba815e7985038a400ab93d3715555e463453758c705d4 SHA512 d0be4712a31a8cf27fd4b117bdf3455d8a212babb04171be9bd51c22e552c498a90b630a0c5e2bcad24c74a8c63ce58e7a0d1992aa47eae24ac54062ea400d7e WHIRLPOOL 5add58b273227e698842bb6a29262d76b2ddbe7fda7940bb1800e44fd1b7a57678666bd5ff932eae4772e09ebf3b9276f99ea8283f08d8c7255921e27b55fb4a
 EBUILD emul-linux-x86-baselibs-20131008-r11.ebuild 2751 SHA256 6460afabcc0ba75dd166cb1173f1663950ae432c78ab471c4e62c1a3ce35d021 SHA512 b130fcb35752a4cecc379a483d10cd47bd97d6d9495217c78389874d3adf6e651e281f80605cc0f31d77f079c1164cef43e3ecefd95c42cd4136a31d6bb8912d WHIRLPOOL 7b35dfb9081e03e1ea733f3d1a0ee52d41384403af15c7dc6044f7e4996a7fb2e4232ca2e65d04ce4656c14fea1163d717558f6727f6bb44f902f006f022133d
+EBUILD emul-linux-x86-baselibs-20131008-r12.ebuild 2798 SHA256 8b4ee42dfa852b0714e7204e6523af8b6c3056de3a6fc52b8ccf81be07c906ae SHA512 8f7286b4c5e361af87260f1a5670faea2fa5ee15299d1945243468fd2acf2515d5fa932b5a69d56ec6080918a5a971138d34c58c87d56221ddfe578b1d1cfbd5 WHIRLPOOL 3b9d733a4133e23676a3e5682e57c59a6297b2bcb3d4e8b7bb2b015579cd869b3339ce9534352c2c4c09410029294dba0cce18d23fd732d3ac638b620067cb1c
 EBUILD emul-linux-x86-baselibs-20131008-r6.ebuild 2640 SHA256 252da31ceba4785999f0a8b0f14cec5774f6a3ff17c9a82727ba1d2bf3a15488 SHA512 e164798766d65557ebc8ed1e09cc0bd08e5bfa25bc08b15368776b5c5419a91b30aabd15807801b5b1256d8c08425ceddd3007ed8942ee0c2022d79c141cf35a WHIRLPOOL 4be307fedb38042115b04b5bfc0441c636a5e0259ed534d64587b8399c0356c0aa94621ae56f3a58c9bcf13a49398ef54aee28f8dd459f86b3700be27a5dfed5
-EBUILD emul-linux-x86-baselibs-20131008-r8.ebuild 2771 SHA256 98f310f74c4ca97e0f8d482dc285e7d63c555c600686ea37d0e4d5a34bbb0cfc SHA512 545f19e1c7d6c7fba5a0cbbefd4fd46f649be77f05b646a90c6a6180d68ba8bb0baf6e7a0020ef762484a9c8f139a8908abd610aecb73230bfb988a344d04517 WHIRLPOOL 0e8afe9c18c00e499be2fc27f1db7b2b0380f37385ccba5a57e0120ffb07e3aa37edd8f54549ef5746766e3398f0379d7692848e3ae323547f1ee6b9562cccca
-EBUILD emul-linux-x86-baselibs-20131008-r9.ebuild 2750 SHA256 c4dc66ec57480830fd9723a36b4b1cc064601ea15c05e7609d477eb56a9bad5a SHA512 67e1620270cbff8c170edd1130f1ff83c1e49301592c4ccf398eaf1f0b3185746cd35a84402d50217e81a5dc9f75a5af7ce07b7d6d336c93fae8f1e01da5dcb2 WHIRLPOOL 5be8f2e1461ec4db22035020635b3a3e24e8c1c9ae0b0b984575895f4badf69ab689357f9b9129d1fdba1f3d46ff5ff40dc1dc8c82b0cfe8156270aca6880c34
-MISC ChangeLog 33544 SHA256 1ea492b7be21b876780f72a4b3fbbecee4eadf1b296fcda92114848a8a392553 SHA512 45d6091677001f49ecdbd0f9e5c4186947ccaf4fb0575baded7760a560e3c9bf66e0863c816b2670e5acaad968fb12215d32b35b57bf426efb601d655ff10c11 WHIRLPOOL 4085e3a33daff501f553e554aa99af18f8e3c629fa90768545415afc840c2a011279d2a0c4f7dc4eb0b4095767b131d9b0576bc98de23170f2ec7e388603b0a6
+MISC ChangeLog 33904 SHA256 1157de4e1a17555a3446a8ef1bf35ba9066736a5b21000d19e45a7ca1fb7a248 SHA512 4f23c82842a05578c2067785289acddadf60f83ad69b65fbfbd16a3180b359b35968a392ba56bc003098f00beae4ae11609444c066ce7bb11083d2f470a49458 WHIRLPOOL 8dda7fead5121520b71d21361b6ce9c452ea212d0be0f8405d541d9509910200630cd6ab30b8297cdfd3efe0777c8411ff26e0e351cdf15eb66c7676114f5ea6
 MISC metadata.xml 312 SHA256 9d3f082956c89c24d50eacf1a35e6d3f7e7605a2b290b3ca01123c357595b680 SHA512 21f9fbd2145e18c319f089f1cb2f99cec289daac7e35c944335d979fca8ae595ac2ab81a025c55d56dde80ed7db88fdcd0b644bf2070b6eee7c26bf643fc4e19 WHIRLPOOL 5cfe4fa3453b53f0d056331b905da9584e13a48af3671f248b7ede707b587338b145613a77cf655af74734ae1e9d0dfe50f13d34a2cb069a73c76abc3a753262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS5ly0AAoJEEdUh39IaPFNOjIH/RVIhtE05nxHHqDZl4FlwIDV
-R22JOu3SvsjmANmjrbO69jPoPtFS4Joccblka3LHlzgvKO9JH18AkSTarkdWO9Ww
-aRaxKG/bYf9kfr1GbtGc6HkVb69/P+yfkfo8Nr6HEnFEduWNcfCKQXirw6NTRYra
-jCun+udGwo7Bo/Eds0y08p5zIgqcTJ1iHviWBUqOWnrjul0+Z8VeyhfFFnGEUWuA
-Rx3nIRjFbQsBsjCOIFcIBI+4EhGc0h6P6sBJk4S3nuivLAAK5JsdkgHghaslEkua
-g775jv+n14mgB3KZyBKC0ECDJrsMndcGA20HuZI0KNET7mrtx6EljqgmTwg36fs=
-=FHJw
+iF4EAREIAAYFAlLq0SsACgkQ2ugaI38ACPA8vwEAthgjCldR+X1gdqqBFOLH1QVl
+8lLuKcIhK3lVvILtj6AA/0ln4kakT8iftzeb/3R4qC6BR7f3ojPAai29izVVmvxv
+=t4A7
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r10.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild
index f64cadbd0611..5b233592f55b 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r10.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r10.ebuild,v 1.1 2014/01/27 12:50:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r12.ebuild,v 1.1 2014/01/30 22:24:42 axs Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -54,6 +54,7 @@ RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
 		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
 		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
 		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
+		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
 	)
 	>=sys-libs/glibc-2.15" # bug 340613
 
@@ -70,5 +71,5 @@ src_prepare() {
 	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
 
 	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
+	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
 }
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r8.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r8.ebuild
deleted file mode 100644
index 13a82bec8505..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r8.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r8.ebuild,v 1.1 2013/12/30 08:37:02 aballier Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		>=media-libs/libjpeg-turbo-1.3.0-r2:0[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild
deleted file mode 100644
index 627768e1fb13..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r9.ebuild,v 1.1 2014/01/24 11:59:24 ssuominen Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12
new file mode 100644
index 000000000000..f7fe0dc9b747
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r12
@@ -0,0 +1,248 @@
+lib32/libz.so.1
+lib32/libz.so.1.2.7
+usr/lib32/libz.so
+usr/lib32/pkgconfig/zlib.pc
+usr/lib32/libminizip.so
+usr/lib32/libminizip.so.1
+usr/lib32/libminizip.so.1.0.0
+usr/lib32/pkgconfig/minizip.pc
+lib32/libbz2.so.1
+lib32/libbz2.so.1.0
+lib32/libbz2.so.1.0.6
+usr/lib32/libbz2.so
+usr/lib32/libpng.so
+usr/lib32/pkgconfig/libpng.pc
+usr/lib32/libudis86.so
+usr/lib32/libudis86.so.0
+usr/lib32/libudis86.so.0.0.0
+usr/lib32/libffi-3.0.11/include/ffi.h
+usr/lib32/libffi-3.0.11/include/ffitarget.h
+usr/lib32/libffi.so
+usr/lib32/libffi.so.6
+usr/lib32/libffi.so.6.0.0
+usr/lib32/pkgconfig/libffi.pc
+usr/lib32/llvm/BugpointPasses.so
+usr/lib32/llvm/LLVMHello.so
+usr/lib32/llvm/libLLVM-3.1.so
+usr/lib32/llvm/libLTO.so
+usr/lib32/llvm/libprofile_rt.so
+usr/lib32/libpng12.so.0
+usr/lib32/pkgconfig/libpng15.pc
+usr/lib32/libraw1394.so
+usr/lib32/libraw1394.so.11
+usr/lib32/libraw1394.so.11.0.1
+usr/lib32/pkgconfig/libraw1394.pc
+usr/lib32/libavc1394.so
+usr/lib32/libavc1394.so.0
+usr/lib32/libavc1394.so.0.3.0
+usr/lib32/pkgconfig/libavc1394.pc
+usr/lib32/librom1394.so
+usr/lib32/librom1394.so.0
+usr/lib32/librom1394.so.0.3.0
+usr/lib32/libjpeg.so
+usr/lib32/libturbojpeg.so
+usr/lib32/libturbojpeg.so.0*
+usr/lib32/libjpeg.so.8.0.2
+usr/lib32/libjpeg.so.8
+usr/lib32/libjpeg.so.62
+usr/lib32/libexpat.so
+usr/lib32/libexpat.so.1
+usr/lib32/libexpat.so.1.6.0
+usr/lib32/libexpatu.so
+usr/lib32/libexpatu.so.1
+usr/lib32/libexpatu.so.1.6.0
+usr/lib32/libexpatw.so
+usr/lib32/libexpatw.so.1
+usr/lib32/libexpatw.so.1.6.0
+usr/lib32/pkgconfig/expat.pc
+usr/lib32/pkgconfig/expatu.pc
+usr/lib32/pkgconfig/expatw.pc
+usr/lib32/libusb-0.1.so.4*
+usr/lib32/libusb-1.0.so
+usr/lib32/libusb-1.0.so.0
+usr/lib32/libusb-1.0.so.0.1.0
+usr/lib32/libusb.so
+usr/lib32/pkgconfig/libusb-1.0.pc
+usr/lib32/pkgconfig/libusb.pc
+lib32/libudev.so.1*
+usr/lib32/libudev.so
+usr/lib32/pkgconfig/libudev.pc
+lib32/libsystemd-daemon.so.0.0.7
+lib32/libsystemd-daemon.so.0
+usr/lib32/libsystemd-daemon.so
+usr/lib32/pkgconfig/libsystemd-daemon.pc
+usr/lib32/libtiff.so
+usr/lib32/libtiff.so.5*
+usr/lib32/libtiffxx.so
+usr/lib32/libtiffxx.so.5*
+usr/lib32/pkgconfig/libtiff-4.pc
+lib32/libattr.so.1
+lib32/libattr.so.1.1.0
+usr/lib32/libattr.so
+usr/lib32/glib-2.0/include/glibconfig.h
+usr/lib32/libglib-2.0.so
+usr/lib32/libglib-2.0.so.0
+usr/lib32/libglib-2.0.so.0.3200.4
+usr/lib32/pkgconfig/glib-2.0.pc
+usr/lib32/libgmodule-2.0.so
+usr/lib32/libgmodule-2.0.so.0
+usr/lib32/libgmodule-2.0.so.0.3200.4
+usr/lib32/pkgconfig/gmodule-2.0.pc
+usr/lib32/libgio-2.0.so
+usr/lib32/libgio-2.0.so.0
+usr/lib32/libgio-2.0.so.0.3200.4
+usr/lib32/pkgconfig/gio-2.0.pc
+usr/lib32/libgobject-2.0.so
+usr/lib32/libgobject-2.0.so.0
+usr/lib32/libgobject-2.0.so.0.3200.4
+usr/lib32/pkgconfig/gobject-2.0.pc
+usr/lib32/libgthread-2.0.so
+usr/lib32/libgthread-2.0.so.0
+usr/lib32/libgthread-2.0.so.0.3200.4
+usr/lib32/pkgconfig/gthread-2.0.pc
+usr/lib32/pkgconfig/gio-unix-2.0.pc
+usr/lib32/pkgconfig/gmodule-export-2.0.pc
+usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
+usr/lib32/liblcms2.so
+usr/lib32/liblcms2.so.2
+usr/lib32/liblcms2.so.2.0.3
+usr/lib32/pkgconfig/lcms2.pc
+usr/lib32/libpaper.so
+usr/lib32/libpaper.so.1
+usr/lib32/libpaper.so.1.1.2
+usr/lib32/libtiff.so.3
+usr/lib32/libtiff.so.4
+usr/lib32/libtiffxx.so.3
+usr/lib32/libtiffxx.so.4
+usr/lib32/elfutils/libebl_alpha-0.149.so
+usr/lib32/elfutils/libebl_alpha.so
+usr/lib32/elfutils/libebl_arm-0.149.so
+usr/lib32/elfutils/libebl_arm.so
+usr/lib32/elfutils/libebl_i386-0.149.so
+usr/lib32/elfutils/libebl_i386.so
+usr/lib32/elfutils/libebl_ia64-0.149.so
+usr/lib32/elfutils/libebl_ia64.so
+usr/lib32/elfutils/libebl_ppc-0.149.so
+usr/lib32/elfutils/libebl_ppc.so
+usr/lib32/elfutils/libebl_ppc64-0.149.so
+usr/lib32/elfutils/libebl_ppc64.so
+usr/lib32/elfutils/libebl_s390-0.149.so
+usr/lib32/elfutils/libebl_s390.so
+usr/lib32/elfutils/libebl_sh-0.149.so
+usr/lib32/elfutils/libebl_sh.so
+usr/lib32/elfutils/libebl_sparc-0.149.so
+usr/lib32/elfutils/libebl_sparc.so
+usr/lib32/elfutils/libebl_x86_64-0.149.so
+usr/lib32/elfutils/libebl_x86_64.so
+usr/lib32/libelf-0.149.so
+usr/lib32/libelf.so
+usr/lib32/libelf.so.1
+usr/lib32/libasm-0.149.so
+usr/lib32/libasm.so
+usr/lib32/libasm.so.1
+usr/lib32/libdw-0.149.so
+usr/lib32/libdw.so
+usr/lib32/libdw.so.1
+lib32/libss.so.2
+lib32/libss.so.2.0
+usr/lib32/libss.so
+usr/lib32/pkgconfig/ss.pc
+lib32/libcom_err.so.2
+lib32/libcom_err.so.2.1
+usr/lib32/libcom_err.so
+usr/lib32/pkgconfig/com_err.pc
+usr/lib32/libcurses.so
+usr/lib32/libform.so
+usr/lib32/libform.so.5
+usr/lib32/libform.so.5.9
+usr/lib32/libformw.so
+usr/lib32/libformw.so.5
+usr/lib32/libformw.so.5.9
+usr/lib32/libmenu.so
+usr/lib32/libmenu.so.5
+usr/lib32/libmenu.so.5.9
+usr/lib32/libmenuw.so
+usr/lib32/libmenuw.so.5
+usr/lib32/libmenuw.so.5.9
+lib32/libncurses.so.5
+lib32/libncurses.so.5.9
+lib32/libncursesw.so.5
+lib32/libncursesw.so.5.9
+usr/lib32/libncurses.so
+usr/lib32/libncursesw.so
+usr/lib32/libpanel.so
+usr/lib32/libpanel.so.5
+usr/lib32/libpanel.so.5.9
+usr/lib32/libpanelw.so
+usr/lib32/libpanelw.so.5
+usr/lib32/libpanelw.so.5.9
+usr/lib32/pkgconfig/form.pc
+usr/lib32/pkgconfig/formw.pc
+usr/lib32/pkgconfig/ncurses++.pc
+usr/lib32/pkgconfig/ncurses++w.pc
+usr/lib32/pkgconfig/menuw.pc
+usr/lib32/pkgconfig/menu.pc
+usr/lib32/pkgconfig/ncurses.pc
+usr/lib32/pkgconfig/ncursesw.pc
+usr/lib32/pkgconfig/panel.pc
+usr/lib32/pkgconfig/panelw.pc
+usr/lib32/terminfo
+lib32/libgpm.so.1
+lib32/libgpm.so.1.20.0
+usr/lib32/libgpm.so
+usr/lib32/libgmp.so*
+usr/lib32/libgmpxx.so*
+lib32/libpcre.so.1
+lib32/libpcre.so.1.2.1
+usr/lib32/libpcre.so
+usr/lib32/libpcrecpp.so
+usr/lib32/libpcrecpp.so.0
+usr/lib32/libpcrecpp.so.0.0.0
+usr/lib32/libpcreposix.so
+usr/lib32/libpcreposix.so.0
+usr/lib32/libpcreposix.so.0.0.2
+usr/lib32/pkgconfig/libpcre.pc
+usr/lib32/pkgconfig/libpcrecpp.pc
+usr/lib32/pkgconfig/libpcreposix.pc
+usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
+usr/lib32/libdbus-1.so
+usr/lib32/libdbus-1.so.3
+usr/lib32/libdbus-1.so.3.7.4
+usr/lib32/pkgconfig/dbus-1.pc
+lib32/libwrap.so
+lib32/libwrap.so.0
+lib32/libwrap.so.0.7.6
+usr/lib32/libwrap.so
+usr/lib32/libgdbm.so
+usr/lib32/libgdbm.so.3
+usr/lib32/libgdbm.so.3.0.0
+usr/lib32/libgdbm_compat.so
+usr/lib32/libgdbm_compat.so.3
+usr/lib32/libgdbm_compat.so.3.0.0
+usr/lib32/libjson.so
+usr/lib32/libjson.so.0
+usr/lib32/libjson.so.0.0.1
+usr/lib32/pkgconfig/json.pc
+usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
+usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
+usr/lib32/python2.7/lib-dynload/dbm.so
+usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
+usr/lib32/python2.7/lib-dynload/gdbm.so
+usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
+usr/lib32/libxml2.so*
+usr/lib32/pkgconfig/libxml-2.0.pc
+usr/lib32/python*/site-packages/libxml2mod.so
+usr/lib32/libdbus-glib-1.so
+usr/lib32/libdbus-glib-1.so.2
+usr/lib32/libdbus-glib-1.so.2.2.2
+usr/lib32/pkgconfig/dbus-glib-1.pc
+lib32/libreadline.so.6
+lib32/libreadline.so.6.2
+usr/lib32/libreadline.so
+lib32/libhistory.so.6
+lib32/libhistory.so.6.2
+usr/lib32/libhistory.so
+usr/lib32/libmng.so
+usr/lib32/libasprintf.so
+usr/lib32/libasprintf.so.0
+usr/lib32/libasprintf.so.0.0.0