Remove the old revisions.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

20 files changed, 17 insertions, 4554 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 25db0d3e0b5a..4639b990579e 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,22 @@
 # 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.214 2014/05/25 11:29:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.215 2014/05/29 16:37:33 mgorny Exp $
+
+  29 May 2014; Michał Górny <mgorny@gentoo.org>
+  -emul-linux-x86-baselibs-20140406-r1.ebuild,
+  -emul-linux-x86-baselibs-20140406-r3.ebuild,
+  -emul-linux-x86-baselibs-20140508-r1.ebuild,
+  -emul-linux-x86-baselibs-20140508-r2.ebuild,
+  -emul-linux-x86-baselibs-20140508-r3.ebuild,
+  -emul-linux-x86-baselibs-20140508-r4.ebuild,
+  -emul-linux-x86-baselibs-20140508-r5.ebuild,
+  -emul-linux-x86-baselibs-20140508.ebuild, -files/remove-native,
+  -files/remove-native-20140406, -files/remove-native-20140406-r1,
+  -files/remove-native-20140406-r2, -files/remove-native-20140406-r3,
+  -files/remove-native-20140508, -files/remove-native-20140508-r1,
+  -files/remove-native-20140508-r2, -files/remove-native-20140508-r3,
+  -files/remove-native-20140508-r4, -files/remove-native-20140508-r5:
+  Remove the old revisions.
 
 *emul-linux-x86-baselibs-20140508-r6 (25 May 2014)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild
deleted file mode 100644
index 52a306da48ce..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild
+++ /dev/null
@@ -1,95 +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-20140406-r1.ebuild,v 1.5 2014/05/04 12:22:23 pacho 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"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	rm -rf "${ED}"/usr/include # needed for openssl tbz2
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild
deleted file mode 100644
index 6b2ffe2afc2e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r3.ebuild
+++ /dev/null
@@ -1,101 +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-20140406-r3.ebuild,v 1.2 2014/05/03 13:04:10 pacho 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"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/emul/openssl-1.0.1g.tbz2"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	!abi_x86_32? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-	rm -rf "${ED}"/usr/include # needed for openssl tbz2
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild
deleted file mode 100644
index 345e3c94f5cd..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r1.ebuild
+++ /dev/null
@@ -1,97 +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-20140508-r1.ebuild,v 1.3 2014/05/14 08:47:49 mgorny 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r2.ebuild
deleted file mode 100644
index 17a01f35b15e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r2.ebuild
+++ /dev/null
@@ -1,100 +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-20140508-r2.ebuild,v 1.1 2014/05/15 07:49:23 mgorny 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=app-crypt/mit-krb5-1.12.1-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r3.ebuild
deleted file mode 100644
index fda0adc620b1..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r3.ebuild
+++ /dev/null
@@ -1,101 +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-20140508-r3.ebuild,v 1.1 2014/05/15 18:37:09 mgorny 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r4.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r4.ebuild
deleted file mode 100644
index 2d5f65d31f50..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r4.ebuild
+++ /dev/null
@@ -1,102 +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-20140508-r4.ebuild,v 1.1 2014/05/21 11:04:43 mgorny 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild
deleted file mode 100644
index a189952e0b38..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508-r5.ebuild
+++ /dev/null
@@ -1,103 +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-20140508-r5.ebuild,v 1.1 2014/05/23 23:15:12 jcallen 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1:0[abi_x86_32(-)]
-		>=dev-libs/openssl-0.9.8y-r1:0.9.8[abi_x86_32(-)]
-		>=net-libs/gnutls-3.3.1-r1[abi_x86_32(-)]
-		>=net-print/cups-1.7.1-r2[abi_x86_32(-)]
-		>=sys-libs/talloc-2.1.0-r1[abi_x86_32(-)]
-		>=sys-apps/keyutils-1.5.9-r1[abi_x86_32(-)]
-		>=virtual/krb5-0-r1[abi_x86_32(-)]
-		>=sys-libs/db-4.8.30-r1:4.8[abi_x86_32(-)]
-		>=net-nds/openldap-2.4.38-r2[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508.ebuild
deleted file mode 100644
index ced0dea144ba..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140508.ebuild
+++ /dev/null
@@ -1,95 +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-20140508.ebuild,v 1.2 2014/05/13 18:03:30 mgorny 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? (
-		!>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-	)
-	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-devel/gettext-0.18.3.2[abi_x86_32(-)]
-		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
-		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
-		>=dev-libs/nettle-2.7.1-r1[abi_x86_32(-)]
-		>=dev-libs/libtasn1-3.4-r1[abi_x86_32(-)]
-		dev-libs/libgcrypt:11[abi_x86_32(-)]
-		>=dev-libs/libgcrypt-1.6.1-r1:0[abi_x86_32(-)]
-		>=dev-libs/lzo-2.06-r1[abi_x86_32(-)]
-		>=dev-libs/libxslt-1.1.28-r2[abi_x86_32(-)]
-		>=sys-apps/file-5.18-r1[abi_x86_32(-)]
-		>=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)]
-		>=media-libs/giflib-4.2.3-r1[abi_x86_32(-)]
-		>=sys-libs/slang-2.2.4-r1[abi_x86_32(-)]
-		>=sys-apps/acl-2.2.52-r1[abi_x86_32(-)]
-		>=sys-apps/util-linux-2.24.1-r3[abi_x86_32(-)]
-		>=sys-devel/libtool-2.4.2-r1[abi_x86_32(-)]
-		>=virtual/acl-0-r2[abi_x86_32(-)]
-		>=dev-libs/openssl-1.0.1g-r1[abi_x86_32(-)]
-	)
-	>=sys-libs/glibc-2.16" # 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 $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native b/app-emulation/emul-linux-x86-baselibs/files/remove-native
deleted file mode 100644
index a4757e25d8e4..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native
+++ /dev/null
@@ -1,245 +0,0 @@
-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
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406
deleted file mode 100644
index ae4ca37a4354..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406
+++ /dev/null
@@ -1,287 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.8.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.2
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.2
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r1 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r1
deleted file mode 100644
index f3ccfb57aec9..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r1
+++ /dev/null
@@ -1,289 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.8.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.2
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.2
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r2 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r2
deleted file mode 100644
index 66795e9fa1fc..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r2
+++ /dev/null
@@ -1,309 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.8.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.2
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.2
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r3 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r3
deleted file mode 100644
index 53f9d9d819cb..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406-r3
+++ /dev/null
@@ -1,327 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.8.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.2
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.2
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508
deleted file mode 100644
index 2a4c6177a251..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508
+++ /dev/null
@@ -1,334 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r1 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r1
deleted file mode 100644
index 7dac257270f8..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r1
+++ /dev/null
@@ -1,358 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
-usr/lib32/libgnutls-extra.so
-usr/lib32/libgnutls-extra.so.26
-usr/lib32/libgnutls-extra.so.26.22.6
-usr/lib32/libgnutls-openssl.so
-usr/lib32/libgnutls-openssl.so.27
-usr/lib32/libgnutls-openssl.so.27.0.0
-usr/lib32/libgnutls.so
-usr/lib32/libgnutls.so.26
-usr/lib32/libgnutls.so.26.22.6
-usr/lib32/libgnutlsxx.so
-usr/lib32/libgnutlsxx.so.27
-usr/lib32/libgnutlsxx.so.27.0.0
-usr/lib32/pkgconfig/gnutls-extra.pc
-usr/lib32/pkgconfig/gnutls.pc
-usr/lib32/libcups.so
-usr/lib32/libcups.so.2
-usr/lib32/libcupscgi.so
-usr/lib32/libcupscgi.so.1
-usr/lib32/libcupsimage.so
-usr/lib32/libcupsimage.so.2
-usr/lib32/libcupsmime.so
-usr/lib32/libcupsmime.so.1
-usr/lib32/libcupsppdc.so
-usr/lib32/libcupsppdc.so.1
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r2 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r2
deleted file mode 100644
index ef127e15cbf6..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r2
+++ /dev/null
@@ -1,393 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
-usr/lib32/libgnutls-extra.so
-usr/lib32/libgnutls-extra.so.26
-usr/lib32/libgnutls-extra.so.26.22.6
-usr/lib32/libgnutls-openssl.so
-usr/lib32/libgnutls-openssl.so.27
-usr/lib32/libgnutls-openssl.so.27.0.0
-usr/lib32/libgnutls.so
-usr/lib32/libgnutls.so.26
-usr/lib32/libgnutls.so.26.22.6
-usr/lib32/libgnutlsxx.so
-usr/lib32/libgnutlsxx.so.27
-usr/lib32/libgnutlsxx.so.27.0.0
-usr/lib32/pkgconfig/gnutls-extra.pc
-usr/lib32/pkgconfig/gnutls.pc
-usr/lib32/libcups.so
-usr/lib32/libcups.so.2
-usr/lib32/libcupscgi.so
-usr/lib32/libcupscgi.so.1
-usr/lib32/libcupsimage.so
-usr/lib32/libcupsimage.so.2
-usr/lib32/libcupsmime.so
-usr/lib32/libcupsmime.so.1
-usr/lib32/libcupsppdc.so
-usr/lib32/libcupsppdc.so.1
-usr/lib32/libtalloc.so
-usr/lib32/libtalloc.so.2
-usr/lib32/libtalloc.so.2.1.0
-usr/lib32/pkgconfig/talloc.pc
-lib32/libkeyutils.so.1
-lib32/libkeyutils.so.1.4
-usr/lib32/libkeyutils.so
-usr/lib32/krb5/plugins/kdb/db2.so
-usr/lib32/krb5/plugins/preauth/pkinit.so
-usr/lib32/libgssapi_krb5.so
-usr/lib32/libgssapi_krb5.so.2
-usr/lib32/libgssapi_krb5.so.2.2
-usr/lib32/libgssrpc.so
-usr/lib32/libgssrpc.so.4
-usr/lib32/libgssrpc.so.4.1
-usr/lib32/libk5crypto.so
-usr/lib32/libk5crypto.so.3
-usr/lib32/libk5crypto.so.3.1
-usr/lib32/libkadm5clnt.so
-usr/lib32/libkadm5clnt_mit.so
-usr/lib32/libkadm5clnt_mit.so.8
-usr/lib32/libkadm5clnt_mit.so.8.0
-usr/lib32/libkadm5srv.so
-usr/lib32/libkadm5srv_mit.so
-usr/lib32/libkadm5srv_mit.so.8
-usr/lib32/libkadm5srv_mit.so.8.0
-usr/lib32/libkdb5.so
-usr/lib32/libkdb5.so.7
-usr/lib32/libkdb5.so.7.0
-usr/lib32/libkrb5.so
-usr/lib32/libkrb5.so.3
-usr/lib32/libkrb5.so.3.3
-usr/lib32/libkrb5support.so
-usr/lib32/libkrb5support.so.0
-usr/lib32/libkrb5support.so.0.1
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r3 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r3
deleted file mode 100644
index a526f77c4dc2..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r3
+++ /dev/null
@@ -1,399 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
-usr/lib32/libgnutls-extra.so
-usr/lib32/libgnutls-extra.so.26
-usr/lib32/libgnutls-extra.so.26.22.6
-usr/lib32/libgnutls-openssl.so
-usr/lib32/libgnutls-openssl.so.27
-usr/lib32/libgnutls-openssl.so.27.0.0
-usr/lib32/libgnutls.so
-usr/lib32/libgnutls.so.26
-usr/lib32/libgnutls.so.26.22.6
-usr/lib32/libgnutlsxx.so
-usr/lib32/libgnutlsxx.so.27
-usr/lib32/libgnutlsxx.so.27.0.0
-usr/lib32/pkgconfig/gnutls-extra.pc
-usr/lib32/pkgconfig/gnutls.pc
-usr/lib32/libcups.so
-usr/lib32/libcups.so.2
-usr/lib32/libcupscgi.so
-usr/lib32/libcupscgi.so.1
-usr/lib32/libcupsimage.so
-usr/lib32/libcupsimage.so.2
-usr/lib32/libcupsmime.so
-usr/lib32/libcupsmime.so.1
-usr/lib32/libcupsppdc.so
-usr/lib32/libcupsppdc.so.1
-usr/lib32/libtalloc.so
-usr/lib32/libtalloc.so.2
-usr/lib32/libtalloc.so.2.1.0
-usr/lib32/pkgconfig/talloc.pc
-lib32/libkeyutils.so.1
-lib32/libkeyutils.so.1.4
-usr/lib32/libkeyutils.so
-usr/lib32/krb5/plugins/kdb/db2.so
-usr/lib32/krb5/plugins/preauth/pkinit.so
-usr/lib32/libgssapi_krb5.so
-usr/lib32/libgssapi_krb5.so.2
-usr/lib32/libgssapi_krb5.so.2.2
-usr/lib32/libgssrpc.so
-usr/lib32/libgssrpc.so.4
-usr/lib32/libgssrpc.so.4.1
-usr/lib32/libk5crypto.so
-usr/lib32/libk5crypto.so.3
-usr/lib32/libk5crypto.so.3.1
-usr/lib32/libkadm5clnt.so
-usr/lib32/libkadm5clnt_mit.so
-usr/lib32/libkadm5clnt_mit.so.8
-usr/lib32/libkadm5clnt_mit.so.8.0
-usr/lib32/libkadm5srv.so
-usr/lib32/libkadm5srv_mit.so
-usr/lib32/libkadm5srv_mit.so.8
-usr/lib32/libkadm5srv_mit.so.8.0
-usr/lib32/libkdb5.so
-usr/lib32/libkdb5.so.7
-usr/lib32/libkdb5.so.7.0
-usr/lib32/libkrb5.so
-usr/lib32/libkrb5.so.3
-usr/lib32/libkrb5.so.3.3
-usr/lib32/libkrb5support.so
-usr/lib32/libkrb5support.so.0
-usr/lib32/libkrb5support.so.0.1
-usr/lib32/libdb-4.8.so
-usr/lib32/libdb.so
-usr/lib32/libdb_cxx-4.8.so
-usr/lib32/libdb_cxx.so
-usr/lib32/libdb_stl-4.8.so
-usr/lib32/libdb_stl.so
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r4 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r4
deleted file mode 100644
index 43d5807589af..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r4
+++ /dev/null
@@ -1,408 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
-usr/lib32/libgnutls-extra.so
-usr/lib32/libgnutls-extra.so.26
-usr/lib32/libgnutls-extra.so.26.22.6
-usr/lib32/libgnutls-openssl.so
-usr/lib32/libgnutls-openssl.so.27
-usr/lib32/libgnutls-openssl.so.27.0.0
-usr/lib32/libgnutls.so
-usr/lib32/libgnutls.so.26
-usr/lib32/libgnutls.so.26.22.6
-usr/lib32/libgnutlsxx.so
-usr/lib32/libgnutlsxx.so.27
-usr/lib32/libgnutlsxx.so.27.0.0
-usr/lib32/pkgconfig/gnutls-extra.pc
-usr/lib32/pkgconfig/gnutls.pc
-usr/lib32/libcups.so
-usr/lib32/libcups.so.2
-usr/lib32/libcupscgi.so
-usr/lib32/libcupscgi.so.1
-usr/lib32/libcupsimage.so
-usr/lib32/libcupsimage.so.2
-usr/lib32/libcupsmime.so
-usr/lib32/libcupsmime.so.1
-usr/lib32/libcupsppdc.so
-usr/lib32/libcupsppdc.so.1
-usr/lib32/libtalloc.so
-usr/lib32/libtalloc.so.2
-usr/lib32/libtalloc.so.2.1.0
-usr/lib32/pkgconfig/talloc.pc
-lib32/libkeyutils.so.1
-lib32/libkeyutils.so.1.4
-usr/lib32/libkeyutils.so
-usr/lib32/krb5/plugins/kdb/db2.so
-usr/lib32/krb5/plugins/preauth/pkinit.so
-usr/lib32/libgssapi_krb5.so
-usr/lib32/libgssapi_krb5.so.2
-usr/lib32/libgssapi_krb5.so.2.2
-usr/lib32/libgssrpc.so
-usr/lib32/libgssrpc.so.4
-usr/lib32/libgssrpc.so.4.1
-usr/lib32/libk5crypto.so
-usr/lib32/libk5crypto.so.3
-usr/lib32/libk5crypto.so.3.1
-usr/lib32/libkadm5clnt.so
-usr/lib32/libkadm5clnt_mit.so
-usr/lib32/libkadm5clnt_mit.so.8
-usr/lib32/libkadm5clnt_mit.so.8.0
-usr/lib32/libkadm5srv.so
-usr/lib32/libkadm5srv_mit.so
-usr/lib32/libkadm5srv_mit.so.8
-usr/lib32/libkadm5srv_mit.so.8.0
-usr/lib32/libkdb5.so
-usr/lib32/libkdb5.so.7
-usr/lib32/libkdb5.so.7.0
-usr/lib32/libkrb5.so
-usr/lib32/libkrb5.so.3
-usr/lib32/libkrb5.so.3.3
-usr/lib32/libkrb5support.so
-usr/lib32/libkrb5support.so.0
-usr/lib32/libkrb5support.so.0.1
-usr/lib32/libdb-4.8.so
-usr/lib32/libdb.so
-usr/lib32/libdb_cxx-4.8.so
-usr/lib32/libdb_cxx.so
-usr/lib32/libdb_stl-4.8.so
-usr/lib32/libdb_stl.so
-usr/lib32/liblber-2.4.so.2
-usr/lib32/liblber-2.4.so.2.9.1
-usr/lib32/liblber.so
-usr/lib32/libldap-2.4.so.2
-usr/lib32/libldap-2.4.so.2.9.1
-usr/lib32/libldap.so
-usr/lib32/libldap_r-2.4.so.2
-usr/lib32/libldap_r-2.4.so.2.9.1
-usr/lib32/libldap_r.so
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5
deleted file mode 100644
index 0b97f9afb053..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140508-r5
+++ /dev/null
@@ -1,410 +0,0 @@
-lib32/libz.so.1
-lib32/libz.so.1.2.8
-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/libpng16.so
-usr/lib32/libpng16.so.16
-usr/lib32/libpng16.so.16.10.0
-usr/lib32/pkgconfig/libpng.pc
-usr/lib32/pkgconfig/libpng16.pc
-usr/lib32/libudis86.so
-usr/lib32/libudis86.so.0
-usr/lib32/libudis86.so.0.0.0
-usr/lib32/libffi-3.0.13/include/ffi.h
-usr/lib32/libffi-3.0.13/include/ffitarget.h
-usr/lib32/libffi.so
-usr/lib32/libffi.so.6
-usr/lib32/libffi.so.6.0.1
-usr/lib32/pkgconfig/libffi.pc
-usr/lib32/LLVMHello.so
-usr/lib32/libLLVM-3.3.so
-usr/lib32/libLTO.so
-usr/lib32/libprofile_rt.so
-usr/lib32/libpng12.so.0
-usr/lib32/libraw1394.so
-usr/lib32/libraw1394.so.11
-usr/lib32/libraw1394.so.11.1.0
-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/libturbojpeg.so.0.0.0
-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
-lib32/libusb-0.1.so.4
-lib32/libusb-0.1.so.4.4.4
-usr/lib32/libusb-1.0.so
-lib32/libusb-1.0.so.0
-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
-lib32/libudev.so.1.4.0
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-usr/lib32/libjpeg.so.62.1.0
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5
-usr/lib32/libtiff.so.5.2.0
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5
-usr/lib32/libtiffxx.so.5.2.0
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.3800.2
-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.5
-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_aarch64-0.158.so
-usr/lib32/elfutils/libebl_aarch64.so
-usr/lib32/elfutils/libebl_alpha-0.158.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.158.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.158.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.158.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.158.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.158.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.158.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.158.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.158.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_tilegx-0.158.so
-usr/lib32/elfutils/libebl_tilegx.so
-usr/lib32/elfutils/libebl_x86_64-0.158.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.158.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.158.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.158.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/libgmp.so.10
-usr/lib32/libgmp.so.10.1.3
-usr/lib32/libgmpxx.so
-usr/lib32/libgmpxx.so.4
-usr/lib32/libgmpxx.so.4.3.3
-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.6
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm_compat.so
-usr/lib32/libjson-c.so
-usr/lib32/libjson-c.so.2
-usr/lib32/libjson-c.so.2.0.1
-usr/lib32/pkgconfig/json-c.pc
-usr/lib32/libxml2.so
-usr/lib32/libxml2.so.2
-usr/lib32/libxml2.so.2.9.1
-usr/lib32/pkgconfig/libxml-2.0.pc
-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
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.10.0
-usr/lib32/libsqlite3.so
-usr/lib32/libsqlite3.so.0
-usr/lib32/libsqlite3.so.0.8.6
-usr/lib32/pkgconfig/sqlite3.pc
-usr/lib32/libnettle.so
-usr/lib32/libnettle.so.4
-usr/lib32/libnettle.so.4.7
-usr/lib32/pkgconfig/nettle.pc
-usr/lib32/libhogweed.so
-usr/lib32/libhogweed.so.2
-usr/lib32/libhogweed.so.2.5
-usr/lib32/pkgconfig/hogweed.pc
-usr/lib32/libtasn1.so
-# Uncomment when gnutls is converted to multilib; bug #493166
-# usr/lib32/libtasn1.so.3
-# usr/lib32/libtasn1.so.3.2.0
-usr/lib32/pkgconfig/libtasn1.pc
-usr/lib32/libgcrypt.so
-usr/lib32/libgcrypt.so.11
-usr/lib32/libgcrypt.so.11.8.2
-usr/lib32/liblzo2.so
-usr/lib32/liblzo2.so.2
-usr/lib32/liblzo2.so.2.0.0
-usr/lib32/libxslt.so
-usr/lib32/libxslt.so.1
-usr/lib32/libxslt.so.1.1.28
-usr/lib32/libexslt.so
-usr/lib32/libexslt.so.0
-usr/lib32/libexslt.so.0.8.17
-usr/lib32/pkgconfig/libxslt.pc
-usr/lib32/pkgconfig/libexslt.pc
-usr/lib32/libmagic.so
-usr/lib32/libmagic.so.1
-usr/lib32/libmagic.so.1.0.0
-lib32/liblzma.so.5
-lib32/liblzma.so.5.0.5
-usr/lib32/liblzma.so
-usr/lib32/pkgconfig/liblzma.pc
-usr/lib32/libgif.so
-usr/lib32/libgif.so.4
-usr/lib32/libslang.so
-usr/lib32/libslang.so.2
-usr/lib32/libslang.so.2.2.4
-usr/lib32/pkgconfig/slang.pc
-usr/lib32/slang/v2/modules/csv-module.so
-usr/lib32/slang/v2/modules/fcntl-module.so
-usr/lib32/slang/v2/modules/fork-module.so
-usr/lib32/slang/v2/modules/iconv-module.so
-usr/lib32/slang/v2/modules/pcre-module.so
-usr/lib32/slang/v2/modules/png-module.so
-usr/lib32/slang/v2/modules/rand-module.so
-usr/lib32/slang/v2/modules/select-module.so
-usr/lib32/slang/v2/modules/slsmg-module.so
-usr/lib32/slang/v2/modules/socket-module.so
-usr/lib32/slang/v2/modules/sysconf-module.so
-usr/lib32/slang/v2/modules/termios-module.so
-usr/lib32/slang/v2/modules/varray-module.so
-usr/lib32/slang/v2/modules/zlib-module.so
-lib32/libacl.so.1
-lib32/libacl.so.1.1.0
-lib32/libblkid.so.1
-lib32/libblkid.so.1.1.0
-lib32/libmount.so.1
-lib32/libmount.so.1.1.0
-lib32/libuuid.so.1
-lib32/libuuid.so.1.3.0
-usr/lib32/libacl.so
-usr/lib32/libblkid.so
-usr/lib32/libltdl.so
-usr/lib32/libltdl.so.7
-usr/lib32/libltdl.so.7.3.0
-usr/lib32/libmount.so
-usr/lib32/libuuid.so
-usr/lib32/pkgconfig/blkid.pc
-usr/lib32/pkgconfig/mount.pc
-usr/lib32/pkgconfig/uuid.pc
-usr/lib32/libcrypto.so
-usr/lib32/libcrypto.so.1.0.0
-usr/lib32/libssl.so
-usr/lib32/libssl.so.1.0.0
-usr/lib32/pkgconfig/libcrypto.pc
-usr/lib32/pkgconfig/libssl.pc
-usr/lib32/pkgconfig/openssl.pc
-usr/lib32/libgnutls-extra.so
-usr/lib32/libgnutls-extra.so.26
-usr/lib32/libgnutls-extra.so.26.22.6
-usr/lib32/libgnutls-openssl.so
-usr/lib32/libgnutls-openssl.so.27
-usr/lib32/libgnutls-openssl.so.27.0.0
-usr/lib32/libgnutls.so
-usr/lib32/libgnutls.so.26
-usr/lib32/libgnutls.so.26.22.6
-usr/lib32/libgnutlsxx.so
-usr/lib32/libgnutlsxx.so.27
-usr/lib32/libgnutlsxx.so.27.0.0
-usr/lib32/pkgconfig/gnutls-extra.pc
-usr/lib32/pkgconfig/gnutls.pc
-usr/lib32/libcups.so
-usr/lib32/libcups.so.2
-usr/lib32/libcupscgi.so
-usr/lib32/libcupscgi.so.1
-usr/lib32/libcupsimage.so
-usr/lib32/libcupsimage.so.2
-usr/lib32/libcupsmime.so
-usr/lib32/libcupsmime.so.1
-usr/lib32/libcupsppdc.so
-usr/lib32/libcupsppdc.so.1
-usr/lib32/libtalloc.so
-usr/lib32/libtalloc.so.2
-usr/lib32/libtalloc.so.2.1.0
-usr/lib32/pkgconfig/talloc.pc
-lib32/libkeyutils.so.1
-lib32/libkeyutils.so.1.4
-usr/lib32/libkeyutils.so
-usr/lib32/krb5/plugins/kdb/db2.so
-usr/lib32/krb5/plugins/preauth/pkinit.so
-usr/lib32/libgssapi_krb5.so
-usr/lib32/libgssapi_krb5.so.2
-usr/lib32/libgssapi_krb5.so.2.2
-usr/lib32/libgssrpc.so
-usr/lib32/libgssrpc.so.4
-usr/lib32/libgssrpc.so.4.1
-usr/lib32/libk5crypto.so
-usr/lib32/libk5crypto.so.3
-usr/lib32/libk5crypto.so.3.1
-usr/lib32/libkadm5clnt.so
-usr/lib32/libkadm5clnt_mit.so
-usr/lib32/libkadm5clnt_mit.so.8
-usr/lib32/libkadm5clnt_mit.so.8.0
-usr/lib32/libkadm5srv.so
-usr/lib32/libkadm5srv_mit.so
-usr/lib32/libkadm5srv_mit.so.8
-usr/lib32/libkadm5srv_mit.so.8.0
-usr/lib32/libkdb5.so
-usr/lib32/libkdb5.so.7
-usr/lib32/libkdb5.so.7.0
-usr/lib32/libkrb5.so
-usr/lib32/libkrb5.so.3
-usr/lib32/libkrb5.so.3.3
-usr/lib32/libkrb5support.so
-usr/lib32/libkrb5support.so.0
-usr/lib32/libkrb5support.so.0.1
-usr/lib32/libdb-4.8.so
-usr/lib32/libdb.so
-usr/lib32/libdb_cxx-4.8.so
-usr/lib32/libdb_cxx.so
-usr/lib32/libdb_stl-4.8.so
-usr/lib32/libdb_stl.so
-usr/lib32/liblber-2.4.so.2
-usr/lib32/liblber-2.4.so.2.9.1
-usr/lib32/liblber.so
-usr/lib32/libldap-2.4.so.2
-usr/lib32/libldap-2.4.so.2.9.1
-usr/lib32/libldap.so
-usr/lib32/libldap_r-2.4.so.2
-usr/lib32/libldap_r-2.4.so.2.9.1
-usr/lib32/libldap_r.so
-usr/lib32/libcrypto.so.0.9.8
-usr/lib32/libssl.so.0.9.8