drop old emul-linux-x86 packages

18 files changed, 0 insertions, 1983 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
deleted file mode 100644
index 6fdd604..0000000
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST emul-linux-x86-baselibs-20131008.tar.xz 55992196 SHA256 83c077c2d0668502c26abb4c30e1bd9ebd3eb4d2fdb2bab3ec57331a3df2b449 SHA512 4ec890f8bab877a576024c4d932906a486b5d584026c8a89563735d520258dce6a47a47e41ec5cae32be89d697a903844f15b9c2a16338a0d34c4cc46cd781ef WHIRLPOOL 0ec725072c8fbd1b0e8649f715e6a4e26ea9462c9ed290f0f42a5b606cdfa6736f839396ac6a967cfce9c864e5da4cc2082ce2db83cc4a9cb49824e7b975bb20
-DIST emul-linux-x86-baselibs-20140406.tar.xz 60312556 SHA256 0f242404c5323c4773cbc1c23abe43cc039b826e431d6b78949a4717af4540e1 SHA512 61450a5f9a63458c29e7e0421e77ca6ef25dc50355678a9e0dee1eb50ca23869790e1293ad130ee363be0b19592d735045c8e4a542bcb76a212c68ecdee9382e WHIRLPOOL e00ccbb07a9875dedd25033246fb9367a2610dc2b11541501777270ec00e1ceab880f4f351f2a63663917312699b73626776005584b556935d51716a982a2aa3
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild
deleted file mode 100644
index 35e3baf..0000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r22.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
-		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
-		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
-		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
-		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
-		virtual/jpeg:62[abi_x86_32(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
-		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
-		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
-		|| (
-			>=virtual/udev-206-r1[abi_x86_32(-)]
-			~virtual/udev-204[abi_x86_32(-)] )
-		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
-		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
-		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
-		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
-		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
-		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
-		|| (
-			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
-			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
-		)
-		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
-		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
-		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
-		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
-		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
-		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
-		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
-		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
-		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
-		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
-		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
-		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
-		>=sys-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(-)]
-	)
-	>=sys-libs/glibc-2.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
deleted file mode 100644
index a02d6c7..0000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
-	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
-	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
-	openssl tcp_wrappers_license"
-
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
-	abi_x86_32? (
-		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
-		>=media-libs/libpng-1.6.3-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(-)]
-		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
-		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
-		virtual/jpeg:62[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(-)]
-		>=media-libs/libmng-1.10.2-r2[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.15" # bug 340613
-
-PYTHON_UPDATER_IGNORE="1"
-
-src_prepare() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_prepare
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(sed "${FILESDIR}/remove-native-${PVR}" -e '/^#/d')
-}
-
-src_install() {
-	emul-linux-x86_src_install
-
-	if use abi_x86_32; then
-		local x86_libdir=$(get_abi_LIBDIR x86)
-		LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux
-		echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs
-		doenvd 99emul-linux-x86-baselibs
-
-		mkdir -p "${ED}${LIBDIR}"
-		mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22 b/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22
deleted file mode 100644
index 7f6a74c..0000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20131008-r22
+++ /dev/null
@@ -1,280 +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/libjpeg.so.62
-usr/lib32/libexpat.so
-usr/lib32/libexpat.so.1
-usr/lib32/libexpat.so.1.6.0
-usr/lib32/libexpatu.so
-usr/lib32/libexpatu.so.1
-usr/lib32/libexpatu.so.1.6.0
-usr/lib32/libexpatw.so
-usr/lib32/libexpatw.so.1
-usr/lib32/libexpatw.so.1.6.0
-usr/lib32/pkgconfig/expat.pc
-usr/lib32/pkgconfig/expatu.pc
-usr/lib32/pkgconfig/expatw.pc
-usr/lib32/libusb-0.1.so.4*
-usr/lib32/libusb-1.0.so
-usr/lib32/libusb-1.0.so.0
-usr/lib32/libusb-1.0.so.0.1.0
-usr/lib32/libusb.so
-usr/lib32/pkgconfig/libusb-1.0.pc
-usr/lib32/pkgconfig/libusb.pc
-lib32/libudev.so.1*
-usr/lib32/libudev.so
-usr/lib32/pkgconfig/libudev.pc
-lib32/libsystemd-daemon.so.0.0.7
-lib32/libsystemd-daemon.so.0
-usr/lib32/libsystemd-daemon.so
-usr/lib32/pkgconfig/libsystemd-daemon.pc
-usr/lib32/libtiff.so
-usr/lib32/libtiff.so.5*
-usr/lib32/libtiffxx.so
-usr/lib32/libtiffxx.so.5*
-usr/lib32/pkgconfig/libtiff-4.pc
-lib32/libattr.so.1
-lib32/libattr.so.1.1.0
-usr/lib32/libattr.so
-usr/lib32/glib-2.0/include/glibconfig.h
-usr/lib32/libglib-2.0.so
-usr/lib32/libglib-2.0.so.0
-usr/lib32/libglib-2.0.so.0.3200.4
-usr/lib32/pkgconfig/glib-2.0.pc
-usr/lib32/libgmodule-2.0.so
-usr/lib32/libgmodule-2.0.so.0
-usr/lib32/libgmodule-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gmodule-2.0.pc
-usr/lib32/libgio-2.0.so
-usr/lib32/libgio-2.0.so.0
-usr/lib32/libgio-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gio-2.0.pc
-usr/lib32/libgobject-2.0.so
-usr/lib32/libgobject-2.0.so.0
-usr/lib32/libgobject-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gobject-2.0.pc
-usr/lib32/libgthread-2.0.so
-usr/lib32/libgthread-2.0.so.0
-usr/lib32/libgthread-2.0.so.0.3200.4
-usr/lib32/pkgconfig/gthread-2.0.pc
-usr/lib32/pkgconfig/gio-unix-2.0.pc
-usr/lib32/pkgconfig/gmodule-export-2.0.pc
-usr/lib32/pkgconfig/gmodule-no-export-2.0.pc
-usr/lib32/liblcms2.so
-usr/lib32/liblcms2.so.2
-usr/lib32/liblcms2.so.2.0.3
-usr/lib32/pkgconfig/lcms2.pc
-usr/lib32/libpaper.so
-usr/lib32/libpaper.so.1
-usr/lib32/libpaper.so.1.1.2
-usr/lib32/libtiff.so.3
-usr/lib32/libtiff.so.4
-usr/lib32/libtiffxx.so.3
-usr/lib32/libtiffxx.so.4
-usr/lib32/elfutils/libebl_alpha-0.149.so
-usr/lib32/elfutils/libebl_alpha.so
-usr/lib32/elfutils/libebl_arm-0.149.so
-usr/lib32/elfutils/libebl_arm.so
-usr/lib32/elfutils/libebl_i386-0.149.so
-usr/lib32/elfutils/libebl_i386.so
-usr/lib32/elfutils/libebl_ia64-0.149.so
-usr/lib32/elfutils/libebl_ia64.so
-usr/lib32/elfutils/libebl_ppc-0.149.so
-usr/lib32/elfutils/libebl_ppc.so
-usr/lib32/elfutils/libebl_ppc64-0.149.so
-usr/lib32/elfutils/libebl_ppc64.so
-usr/lib32/elfutils/libebl_s390-0.149.so
-usr/lib32/elfutils/libebl_s390.so
-usr/lib32/elfutils/libebl_sh-0.149.so
-usr/lib32/elfutils/libebl_sh.so
-usr/lib32/elfutils/libebl_sparc-0.149.so
-usr/lib32/elfutils/libebl_sparc.so
-usr/lib32/elfutils/libebl_x86_64-0.149.so
-usr/lib32/elfutils/libebl_x86_64.so
-usr/lib32/libelf-0.149.so
-usr/lib32/libelf.so
-usr/lib32/libelf.so.1
-usr/lib32/libasm-0.149.so
-usr/lib32/libasm.so
-usr/lib32/libasm.so.1
-usr/lib32/libdw-0.149.so
-usr/lib32/libdw.so
-usr/lib32/libdw.so.1
-lib32/libss.so.2
-lib32/libss.so.2.0
-usr/lib32/libss.so
-usr/lib32/pkgconfig/ss.pc
-lib32/libcom_err.so.2
-lib32/libcom_err.so.2.1
-usr/lib32/libcom_err.so
-usr/lib32/pkgconfig/com_err.pc
-usr/lib32/libcurses.so
-usr/lib32/libform.so
-usr/lib32/libform.so.5
-usr/lib32/libform.so.5.9
-usr/lib32/libformw.so
-usr/lib32/libformw.so.5
-usr/lib32/libformw.so.5.9
-usr/lib32/libmenu.so
-usr/lib32/libmenu.so.5
-usr/lib32/libmenu.so.5.9
-usr/lib32/libmenuw.so
-usr/lib32/libmenuw.so.5
-usr/lib32/libmenuw.so.5.9
-lib32/libncurses.so.5
-lib32/libncurses.so.5.9
-lib32/libncursesw.so.5
-lib32/libncursesw.so.5.9
-usr/lib32/libncurses.so
-usr/lib32/libncursesw.so
-usr/lib32/libpanel.so
-usr/lib32/libpanel.so.5
-usr/lib32/libpanel.so.5.9
-usr/lib32/libpanelw.so
-usr/lib32/libpanelw.so.5
-usr/lib32/libpanelw.so.5.9
-usr/lib32/pkgconfig/form.pc
-usr/lib32/pkgconfig/formw.pc
-usr/lib32/pkgconfig/ncurses++.pc
-usr/lib32/pkgconfig/ncurses++w.pc
-usr/lib32/pkgconfig/menuw.pc
-usr/lib32/pkgconfig/menu.pc
-usr/lib32/pkgconfig/ncurses.pc
-usr/lib32/pkgconfig/ncursesw.pc
-usr/lib32/pkgconfig/panel.pc
-usr/lib32/pkgconfig/panelw.pc
-usr/lib32/terminfo
-lib32/libgpm.so.1
-lib32/libgpm.so.1.20.0
-usr/lib32/libgpm.so
-usr/lib32/libgmp.so*
-usr/lib32/libgmpxx.so*
-lib32/libpcre.so.1
-lib32/libpcre.so.1.2.1
-usr/lib32/libpcre.so
-usr/lib32/libpcrecpp.so
-usr/lib32/libpcrecpp.so.0
-usr/lib32/libpcrecpp.so.0.0.0
-usr/lib32/libpcreposix.so
-usr/lib32/libpcreposix.so.0
-usr/lib32/libpcreposix.so.0.0.2
-usr/lib32/pkgconfig/libpcre.pc
-usr/lib32/pkgconfig/libpcrecpp.pc
-usr/lib32/pkgconfig/libpcreposix.pc
-usr/lib32/dbus-1.0/include/dbus/dbus-arch-deps.h
-usr/lib32/libdbus-1.so
-usr/lib32/libdbus-1.so.3
-usr/lib32/libdbus-1.so.3.7.4
-usr/lib32/pkgconfig/dbus-1.pc
-lib32/libwrap.so
-lib32/libwrap.so.0
-lib32/libwrap.so.0.7.6
-usr/lib32/libwrap.so
-usr/lib32/libgdbm.so
-usr/lib32/libgdbm.so.3
-usr/lib32/libgdbm.so.3.0.0
-usr/lib32/libgdbm_compat.so
-usr/lib32/libgdbm_compat.so.3
-usr/lib32/libgdbm_compat.so.3.0.0
-usr/lib32/libjson.so
-usr/lib32/libjson.so.0
-usr/lib32/libjson.so.0.0.1
-usr/lib32/pkgconfig/json.pc
-usr/lib32/perl5/5.12.4/i686-linux/auto/GDBM_File/GDBM_File.so
-usr/lib32/perl5/5.12.4/i686-linux/auto/NDBM_File/NDBM_File.so
-usr/lib32/python2.7/lib-dynload/dbm.so
-usr/lib32/python3.2/lib-dynload/_dbm.cpython-32.so
-usr/lib32/python2.7/lib-dynload/gdbm.so
-usr/lib32/python3.2/lib-dynload/_gdbm.cpython-32.so
-usr/lib32/libxml2.so*
-usr/lib32/pkgconfig/libxml-2.0.pc
-usr/lib32/python*/site-packages/libxml2mod.so
-usr/lib32/libdbus-glib-1.so
-usr/lib32/libdbus-glib-1.so.2
-usr/lib32/libdbus-glib-1.so.2.2.2
-usr/lib32/pkgconfig/dbus-glib-1.pc
-lib32/libreadline.so.6
-lib32/libreadline.so.6.2
-usr/lib32/libreadline.so
-lib32/libhistory.so.6
-lib32/libhistory.so.6.2
-usr/lib32/libhistory.so
-usr/lib32/libmng.so
-usr/lib32/libasprintf.so
-usr/lib32/libasprintf.so.0
-usr/lib32/libasprintf.so.0.0.0
-usr/lib32/libgpg-error.so
-usr/lib32/libgpg-error.so.0
-usr/lib32/libgpg-error.so.0.8.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*
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 f6c4269..0000000
--- a/app-emulation/emul-linux-x86-baselibs/files/remove-native-20140406
+++ /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/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/libmng.so.1
-usr/lib32/libmng.so.1.0.0
-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/metadata.xml b/app-emulation/emul-linux-x86-baselibs/metadata.xml
deleted file mode 100644
index d64892f..0000000
--- a/app-emulation/emul-linux-x86-baselibs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use><flag name="development">Install pkgconfig files</flag></use>
-</pkgmetadata>
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
deleted file mode 100644
index 67874db..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST emul-linux-x86-gtklibs-20131008.tar.xz 7164380 SHA256 4a61e9b0345e276062b108eea25a43e30b0ebac77a6f523fcd8d92ece6678121 SHA512 c4a0242752f2f9f72868deb56cd44386d0902d9d42f9dc60555ba01b3922bbd2580b3c299dd41c407aec33e955f52b5173cb203799598efbe8f5aed7c1dbe27d WHIRLPOOL 1d2f8246616a71403b930bee5d95ccdecd2b30b2e2a8e2a553b25891c744a933915333116b6c85c5a53449ce1599494a2af49b436bb38cd104801e03a058c1f9
-DIST emul-linux-x86-gtklibs-20140406.tar.xz 7395632 SHA256 a6d30621c984d968fd5f15709da4aca9aae855c48a181c562d834a8154ee0bf6 SHA512 acc07b51269c2581931c2b3e488a8d425e5c6390e1d78be343b64e3f403da8bd32f0605d4a7cd3b2f59fa13a17afce4cf11cbca53bf278d6e2f198cba4830812 WHIRLPOOL 8acad99cc57d89163f3784c074fd42a510341679d48567e7fbb8bb5be3c3849189e42cbca0ea87319190b3f82b10e837ff591add4b4b53217775238d20adcbe9
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r4.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r4.ebuild
deleted file mode 100644
index 2abd985..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20131008-r4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-opengl-${PV}
-	abi_x86_32? (
-		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
-		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
-		>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
-		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
-	)"
-# RDEPEND on opengl stuff needed due cairo, bug #410213
-
-my_gdk_pixbuf_query_loaders() {
-	# causes segfault if set
-	unset __GL_NO_DSO_FINALIZER
-
-	local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
-	fi
-	rm "${tmp_file}"
-}
-
-my_pango_querymodules() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	einfo "Generating pango modules listing..."
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if pango-querymodules32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${pango_conf}"
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-my_gtk_query_immodules() {
-	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
-	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
-
-	mkdir -p "${GTK2_CONFDIR}"
-	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-src_prepare() {
-	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
-	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
-	emul-linux-x86_src_prepare
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-pkg_preinst() {
-	#bug 169058
-	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
-		[[ -L ${l} ]] && rm -f ${l}
-	done
-}
-
-pkg_postinst() {
-	my_gtk_query_immodules
-	if ! use abi_x86_32; then
-		my_pango_querymodules
-		my_gdk_pixbuf_query_loaders
-	fi
-
-	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
-	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
-		ewarn
-		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
-		ewarn "multilib systems, please remove it by hand."
-		ewarn
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
deleted file mode 100644
index 1fc3fdf..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20140406.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="GPL-2 LGPL-2 FTL LGPL-2.1 LGPL-3 MPL-1.1 MIT"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	~app-emulation/emul-linux-x86-xlibs-${PV}
-	~app-emulation/emul-linux-x86-opengl-${PV}
-	abi_x86_32? (
-		>=x11-libs/pixman-0.30.2-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.16-r1[abi_x86_32(-)]
-		>=x11-libs/gdk-pixbuf-2.30.5-r1[abi_x86_32(-)]
-		>=x11-libs/pango-1.36.2-r1[abi_x86_32(-)]
-		>=x11-libs/pangox-compat-0.0.2-r1[abi_x86_32(-)]
-		>=media-gfx/graphite2-1.2.4-r1[abi_x86_32(-)]
-		>=media-libs/harfbuzz-0.9.26-r1[abi_x86_32(-)]
-	)"
-# RDEPEND on opengl stuff needed due cairo, bug #410213
-
-my_gdk_pixbuf_query_loaders() {
-	# causes segfault if set
-	unset __GL_NO_DSO_FINALIZER
-
-	local tmp_file=$(mktemp --suffix=tmp.XXXXXXXXXXgdk_pixbuf_queryloaders)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gdk-pixbuf-query-loaders32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${ROOT}usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-	else
-		ewarn "Warning, gdk-pixbuf-query-loaders32 failed."
-	fi
-	rm "${tmp_file}"
-}
-
-my_pango_querymodules() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	einfo "Generating pango modules listing..."
-
-	mkdir -p "${PANGO_CONFDIR}"
-	local pango_conf="${PANGO_CONFDIR}/pango.modules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if pango-querymodules32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${pango_conf}"
-	else
-		ewarn "Cannot update pango.modules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-my_gtk_query_immodules() {
-	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
-	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
-
-	mkdir -p "${GTK2_CONFDIR}"
-	local gtk_conf="${ROOT}${GTK2_CONFDIR}/gtk.immodules"
-	local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgtk_query_immodules)
-	if [ -z "${tmp_file}" ]; then
-		ewarn "Cannot create temporary file"
-		return 1
-	fi
-
-	if gtk-query-immodules-2.0-32 > "${tmp_file}"; then
-		cat "${tmp_file}" > "${gtk_conf}"
-	else
-		ewarn "Cannot update gtk.immodules, file generation failed"
-	fi
-	rm "${tmp_file}"
-}
-
-src_prepare() {
-	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
-	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
-	emul-linux-x86_src_prepare
-
-	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
-	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
-	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
-	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
-
-pkg_preinst() {
-	#bug 169058
-	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
-		[[ -L ${l} ]] && rm -f ${l}
-	done
-}
-
-pkg_postinst() {
-	my_gtk_query_immodules
-	if ! use abi_x86_32; then
-		my_pango_querymodules
-		my_gdk_pixbuf_query_loaders
-	fi
-
-	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
-	if [[ -e "${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]] ; then
-		ewarn
-		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
-		ewarn "multilib systems, please remove it by hand."
-		ewarn
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r4 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r4
deleted file mode 100644
index 1198cda..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20131008-r4
+++ /dev/null
@@ -1,95 +0,0 @@
-usr/lib32/libpixman-1.so
-usr/lib32/libpixman-1.so.0
-usr/lib32/libpixman-1.so.0.30.2
-usr/lib32/pkgconfig/pixman-1.pc
-usr/lib32/cairo/cairo-fdr.so
-usr/lib32/cairo/cairo-fdr.so.0
-usr/lib32/cairo/cairo-fdr.so.0.0.0
-usr/lib32/cairo/cairo-sphinx.so
-usr/lib32/cairo/cairo-sphinx.so.0
-usr/lib32/cairo/cairo-sphinx.so.0.0.0
-usr/lib32/cairo/libcairo-trace.so
-usr/lib32/cairo/libcairo-trace.so.0
-usr/lib32/cairo/libcairo-trace.so.0.0.0
-usr/lib32/libcairo-gobject.so
-usr/lib32/libcairo-gobject.so.2
-usr/lib32/libcairo-gobject.so.2.11200.14
-usr/lib32/libcairo-script-interpreter.so
-usr/lib32/libcairo-script-interpreter.so.2
-usr/lib32/libcairo-script-interpreter.so.2.11200.14
-usr/lib32/libcairo.so
-usr/lib32/libcairo.so.2
-usr/lib32/libcairo.so.2.11200.14
-usr/lib32/pkgconfig/cairo-egl.pc
-usr/lib32/pkgconfig/cairo-fc.pc
-usr/lib32/pkgconfig/cairo-ft.pc
-usr/lib32/pkgconfig/cairo-gl.pc
-usr/lib32/pkgconfig/cairo-glx.pc
-usr/lib32/pkgconfig/cairo-gobject.pc
-usr/lib32/pkgconfig/cairo-pdf.pc
-usr/lib32/pkgconfig/cairo-png.pc
-usr/lib32/pkgconfig/cairo-ps.pc
-usr/lib32/pkgconfig/cairo-script.pc
-usr/lib32/pkgconfig/cairo-svg.pc
-usr/lib32/pkgconfig/cairo-tee.pc
-usr/lib32/pkgconfig/cairo-xlib-xrender.pc
-usr/lib32/pkgconfig/cairo-xlib.pc
-usr/lib32/pkgconfig/cairo.pc
-usr/bin/gdk-pixbuf-query-loaders32
-usr/lib32/libgdk_pixbuf_xlib-2.0.so.0.2600.4
-usr/lib32/libgdk_pixbuf-2.0.so
-usr/lib32/libgdk_pixbuf_xlib-2.0.so
-usr/lib32/pkgconfig/gdk-pixbuf-2.0.pc
-usr/lib32/pkgconfig/gdk-pixbuf-xlib-2.0.pc
-usr/lib32/libgdk_pixbuf-2.0.so.0.2600.4
-usr/lib32/libgdk_pixbuf_xlib-2.0.so.0
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
-usr/lib32/libgdk_pixbuf-2.0.so.0
-usr/bin/pango-querymodules32
-usr/lib32/libpango-1.0.so
-usr/lib32/libpango-1.0.so.0
-usr/lib32/libpango-1.0.so.0.3000.1
-usr/lib32/libpangocairo-1.0.so
-usr/lib32/libpangocairo-1.0.so.0
-usr/lib32/libpangocairo-1.0.so.0.3000.1
-usr/lib32/libpangoft2-1.0.so
-usr/lib32/libpangoft2-1.0.so.0
-usr/lib32/libpangoft2-1.0.so.0.3000.1
-usr/lib32/libpangox-1.0.so
-usr/lib32/libpangox-1.0.so.0
-usr/lib32/libpangox-1.0.so.0.3000.1
-usr/lib32/libpangoxft-1.0.so
-usr/lib32/libpangoxft-1.0.so.0
-usr/lib32/libpangoxft-1.0.so.0.3000.1
-usr/lib32/pango/1.6.0/modules/pango-arabic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-arabic-lang.so
-usr/lib32/pango/1.6.0/modules/pango-basic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-basic-x.so
-usr/lib32/pango/1.6.0/modules/pango-hangul-fc.so
-usr/lib32/pango/1.6.0/modules/pango-hebrew-fc.so
-usr/lib32/pango/1.6.0/modules/pango-indic-fc.so
-usr/lib32/pango/1.6.0/modules/pango-indic-lang.so
-usr/lib32/pango/1.6.0/modules/pango-khmer-fc.so
-usr/lib32/pango/1.6.0/modules/pango-syriac-fc.so
-usr/lib32/pango/1.6.0/modules/pango-thai-fc.so
-usr/lib32/pango/1.6.0/modules/pango-tibetan-fc.so
-usr/lib32/pkgconfig/pango.pc
-usr/lib32/pkgconfig/pangocairo.pc
-usr/lib32/pkgconfig/pangoft2.pc
-usr/lib32/pkgconfig/pangox.pc
-usr/lib32/pkgconfig/pangoxft.pc
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406 b/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406
deleted file mode 100644
index eaaf053..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/remove-native-20140406
+++ /dev/null
@@ -1,98 +0,0 @@
-usr/lib32/libpixman-1.so
-usr/lib32/libpixman-1.so.0
-usr/lib32/libpixman-1.so.0.32.4
-usr/lib32/pkgconfig/pixman-1.pc
-usr/lib32/cairo/cairo-fdr.so
-usr/lib32/cairo/cairo-fdr.so.0
-usr/lib32/cairo/cairo-fdr.so.0.0.0
-usr/lib32/cairo/cairo-sphinx.so
-usr/lib32/cairo/cairo-sphinx.so.0
-usr/lib32/cairo/cairo-sphinx.so.0.0.0
-usr/lib32/cairo/libcairo-trace.so
-usr/lib32/cairo/libcairo-trace.so.0
-usr/lib32/cairo/libcairo-trace.so.0.0.0
-usr/lib32/libcairo-gobject.so
-usr/lib32/libcairo-gobject.so.2
-usr/lib32/libcairo-gobject.so.2.11200.14
-usr/lib32/libcairo-script-interpreter.so
-usr/lib32/libcairo-script-interpreter.so.2
-usr/lib32/libcairo-script-interpreter.so.2.11200.14
-usr/lib32/libcairo.so
-usr/lib32/libcairo.so.2
-usr/lib32/libcairo.so.2.11200.14
-usr/lib32/pkgconfig/cairo-egl.pc
-usr/lib32/pkgconfig/cairo-fc.pc
-usr/lib32/pkgconfig/cairo-ft.pc
-usr/lib32/pkgconfig/cairo-gl.pc
-usr/lib32/pkgconfig/cairo-glx.pc
-usr/lib32/pkgconfig/cairo-gobject.pc
-usr/lib32/pkgconfig/cairo-pdf.pc
-usr/lib32/pkgconfig/cairo-png.pc
-usr/lib32/pkgconfig/cairo-ps.pc
-usr/lib32/pkgconfig/cairo-script.pc
-usr/lib32/pkgconfig/cairo-svg.pc
-usr/lib32/pkgconfig/cairo-tee.pc
-usr/lib32/pkgconfig/cairo-xlib-xrender.pc
-usr/lib32/pkgconfig/cairo-xlib.pc
-usr/lib32/pkgconfig/cairo.pc
-usr/bin/gdk-pixbuf-query-loaders32
-usr/lib32/libgdk_pixbuf_xlib-2.0.so.0.3000.6
-usr/lib32/libgdk_pixbuf-2.0.so
-usr/lib32/libgdk_pixbuf_xlib-2.0.so
-usr/lib32/pkgconfig/gdk-pixbuf-2.0.pc
-usr/lib32/pkgconfig/gdk-pixbuf-xlib-2.0.pc
-usr/lib32/libgdk_pixbuf-2.0.so.0.3000.6
-usr/lib32/libgdk_pixbuf_xlib-2.0.so.0
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tiff.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.so
-usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.so
-usr/lib32/libgdk_pixbuf-2.0.so.0
-usr/bin/pango-querymodules32
-usr/lib32/libpango-1.0.so
-usr/lib32/libpango-1.0.so.0
-usr/lib32/libpango-1.0.so.0.3600.2
-usr/lib32/libpangocairo-1.0.so
-usr/lib32/libpangocairo-1.0.so.0
-usr/lib32/libpangocairo-1.0.so.0.3600.2
-usr/lib32/libpangoft2-1.0.so
-usr/lib32/libpangoft2-1.0.so.0
-usr/lib32/libpangoft2-1.0.so.0.3600.2
-usr/lib32/libpangox-1.0.so
-usr/lib32/libpangox-1.0.so.0
-usr/lib32/libpangox-1.0.so.0.0.0
-usr/lib32/libpangoxft-1.0.so
-usr/lib32/libpangoxft-1.0.so.0
-usr/lib32/libpangoxft-1.0.so.0.3600.2
-usr/lib32/pango/1.8.0/modules/pango-arabic-lang.so
-usr/lib32/pango/1.8.0/modules/pango-basic-fc.so
-usr/lib32/pango/1.8.0/modules/pango-indic-lang.so
-usr/lib32/pkgconfig/pango.pc
-usr/lib32/pkgconfig/pangocairo.pc
-usr/lib32/pkgconfig/pangoft2.pc
-usr/lib32/pkgconfig/pangox.pc
-usr/lib32/pkgconfig/pangoxft.pc
-usr/lib32/libgraphite2.so
-usr/lib32/libgraphite2.so.3
-usr/lib32/libgraphite2.so.3.0.1
-usr/lib32/pkgconfig/graphite2.pc
-usr/lib32/libharfbuzz-gobject.so
-usr/lib32/libharfbuzz-gobject.so.0
-usr/lib32/libharfbuzz-gobject.so.0.923.0
-usr/lib32/libharfbuzz.so
-usr/lib32/libharfbuzz.so.0
-usr/lib32/libharfbuzz.so.0.923.0
-usr/lib32/pkgconfig/harfbuzz-gobject.pc
-usr/lib32/pkgconfig/harfbuzz.pc
diff --git a/app-emulation/emul-linux-x86-gtklibs/metadata.xml b/app-emulation/emul-linux-x86-gtklibs/metadata.xml
deleted file mode 100644
index d64892f..0000000
--- a/app-emulation/emul-linux-x86-gtklibs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use><flag name="development">Install pkgconfig files</flag></use>
-</pkgmetadata>
diff --git a/app-emulation/emul-linux-x86-soundlibs/Manifest b/app-emulation/emul-linux-x86-soundlibs/Manifest
deleted file mode 100644
index a00ba31..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST emul-linux-x86-soundlibs-20131008.tar.xz 6700140 SHA256 4afbaea80a493556475abfba0f2ee72941d214bfab159097f1c3267190f3fbdf SHA512 da1e38004fee464d88051fa2c4496bf250a2b641b7c6570ae327260ea121a8cb9c9557065595c1c546185d890fedbae987daab6deb8d192e94623fd3926ded20 WHIRLPOOL af569f721be3e07334b1384f5d245ad010aa4090705dfb954b1e48b5845894ea9400f9ac9c8cfbe0168ec1954bfd4503711068218c970c7a7f4a6d33d54a022b
-DIST emul-linux-x86-soundlibs-20140406.tar.xz 7230696 SHA256 83585754db38294dbba72d9a60623e988fb58df3895bd93acaf223c92013f3a9 SHA512 323323e6a195bbe4ecdc7d4ad52160945fffb906a0f8edb0845984649449f2fac57ed1ce89b7fb71d4479c2a7152ca580a75b86bf89882e8aaa435229ecf5f28 WHIRLPOOL fe35f35c44bc2e3fb5c03260b897b5df7bcc079e371c2fbfb3cb6c16d002a0999d0958140398225faa0fd36f7ba1e40f29dd2c36dd9f9ee8b3990fbcfbd4443f
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
deleted file mode 100644
index 4ce52bc..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20131008-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 alsa +pulseaudio"
-
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
-	~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
-	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
-		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
-	abi_x86_32? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)]
-		>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-		>=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)]
-		>=media-libs/alsa-lib-1.0.27.1-r1[abi_x86_32(-)]
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)]
-		>=sci-libs/fftw-3.3.3-r1[abi_x86_32(-)]
-		>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)]
-		>=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)]
-		>=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)]
-		>=media-libs/libmikmod-3.2.0-r1[abi_x86_32(-)]
-		>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
-		>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)]
-		>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)]
-		>=media-sound/musepack-tools-465-r1[abi_x86_32(-)]
-		>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)]
-		>=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)]
-		>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)]
-		>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)]
-		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
-		>=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
-		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
-		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
-	)"
-
-pkg_pretend() {
-	if use abi_x86_32 && ! use pulseaudio; then
-		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
-		ewarn "libavfilter in emul-linux-x86-medialibs. If you need that, please"
-		ewarn "turn USE=pulseaudio back on."
-	fi
-}
-
-src_prepare() {
-	_ALLOWED="${S}/etc/env.d"
-	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
-	ALLOWED="(${_ALLOWED})"
-
-	emul-linux-x86_src_prepare
-
-	if use alsa; then
-		mv -f "${S}"/usr/bin/aoss{,32} || die
-	fi
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native")
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild b/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild
deleted file mode 100644
index d4ed9ca..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/emul-linux-x86-soundlibs-20140406.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1 LGPL-2 MIT gsm public-domain"
-KEYWORDS="-* ~amd64"
-IUSE="abi_x86_32 alsa +pulseaudio"
-
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}[abi_x86_32=]
-	~app-emulation/emul-linux-x86-medialibs-${PV}[abi_x86_32=]
-	!abi_x86_32? ( !>=sci-libs/fftw-3.3.3-r1[abi_x86_32]
-		!>=media-libs/libmikmod-3.2.0-r1[abi_x86_32] )
-	abi_x86_32? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)]
-		>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
-		>=media-libs/webrtc-audio-processing-0.1-r1[abi_x86_32(-)]
-		>=media-libs/alsa-lib-1.0.27.1-r1[abi_x86_32(-)]
-		>=media-libs/flac-1.2.1-r5[abi_x86_32(-)]
-		>=media-libs/audiofile-0.3.6-r1[abi_x86_32(-)]
-		>=sci-libs/fftw-3.3.3-r1[abi_x86_32(-)]
-		>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)]
-		>=media-plugins/caps-plugins-0.4.5-r2[abi_x86_32(-)]
-		>=media-plugins/swh-plugins-0.4.15-r3[abi_x86_32(-)]
-		>=media-libs/libmikmod-3.2.0-r1[abi_x86_32(-)]
-		>=media-plugins/alsaequal-0.6-r1[abi_x86_32(-)]
-		>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)]
-		>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)]
-		>=media-sound/musepack-tools-465-r1[abi_x86_32(-)]
-		>=media-libs/libsndfile-1.0.25-r1[abi_x86_32(-)]
-		>=media-libs/libsamplerate-0.1.8-r1[abi_x86_32(-)]
-		>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)]
-		>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)]
-		>=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)]
-		>=media-sound/mpg123-1.15.4-r1[abi_x86_32(-)]
-		>=media-libs/libao-1.1.0-r1[abi_x86_32(-)]
-		pulseaudio? ( >=media-sound/pulseaudio-4.0-r1[abi_x86_32(-)] )
-	)"
-
-pkg_pretend() {
-	if use abi_x86_32 && ! use pulseaudio; then
-		ewarn "You have disabled USE=pulseaudio. This is known to break pre-built"
-		ewarn "libavfilter in emul-linux-x86-medialibs. If you need that, please"
-		ewarn "turn USE=pulseaudio back on."
-	fi
-}
-
-src_prepare() {
-	_ALLOWED="${S}/etc/env.d"
-	use alsa && _ALLOWED="${_ALLOWED}|${S}/usr/bin/aoss"
-	ALLOWED="(${_ALLOWED})"
-
-	emul-linux-x86_src_prepare
-
-	if use alsa; then
-		mv -f "${S}"/usr/bin/aoss{,32} || die
-	fi
-
-	# Remove migrated stuff.
-	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
-}
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native b/app-emulation/emul-linux-x86-soundlibs/files/remove-native
deleted file mode 100644
index 8eb9413..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native
+++ /dev/null
@@ -1,313 +0,0 @@
-usr/lib32/pkgconfig/ogg.pc
-usr/lib32/libogg.so
-usr/lib32/libogg.so.0
-usr/lib32/libogg.so.0.8.0
-usr/lib32/libmodplug.so
-usr/lib32/libmodplug.so.1
-usr/lib32/libmodplug.so.1.0.0
-usr/lib32/pkgconfig/libmodplug.pc
-usr/lib32/libgsm.so
-usr/lib32/libgsm.so.1
-usr/lib32/libgsm.so.1.0.13
-usr/lib32/libvorbis.so
-usr/lib32/libvorbis.so.0
-usr/lib32/libvorbis.so.0.4.6
-usr/lib32/libvorbisenc.so
-usr/lib32/libvorbisenc.so.2
-usr/lib32/libvorbisenc.so.2.0.9
-usr/lib32/libvorbisfile.so
-usr/lib32/libvorbisfile.so.3
-usr/lib32/libvorbisfile.so.3.3.5
-usr/lib32/pkgconfig/vorbis.pc
-usr/lib32/pkgconfig/vorbisenc.pc
-usr/lib32/pkgconfig/vorbisfile.pc
-usr/lib32/libwebrtc_audio_processing.so
-usr/lib32/libwebrtc_audio_processing.so.0
-usr/lib32/libwebrtc_audio_processing.so.0.0.0
-usr/lib32/pkgconfig/webrtc-audio-processing.pc
-usr/lib32/libasound.so
-usr/lib32/libasound.so.2
-usr/lib32/libasound.so.2.0.0
-usr/lib32/pkgconfig/alsa.pc
-usr/lib32/alsa-lib/smixer/smixer-ac97.so
-usr/lib32/alsa-lib/smixer/smixer-hda.so
-usr/lib32/alsa-lib/smixer/smixer-sbase.so
-usr/lib32/libFLAC++.so
-usr/lib32/libFLAC++.so.6
-usr/lib32/libFLAC++.so.6.2.0
-usr/lib32/libFLAC.so
-usr/lib32/libFLAC.so.8
-usr/lib32/libFLAC.so.8.2.0
-usr/lib32/pkgconfig/flac++.pc
-usr/lib32/pkgconfig/flac.pc
-usr/lib32/libaudiofile.so
-usr/lib32/libaudiofile.so.1
-usr/lib32/libaudiofile.so.1.0.0
-usr/lib32/pkgconfig/audiofile.pc
-usr/lib32/libfftw3.so
-usr/lib32/libfftw3.so.3*
-usr/lib32/libfftw3f.so
-usr/lib32/libfftw3f.so.3*
-usr/lib32/libfftw3l.so
-usr/lib32/libfftw3l.so.3*
-usr/lib32/pkgconfig/fftw3.pc
-usr/lib32/pkgconfig/fftw3f.pc
-usr/lib32/pkgconfig/fftw3l.pc
-usr/lib32/ladspa/alias_1407.so
-usr/lib32/ladspa/allpass_1895.so
-usr/lib32/ladspa/am_pitchshift_1433.so
-usr/lib32/ladspa/amp.so
-usr/lib32/ladspa/amp_1181.so
-usr/lib32/ladspa/analogue_osc_1416.so
-usr/lib32/ladspa/bandpass_a_iir_1893.so
-usr/lib32/ladspa/bandpass_iir_1892.so
-usr/lib32/ladspa/bode_shifter_1431.so
-usr/lib32/ladspa/bode_shifter_cv_1432.so
-usr/lib32/ladspa/butterworth_1902.so
-usr/lib32/ladspa/caps.so
-usr/lib32/ladspa/chebstortion_1430.so
-usr/lib32/ladspa/comb_1190.so
-usr/lib32/ladspa/comb_1887.so
-usr/lib32/ladspa/comb_splitter_1411.so
-usr/lib32/ladspa/const_1909.so
-usr/lib32/ladspa/crossover_dist_1404.so
-usr/lib32/ladspa/dc_remove_1207.so
-usr/lib32/ladspa/decay_1886.so
-usr/lib32/ladspa/decimator_1202.so
-usr/lib32/ladspa/declip_1195.so
-usr/lib32/ladspa/delay.so
-usr/lib32/ladspa/delay_1898.so
-usr/lib32/ladspa/delayorama_1402.so
-usr/lib32/ladspa/diode_1185.so
-usr/lib32/ladspa/divider_1186.so
-usr/lib32/ladspa/dj_eq_1901.so
-usr/lib32/ladspa/dj_flanger_1438.so
-usr/lib32/ladspa/dyson_compress_1403.so
-usr/lib32/ladspa/fad_delay_1192.so
-usr/lib32/ladspa/fast_lookahead_limiter_1913.so
-usr/lib32/ladspa/filter.so
-usr/lib32/ladspa/flanger_1191.so
-usr/lib32/ladspa/fm_osc_1415.so
-usr/lib32/ladspa/foldover_1213.so
-usr/lib32/ladspa/foverdrive_1196.so
-usr/lib32/ladspa/freq_tracker_1418.so
-usr/lib32/ladspa/gate_1410.so
-usr/lib32/ladspa/giant_flange_1437.so
-usr/lib32/ladspa/gong_1424.so
-usr/lib32/ladspa/gong_beater_1439.so
-usr/lib32/ladspa/gsm_1215.so
-usr/lib32/ladspa/gverb_1216.so
-usr/lib32/ladspa/hard_limiter_1413.so
-usr/lib32/ladspa/harmonic_gen_1220.so
-usr/lib32/ladspa/hermes_filter_1200.so
-usr/lib32/ladspa/highpass_iir_1890.so
-usr/lib32/ladspa/hilbert_1440.so
-usr/lib32/ladspa/imp_1199.so
-usr/lib32/ladspa/impulse_1885.so
-usr/lib32/ladspa/inv_1429.so
-usr/lib32/ladspa/karaoke_1409.so
-usr/lib32/ladspa/latency_1914.so
-usr/lib32/ladspa/lcr_delay_1436.so
-usr/lib32/ladspa/lowpass_iir_1891.so
-usr/lib32/ladspa/ls_filter_1908.so
-usr/lib32/ladspa/matrix_ms_st_1421.so
-usr/lib32/ladspa/matrix_spatialiser_1422.so
-usr/lib32/ladspa/matrix_st_ms_1420.so
-usr/lib32/ladspa/mbeq_1197.so
-usr/lib32/ladspa/mod_delay_1419.so
-usr/lib32/ladspa/multivoice_chorus_1201.so
-usr/lib32/ladspa/noise.so
-usr/lib32/ladspa/notch_iir_1894.so
-usr/lib32/ladspa/phasers_1217.so
-usr/lib32/ladspa/pitch_scale_1193.so
-usr/lib32/ladspa/pitch_scale_1194.so
-usr/lib32/ladspa/plate_1423.so
-usr/lib32/ladspa/pointer_cast_1910.so
-usr/lib32/ladspa/rate_shifter_1417.so
-usr/lib32/ladspa/retro_flange_1208.so
-usr/lib32/ladspa/revdelay_1605.so
-usr/lib32/ladspa/ringmod_1188.so
-usr/lib32/ladspa/satan_maximiser_1408.so
-usr/lib32/ladspa/sc1_1425.so
-usr/lib32/ladspa/sc2_1426.so
-usr/lib32/ladspa/sc3_1427.so
-usr/lib32/ladspa/sc4_1882.so
-usr/lib32/ladspa/sc4m_1916.so
-usr/lib32/ladspa/se4_1883.so
-usr/lib32/ladspa/shaper_1187.so
-usr/lib32/ladspa/sifter_1210.so
-usr/lib32/ladspa/sin_cos_1881.so
-usr/lib32/ladspa/sine.so
-usr/lib32/ladspa/single_para_1203.so
-usr/lib32/ladspa/sinus_wavewrapper_1198.so
-usr/lib32/ladspa/smooth_decimate_1414.so
-usr/lib32/ladspa/split_1406.so
-usr/lib32/ladspa/step_muxer_1212.so
-usr/lib32/ladspa/surround_encoder_1401.so
-usr/lib32/ladspa/svf_1214.so
-usr/lib32/ladspa/tape_delay_1211.so
-usr/lib32/ladspa/transient_1206.so
-usr/lib32/ladspa/triple_para_1204.so
-usr/lib32/ladspa/valve_1209.so
-usr/lib32/ladspa/valve_rect_1405.so
-usr/lib32/ladspa/vynil_1905.so
-usr/lib32/ladspa/wave_terrain_1412.so
-usr/lib32/ladspa/xfade_1915.so
-usr/lib32/ladspa/zm1_1428.so
-usr/lib32/libmikmod.so
-usr/lib32/libmikmod.so.2
-usr/lib32/libmikmod.so.3
-usr/lib32/libmikmod.so.3.0.0
-usr/lib32/pkgconfig/libmikmod.pc
-usr/lib32/alsa-lib/libasound_module_ctl_equal.so
-usr/lib32/alsa-lib/libasound_module_pcm_equal.so
-usr/lib32/libcdda_interface.so
-usr/lib32/libcdda_interface.so.0
-usr/lib32/libcdda_interface.so.0.10.2
-usr/lib32/libcdda_paranoia.so
-usr/lib32/libcdda_paranoia.so.0
-usr/lib32/libcdda_paranoia.so.0.10.2
-usr/lib32/libwavpack.so
-usr/lib32/libwavpack.so.1
-usr/lib32/libwavpack.so.1.1.4
-usr/lib32/pkgconfig/wavpack.pc
-usr/lib32/libmpcdec.so
-usr/lib32/libmpcdec.so.7
-usr/lib32/libmpcdec.so.7.0.1
-usr/lib32/libsndfile.so
-usr/lib32/libsndfile.so.1
-usr/lib32/libsndfile.so.1.0.25
-usr/lib32/pkgconfig/sndfile.pc
-usr/lib32/libsamplerate.so
-usr/lib32/libsamplerate.so.0
-usr/lib32/libsamplerate.so.0.1.7
-usr/lib32/pkgconfig/samplerate.pc
-usr/lib32/libtwolame.so
-usr/lib32/libtwolame.so.0
-usr/lib32/libtwolame.so.0.0.0
-usr/lib32/pkgconfig/twolame.pc
-usr/lib32/jack/a2j_in.so
-usr/lib32/jack/inprocess.so
-usr/lib32/jack/intime.so
-usr/lib32/jack/jack_alsa.so
-usr/lib32/jack/jack_alsa_midi.so
-usr/lib32/jack/jack_dummy.so
-usr/lib32/jack/jack_net.so
-usr/lib32/jack/jack_oss.so
-usr/lib32/libjack.so
-usr/lib32/libjack.so.0
-usr/lib32/libjack.so.0.0.28
-usr/lib32/libjackserver.so
-usr/lib32/libjackserver.so.0
-usr/lib32/libjackserver.so.0.0.28
-usr/lib32/pkgconfig/jack.pc
-usr/lib32/libportaudio.so
-usr/lib32/libportaudio.so.2
-usr/lib32/libportaudio.so.2.0.0
-usr/lib32/libportaudiocpp.so
-usr/lib32/libportaudiocpp.so.0
-usr/lib32/libportaudiocpp.so.0.0.12
-usr/lib32/pkgconfig/portaudio-2.0.pc
-usr/lib32/pkgconfig/portaudiocpp.pc
-usr/lib32/libmpg123.so
-usr/lib32/libmpg123.so.0*
-usr/lib32/mpg123/output_alsa.so
-usr/lib32/mpg123/output_dummy.so
-usr/lib32/mpg123/output_jack.so
-usr/lib32/mpg123/output_oss.so
-usr/lib32/mpg123/output_portaudio.so
-usr/lib32/mpg123/output_pulse.so
-usr/lib32/pkgconfig/libmpg123.pc
-usr/lib32/libpulse-mainloop-glib.so
-usr/lib32/libpulse-mainloop-glib.so.0
-usr/lib32/libpulse-mainloop-glib.so.0.0.4
-usr/lib32/libpulse-simple.so
-usr/lib32/libpulse-simple.so.0
-usr/lib32/libpulse-simple.so.0.0.4
-usr/lib32/libpulse.so
-usr/lib32/libpulse.so.0
-usr/lib32/libpulse.so.0.16.2
-usr/lib32/libpulsecore-4.0.so
-usr/lib32/pkgconfig/libpulse-mainloop-glib.pc
-usr/lib32/pkgconfig/libpulse-simple.pc
-usr/lib32/pkgconfig/libpulse.pc
-usr/lib32/pulse-4.0/modules/libalsa-util.so
-usr/lib32/pulse-4.0/modules/libcli.so
-usr/lib32/pulse-4.0/modules/libprotocol-cli.so
-usr/lib32/pulse-4.0/modules/libprotocol-http.so
-usr/lib32/pulse-4.0/modules/libprotocol-native.so
-usr/lib32/pulse-4.0/modules/libprotocol-simple.so
-usr/lib32/pulse-4.0/modules/libraop.so
-usr/lib32/pulse-4.0/modules/librtp.so
-usr/lib32/pulse-4.0/modules/libwebrtc-util.so
-usr/lib32/pulse-4.0/modules/module-alsa-card.so
-usr/lib32/pulse-4.0/modules/module-alsa-sink.so
-usr/lib32/pulse-4.0/modules/module-alsa-source.so
-usr/lib32/pulse-4.0/modules/module-always-sink.so
-usr/lib32/pulse-4.0/modules/module-augment-properties.so
-usr/lib32/pulse-4.0/modules/module-card-restore.so
-usr/lib32/pulse-4.0/modules/module-cli-protocol-tcp.so
-usr/lib32/pulse-4.0/modules/module-cli-protocol-unix.so
-usr/lib32/pulse-4.0/modules/module-cli.so
-usr/lib32/pulse-4.0/modules/module-combine-sink.so
-usr/lib32/pulse-4.0/modules/module-combine.so
-usr/lib32/pulse-4.0/modules/module-default-device-restore.so
-usr/lib32/pulse-4.0/modules/module-detect.so
-usr/lib32/pulse-4.0/modules/module-device-manager.so
-usr/lib32/pulse-4.0/modules/module-device-restore.so
-usr/lib32/pulse-4.0/modules/module-echo-cancel.so
-usr/lib32/pulse-4.0/modules/module-filter-apply.so
-usr/lib32/pulse-4.0/modules/module-filter-heuristics.so
-usr/lib32/pulse-4.0/modules/module-http-protocol-tcp.so
-usr/lib32/pulse-4.0/modules/module-http-protocol-unix.so
-usr/lib32/pulse-4.0/modules/module-intended-roles.so
-usr/lib32/pulse-4.0/modules/module-jack-sink.so
-usr/lib32/pulse-4.0/modules/module-jack-source.so
-usr/lib32/pulse-4.0/modules/module-ladspa-sink.so
-usr/lib32/pulse-4.0/modules/module-loopback.so
-usr/lib32/pulse-4.0/modules/module-match.so
-usr/lib32/pulse-4.0/modules/module-mmkbd-evdev.so
-usr/lib32/pulse-4.0/modules/module-native-protocol-fd.so
-usr/lib32/pulse-4.0/modules/module-native-protocol-tcp.so
-usr/lib32/pulse-4.0/modules/module-native-protocol-unix.so
-usr/lib32/pulse-4.0/modules/module-null-sink.so
-usr/lib32/pulse-4.0/modules/module-null-source.so
-usr/lib32/pulse-4.0/modules/module-pipe-sink.so
-usr/lib32/pulse-4.0/modules/module-pipe-source.so
-usr/lib32/pulse-4.0/modules/module-position-event-sounds.so
-usr/lib32/pulse-4.0/modules/module-raop-sink.so
-usr/lib32/pulse-4.0/modules/module-remap-sink.so
-usr/lib32/pulse-4.0/modules/module-remap-source.so
-usr/lib32/pulse-4.0/modules/module-rescue-streams.so
-usr/lib32/pulse-4.0/modules/module-role-cork.so
-usr/lib32/pulse-4.0/modules/module-role-ducking.so
-usr/lib32/pulse-4.0/modules/module-rtp-recv.so
-usr/lib32/pulse-4.0/modules/module-rtp-send.so
-usr/lib32/pulse-4.0/modules/module-simple-protocol-tcp.so
-usr/lib32/pulse-4.0/modules/module-simple-protocol-unix.so
-usr/lib32/pulse-4.0/modules/module-sine-source.so
-usr/lib32/pulse-4.0/modules/module-sine.so
-usr/lib32/pulse-4.0/modules/module-stream-restore.so
-usr/lib32/pulse-4.0/modules/module-suspend-on-idle.so
-usr/lib32/pulse-4.0/modules/module-switch-on-connect.so
-usr/lib32/pulse-4.0/modules/module-switch-on-port-available.so
-usr/lib32/pulse-4.0/modules/module-tunnel-sink.so
-usr/lib32/pulse-4.0/modules/module-tunnel-source.so
-usr/lib32/pulse-4.0/modules/module-virtual-sink.so
-usr/lib32/pulse-4.0/modules/module-virtual-source.so
-usr/lib32/pulse-4.0/modules/module-virtual-surround-sink.so
-usr/lib32/pulse-4.0/modules/module-volume-restore.so
-usr/lib32/pulse-4.0/modules/module-x11-bell.so
-usr/lib32/pulse-4.0/modules/module-x11-cork-request.so
-usr/lib32/pulse-4.0/modules/module-x11-publish.so
-usr/lib32/pulse-4.0/modules/module-x11-xsmp.so
-usr/lib32/pulseaudio/libpulsecommon-4.0.so
-usr/lib32/pulseaudio/libpulsedsp.so
-usr/lib32/ao/plugins-4/libalsa.so
-usr/lib32/ao/plugins-4/liboss.so
-usr/lib32/ao/plugins-4/libpulse.so
-usr/lib32/libao.so
-usr/lib32/libao.so.4
-usr/lib32/libao.so.4.0.0
-usr/lib32/libaoss.so
-usr/lib32/pkgconfig/ao.pc
diff --git a/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406 b/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406
deleted file mode 100644
index 8378d44..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/files/remove-native-20140406
+++ /dev/null
@@ -1,318 +0,0 @@
-usr/lib32/pkgconfig/ogg.pc
-usr/lib32/libogg.so
-usr/lib32/libogg.so.0
-usr/lib32/libogg.so.0.8.1
-usr/lib32/libmodplug.so
-usr/lib32/libmodplug.so.1
-usr/lib32/libmodplug.so.1.0.0
-usr/lib32/pkgconfig/libmodplug.pc
-usr/lib32/libgsm.so
-usr/lib32/libgsm.so.1
-usr/lib32/libgsm.so.1.0.13
-usr/lib32/libvorbis.so
-usr/lib32/libvorbis.so.0
-usr/lib32/libvorbis.so.0.4.6
-usr/lib32/libvorbisenc.so
-usr/lib32/libvorbisenc.so.2
-usr/lib32/libvorbisenc.so.2.0.9
-usr/lib32/libvorbisfile.so
-usr/lib32/libvorbisfile.so.3
-usr/lib32/libvorbisfile.so.3.3.5
-usr/lib32/pkgconfig/vorbis.pc
-usr/lib32/pkgconfig/vorbisenc.pc
-usr/lib32/pkgconfig/vorbisfile.pc
-usr/lib32/libwebrtc_audio_processing.so
-usr/lib32/libwebrtc_audio_processing.so.0
-usr/lib32/libwebrtc_audio_processing.so.0.0.0
-usr/lib32/pkgconfig/webrtc-audio-processing.pc
-usr/lib32/libasound.so
-usr/lib32/libasound.so.2
-usr/lib32/libasound.so.2.0.0
-usr/lib32/pkgconfig/alsa.pc
-usr/lib32/alsa-lib/smixer/smixer-ac97.so
-usr/lib32/alsa-lib/smixer/smixer-hda.so
-usr/lib32/alsa-lib/smixer/smixer-sbase.so
-usr/lib32/libFLAC++.so
-usr/lib32/libFLAC++.so.6
-usr/lib32/libFLAC++.so.6.2.0
-usr/lib32/libFLAC.so
-usr/lib32/libFLAC.so.8
-usr/lib32/libFLAC.so.8.2.0
-usr/lib32/pkgconfig/flac++.pc
-usr/lib32/pkgconfig/flac.pc
-usr/lib32/libaudiofile.so
-usr/lib32/libaudiofile.so.1
-usr/lib32/libaudiofile.so.1.0.0
-usr/lib32/pkgconfig/audiofile.pc
-usr/lib32/libfftw3.so
-usr/lib32/libfftw3.so.3
-usr/lib32/libfftw3.so.3.3.2
-usr/lib32/libfftw3f.so
-usr/lib32/libfftw3f.so.3
-usr/lib32/libfftw3f.so.3.3.2
-usr/lib32/libfftw3l.so
-usr/lib32/libfftw3l.so.3
-usr/lib32/libfftw3l.so.3.3.2
-usr/lib32/pkgconfig/fftw3.pc
-usr/lib32/pkgconfig/fftw3f.pc
-usr/lib32/pkgconfig/fftw3l.pc
-usr/lib32/ladspa/alias_1407.so
-usr/lib32/ladspa/allpass_1895.so
-usr/lib32/ladspa/am_pitchshift_1433.so
-usr/lib32/ladspa/amp.so
-usr/lib32/ladspa/amp_1181.so
-usr/lib32/ladspa/analogue_osc_1416.so
-usr/lib32/ladspa/bandpass_a_iir_1893.so
-usr/lib32/ladspa/bandpass_iir_1892.so
-usr/lib32/ladspa/bode_shifter_1431.so
-usr/lib32/ladspa/bode_shifter_cv_1432.so
-usr/lib32/ladspa/butterworth_1902.so
-usr/lib32/ladspa/caps.so
-usr/lib32/ladspa/chebstortion_1430.so
-usr/lib32/ladspa/comb_1190.so
-usr/lib32/ladspa/comb_1887.so
-usr/lib32/ladspa/comb_splitter_1411.so
-usr/lib32/ladspa/const_1909.so
-usr/lib32/ladspa/crossover_dist_1404.so
-usr/lib32/ladspa/dc_remove_1207.so
-usr/lib32/ladspa/decay_1886.so
-usr/lib32/ladspa/decimator_1202.so
-usr/lib32/ladspa/declip_1195.so
-usr/lib32/ladspa/delay.so
-usr/lib32/ladspa/delay_1898.so
-usr/lib32/ladspa/delayorama_1402.so
-usr/lib32/ladspa/diode_1185.so
-usr/lib32/ladspa/divider_1186.so
-usr/lib32/ladspa/dj_eq_1901.so
-usr/lib32/ladspa/dj_flanger_1438.so
-usr/lib32/ladspa/dyson_compress_1403.so
-usr/lib32/ladspa/fad_delay_1192.so
-usr/lib32/ladspa/fast_lookahead_limiter_1913.so
-usr/lib32/ladspa/filter.so
-usr/lib32/ladspa/flanger_1191.so
-usr/lib32/ladspa/fm_osc_1415.so
-usr/lib32/ladspa/foldover_1213.so
-usr/lib32/ladspa/foverdrive_1196.so
-usr/lib32/ladspa/freq_tracker_1418.so
-usr/lib32/ladspa/gate_1410.so
-usr/lib32/ladspa/giant_flange_1437.so
-usr/lib32/ladspa/gong_1424.so
-usr/lib32/ladspa/gong_beater_1439.so
-usr/lib32/ladspa/gsm_1215.so
-usr/lib32/ladspa/gverb_1216.so
-usr/lib32/ladspa/hard_limiter_1413.so
-usr/lib32/ladspa/harmonic_gen_1220.so
-usr/lib32/ladspa/hermes_filter_1200.so
-usr/lib32/ladspa/highpass_iir_1890.so
-usr/lib32/ladspa/hilbert_1440.so
-usr/lib32/ladspa/imp_1199.so
-usr/lib32/ladspa/impulse_1885.so
-usr/lib32/ladspa/inv_1429.so
-usr/lib32/ladspa/karaoke_1409.so
-usr/lib32/ladspa/latency_1914.so
-usr/lib32/ladspa/lcr_delay_1436.so
-usr/lib32/ladspa/lowpass_iir_1891.so
-usr/lib32/ladspa/ls_filter_1908.so
-usr/lib32/ladspa/matrix_ms_st_1421.so
-usr/lib32/ladspa/matrix_spatialiser_1422.so
-usr/lib32/ladspa/matrix_st_ms_1420.so
-usr/lib32/ladspa/mbeq_1197.so
-usr/lib32/ladspa/mod_delay_1419.so
-usr/lib32/ladspa/multivoice_chorus_1201.so
-usr/lib32/ladspa/noise.so
-usr/lib32/ladspa/notch_iir_1894.so
-usr/lib32/ladspa/phasers_1217.so
-usr/lib32/ladspa/pitch_scale_1193.so
-usr/lib32/ladspa/pitch_scale_1194.so
-usr/lib32/ladspa/plate_1423.so
-usr/lib32/ladspa/pointer_cast_1910.so
-usr/lib32/ladspa/rate_shifter_1417.so
-usr/lib32/ladspa/retro_flange_1208.so
-usr/lib32/ladspa/revdelay_1605.so
-usr/lib32/ladspa/ringmod_1188.so
-usr/lib32/ladspa/satan_maximiser_1408.so
-usr/lib32/ladspa/sc1_1425.so
-usr/lib32/ladspa/sc2_1426.so
-usr/lib32/ladspa/sc3_1427.so
-usr/lib32/ladspa/sc4_1882.so
-usr/lib32/ladspa/sc4m_1916.so
-usr/lib32/ladspa/se4_1883.so
-usr/lib32/ladspa/shaper_1187.so
-usr/lib32/ladspa/sifter_1210.so
-usr/lib32/ladspa/sin_cos_1881.so
-usr/lib32/ladspa/sine.so
-usr/lib32/ladspa/single_para_1203.so
-usr/lib32/ladspa/sinus_wavewrapper_1198.so
-usr/lib32/ladspa/smooth_decimate_1414.so
-usr/lib32/ladspa/split_1406.so
-usr/lib32/ladspa/step_muxer_1212.so
-usr/lib32/ladspa/surround_encoder_1401.so
-usr/lib32/ladspa/svf_1214.so
-usr/lib32/ladspa/tape_delay_1211.so
-usr/lib32/ladspa/transient_1206.so
-usr/lib32/ladspa/triple_para_1204.so
-usr/lib32/ladspa/valve_1209.so
-usr/lib32/ladspa/valve_rect_1405.so
-usr/lib32/ladspa/vynil_1905.so
-usr/lib32/ladspa/wave_terrain_1412.so
-usr/lib32/ladspa/xfade_1915.so
-usr/lib32/ladspa/zm1_1428.so
-usr/lib32/libmikmod.so
-usr/lib32/libmikmod.so.2
-usr/lib32/libmikmod.so.3
-usr/lib32/libmikmod.so.3.0.0
-usr/lib32/pkgconfig/libmikmod.pc
-usr/lib32/alsa-lib/libasound_module_ctl_equal.so
-usr/lib32/alsa-lib/libasound_module_pcm_equal.so
-usr/lib32/libcdda_interface.so
-usr/lib32/libcdda_interface.so.0
-usr/lib32/libcdda_interface.so.0.10.2
-usr/lib32/libcdda_paranoia.so
-usr/lib32/libcdda_paranoia.so.0
-usr/lib32/libcdda_paranoia.so.0.10.2
-usr/lib32/libwavpack.so
-usr/lib32/libwavpack.so.1
-usr/lib32/libwavpack.so.1.1.4
-usr/lib32/pkgconfig/wavpack.pc
-usr/lib32/libmpcdec.so
-usr/lib32/libmpcdec.so.7
-usr/lib32/libmpcdec.so.7.0.1
-usr/lib32/libsndfile.so
-usr/lib32/libsndfile.so.1
-usr/lib32/libsndfile.so.1.0.25
-usr/lib32/pkgconfig/sndfile.pc
-usr/lib32/libsamplerate.so
-usr/lib32/libsamplerate.so.0
-usr/lib32/libsamplerate.so.0.1.7
-usr/lib32/pkgconfig/samplerate.pc
-usr/lib32/libtwolame.so
-usr/lib32/libtwolame.so.0
-usr/lib32/libtwolame.so.0.0.0
-usr/lib32/pkgconfig/twolame.pc
-usr/lib32/jack/a2j_in.so
-usr/lib32/jack/inprocess.so
-usr/lib32/jack/intime.so
-usr/lib32/jack/jack_alsa.so
-usr/lib32/jack/jack_alsa_midi.so
-usr/lib32/jack/jack_dummy.so
-usr/lib32/jack/jack_net.so
-usr/lib32/jack/jack_oss.so
-usr/lib32/libjack.so
-usr/lib32/libjack.so.0
-usr/lib32/libjack.so.0.0.28
-usr/lib32/libjackserver.so
-usr/lib32/libjackserver.so.0
-usr/lib32/libjackserver.so.0.0.28
-usr/lib32/pkgconfig/jack.pc
-usr/lib32/libportaudio.so
-usr/lib32/libportaudio.so.2
-usr/lib32/libportaudio.so.2.0.0
-usr/lib32/libportaudiocpp.so
-usr/lib32/libportaudiocpp.so.0
-usr/lib32/libportaudiocpp.so.0.0.12
-usr/lib32/pkgconfig/portaudio-2.0.pc
-usr/lib32/pkgconfig/portaudiocpp.pc
-usr/lib32/libmpg123.so
-usr/lib32/libmpg123.so.0
-usr/lib32/libmpg123.so.0.37.5
-usr/lib32/mpg123/output_alsa.so
-usr/lib32/mpg123/output_dummy.so
-usr/lib32/mpg123/output_jack.so
-usr/lib32/mpg123/output_oss.so
-usr/lib32/mpg123/output_portaudio.so
-usr/lib32/mpg123/output_pulse.so
-usr/lib32/pkgconfig/libmpg123.pc
-usr/lib32/libpulse-mainloop-glib.so
-usr/lib32/libpulse-mainloop-glib.so.0
-usr/lib32/libpulse-mainloop-glib.so.0.0.5
-usr/lib32/libpulse-simple.so
-usr/lib32/libpulse-simple.so.0
-usr/lib32/libpulse-simple.so.0.1.0
-usr/lib32/libpulse.so
-usr/lib32/libpulse.so.0
-usr/lib32/libpulse.so.0.17.3
-usr/lib32/libpulsecore-5.0.so
-usr/lib32/pkgconfig/libpulse-mainloop-glib.pc
-usr/lib32/pkgconfig/libpulse-simple.pc
-usr/lib32/pkgconfig/libpulse.pc
-usr/lib32/pulse-5.0/modules/libalsa-util.so
-usr/lib32/pulse-5.0/modules/libcli.so
-usr/lib32/pulse-5.0/modules/libprotocol-cli.so
-usr/lib32/pulse-5.0/modules/libprotocol-http.so
-usr/lib32/pulse-5.0/modules/libprotocol-native.so
-usr/lib32/pulse-5.0/modules/libprotocol-simple.so
-usr/lib32/pulse-5.0/modules/libraop.so
-usr/lib32/pulse-5.0/modules/librtp.so
-usr/lib32/pulse-5.0/modules/libwebrtc-util.so
-usr/lib32/pulse-5.0/modules/module-alsa-card.so
-usr/lib32/pulse-5.0/modules/module-alsa-sink.so
-usr/lib32/pulse-5.0/modules/module-alsa-source.so
-usr/lib32/pulse-5.0/modules/module-always-sink.so
-usr/lib32/pulse-5.0/modules/module-augment-properties.so
-usr/lib32/pulse-5.0/modules/module-card-restore.so
-usr/lib32/pulse-5.0/modules/module-cli-protocol-tcp.so
-usr/lib32/pulse-5.0/modules/module-cli-protocol-unix.so
-usr/lib32/pulse-5.0/modules/module-cli.so
-usr/lib32/pulse-5.0/modules/module-combine-sink.so
-usr/lib32/pulse-5.0/modules/module-combine.so
-usr/lib32/pulse-5.0/modules/module-default-device-restore.so
-usr/lib32/pulse-5.0/modules/module-detect.so
-usr/lib32/pulse-5.0/modules/module-device-manager.so
-usr/lib32/pulse-5.0/modules/module-device-restore.so
-usr/lib32/pulse-5.0/modules/module-echo-cancel.so
-usr/lib32/pulse-5.0/modules/module-filter-apply.so
-usr/lib32/pulse-5.0/modules/module-filter-heuristics.so
-usr/lib32/pulse-5.0/modules/module-http-protocol-tcp.so
-usr/lib32/pulse-5.0/modules/module-http-protocol-unix.so
-usr/lib32/pulse-5.0/modules/module-intended-roles.so
-usr/lib32/pulse-5.0/modules/module-jack-sink.so
-usr/lib32/pulse-5.0/modules/module-jack-source.so
-usr/lib32/pulse-5.0/modules/module-ladspa-sink.so
-usr/lib32/pulse-5.0/modules/module-loopback.so
-usr/lib32/pulse-5.0/modules/module-match.so
-usr/lib32/pulse-5.0/modules/module-mmkbd-evdev.so
-usr/lib32/pulse-5.0/modules/module-native-protocol-fd.so
-usr/lib32/pulse-5.0/modules/module-native-protocol-tcp.so
-usr/lib32/pulse-5.0/modules/module-native-protocol-unix.so
-usr/lib32/pulse-5.0/modules/module-null-sink.so
-usr/lib32/pulse-5.0/modules/module-null-source.so
-usr/lib32/pulse-5.0/modules/module-pipe-sink.so
-usr/lib32/pulse-5.0/modules/module-pipe-source.so
-usr/lib32/pulse-5.0/modules/module-position-event-sounds.so
-usr/lib32/pulse-5.0/modules/module-raop-sink.so
-usr/lib32/pulse-5.0/modules/module-remap-sink.so
-usr/lib32/pulse-5.0/modules/module-remap-source.so
-usr/lib32/pulse-5.0/modules/module-rescue-streams.so
-usr/lib32/pulse-5.0/modules/module-role-cork.so
-usr/lib32/pulse-5.0/modules/module-role-ducking.so
-usr/lib32/pulse-5.0/modules/module-rtp-recv.so
-usr/lib32/pulse-5.0/modules/module-rtp-send.so
-usr/lib32/pulse-5.0/modules/module-simple-protocol-tcp.so
-usr/lib32/pulse-5.0/modules/module-simple-protocol-unix.so
-usr/lib32/pulse-5.0/modules/module-sine-source.so
-usr/lib32/pulse-5.0/modules/module-sine.so
-usr/lib32/pulse-5.0/modules/module-stream-restore.so
-usr/lib32/pulse-5.0/modules/module-suspend-on-idle.so
-usr/lib32/pulse-5.0/modules/module-switch-on-connect.so
-usr/lib32/pulse-5.0/modules/module-switch-on-port-available.so
-usr/lib32/pulse-5.0/modules/module-tunnel-sink-new.so
-usr/lib32/pulse-5.0/modules/module-tunnel-sink.so
-usr/lib32/pulse-5.0/modules/module-tunnel-source-new.so
-usr/lib32/pulse-5.0/modules/module-tunnel-source.so
-usr/lib32/pulse-5.0/modules/module-virtual-sink.so
-usr/lib32/pulse-5.0/modules/module-virtual-source.so
-usr/lib32/pulse-5.0/modules/module-virtual-surround-sink.so
-usr/lib32/pulse-5.0/modules/module-volume-restore.so
-usr/lib32/pulse-5.0/modules/module-x11-bell.so
-usr/lib32/pulse-5.0/modules/module-x11-cork-request.so
-usr/lib32/pulse-5.0/modules/module-x11-publish.so
-usr/lib32/pulse-5.0/modules/module-x11-xsmp.so
-usr/lib32/pulseaudio/libpulsecommon-5.0.so
-usr/lib32/pulseaudio/libpulsedsp.so
-usr/lib32/ao/plugins-4/libalsa.so
-usr/lib32/ao/plugins-4/liboss.so
-usr/lib32/ao/plugins-4/libpulse.so
-usr/lib32/libao.so
-usr/lib32/libao.so.4
-usr/lib32/libao.so.4.0.0
-usr/lib32/pkgconfig/ao.pc
diff --git a/app-emulation/emul-linux-x86-soundlibs/metadata.xml b/app-emulation/emul-linux-x86-soundlibs/metadata.xml
deleted file mode 100644
index cb0221b..0000000
--- a/app-emulation/emul-linux-x86-soundlibs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="development">Install pkgconfig files</flag>
-		<flag name="pulseaudio">Pull in pulseaudio if using USE=abi_x86_32</flag>
-	</use>
-</pkgmetadata>