emul cleaning

Package-Manager: portage-2.1.7.15/cvs/Linux x86_64

17 files changed, 23 insertions, 485 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 4550129075fb..6ce62f61db8e 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.101 2009/12/31 13:25:18 pacho Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.102 2010/01/01 21:25:51 pacho Exp $
+
+  01 Jan 2010; Pacho Ramos <pacho@gentoo.org> -files/75emul-linux-x86-base,
+  -emul-linux-x86-baselibs-2.5.5-r3.ebuild,
+  -emul-linux-x86-baselibs-10.1.ebuild,
+  -emul-linux-x86-baselibs-10.2.ebuild,
+  -emul-linux-x86-baselibs-20071114.ebuild,
+  -emul-linux-x86-baselibs-20071118.ebuild,
+  -emul-linux-x86-baselibs-20071124.ebuild,
+  -emul-linux-x86-baselibs-20071128.ebuild,
+  -emul-linux-x86-baselibs-20071130.ebuild,
+  -emul-linux-x86-baselibs-20071215.ebuild,
+  -emul-linux-x86-baselibs-20071230.ebuild,
+  -emul-linux-x86-baselibs-20080316.ebuild,
+  emul-linux-x86-baselibs-20081109.ebuild,
+  -emul-linux-x86-baselibs-20091003_rc1.ebuild,
+  -emul-linux-x86-baselibs-20091004_rc1.ebuild,
+  -emul-linux-x86-baselibs-20091226.ebuild:
+  emul cleaning and make current stable repoman compliant
 
   31 Dec 2009; Pacho Ramos <pacho@gentoo.org> Manifest:
   Fix Manifest
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild
deleted file mode 100644
index 556d453e7873..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2007 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-10.1.ebuild,v 1.3 2007/02/19 21:57:28 blubb Exp $
-
-DESCRIPTION="Provides precompiled 32bit libraries"
-HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
-SRC_URI="mirror://gentoo/binutils-2.16.1-r3.tbz2
-		mirror://gentoo/bzip2-1.0.3-r6.tbz2
-		mirror://gentoo/com_err-1.39.tbz2
-		mirror://gentoo/cracklib-2.8.9-r1.tbz2
-		mirror://gentoo/cups-1.2.6-nossl.tbz2
-		mirror://gentoo/db-4.2.52_p4-r2.tbz2
-		mirror://gentoo/dbus-1.0.2.tbz2
-		mirror://gentoo/dbus-glib-0.72.tbz2
-		mirror://gentoo/dbus-qt3-old-0.70.tbz2
-		mirror://gentoo/e2fsprogs-1.39.tbz2
-		mirror://gentoo/expat-1.95.8.tbz2
-		mirror://gentoo/file-4.18.tbz2
-		mirror://gentoo/gamin-0.1.8.tbz2
-		mirror://gentoo/gdbm-1.8.3-r3.tbz2
-		mirror://gentoo/glib-1.2.10-r5.tbz2
-		mirror://gentoo/glib-2.12.7.tbz2
-		mirror://gentoo/gpm-1.20.1-r5.tbz2
-		mirror://gentoo/jpeg-6b-r7.tbz2
-		mirror://gentoo/lcms-1.14-r1.tbz2
-		mirror://gentoo/libart_lgpl-2.3.17.tbz2
-		mirror://gentoo/libidn-0.5.15.tbz2
-		mirror://gentoo/libmng-1.0.9-r1.tbz2
-		mirror://gentoo/libperl-5.8.8-r1.tbz2
-		mirror://gentoo/libpng-1.2.15.tbz2
-		mirror://gentoo/libtool-1.5.22.tbz2
-		mirror://gentoo/libxml2-2.6.27.tbz2
-		mirror://gentoo/ncurses-5.5-r3.tbz2
-		mirror://gentoo/nss_ldap-253.tbz2
-		mirror://gentoo/openldap-2.3.30-r2.tbz2
-		mirror://gentoo/openssl-0.9.8d.tbz2
-		mirror://gentoo/pam-0.78-r5.tbz2
-		mirror://gentoo/pwdb-0.62.tbz2
-		mirror://gentoo/readline-5.1_p4.tbz2
-		mirror://gentoo/slang-1.4.9-r2.tbz2
-		mirror://gentoo/ss-1.39.tbz2
-		mirror://gentoo/tiff-3.8.2-r2.tbz2
-		mirror://gentoo/zlib-1.2.3-r1.tbz2"
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-RESTRICT="strip"
-S=${WORKDIR}
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
-	einfo "Note: You can safely ignore the 'trailing garbage after EOF'"
-	einfo "      warnings below"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	WHITELIST="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	# the following line is broken up because we have files with spaces in the filename
-	find ${S} ! -type d ! -name '*.so*' | egrep -v "${WHITELIST}" | xargs -d '
-' rm -f
-	rm -rf ${S}/etc/env.d/binutils/ ${S}/usr/lib32/binutils/
-	rm -rf ${S}/usr/lib32/engines/ ${S}/usr/lib32/openldap/
-	rm -rf ${S}/usr/lib32/python2.4/
-
-	ln -s ../share/terminfo ${S}/usr/lib32/terminfo
-}
-
-src_install() {
-	for dir in etc/env.d etc/revdep-rebuild ; do
-		if [[ -d ${S}/${dir} ]] ; then
-			for f in ${S}/${dir}/* ; do
-				mv -f $f{,-emul}
-			done
-		fi
-	done
-
-	# remove void directories or portage will show weird output
-	find ${S} -depth -type d | xargs rmdir 2&>/dev/null
-
-	cp -a "${WORKDIR}"/* "${D}"/ || die "copying files failed!"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild
deleted file mode 100644
index 894e0cf6c29a..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 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-10.2.ebuild,v 1.2 2007/03/02 15:01:34 blubb Exp $
-
-inherit emul-libs
-
-SRC_URI="mirror://gentoo/binutils-2.16.1-r3.tbz2
-		mirror://gentoo/bzip2-1.0.3-r6.tbz2
-		mirror://gentoo/com_err-1.39.tbz2
-		mirror://gentoo/cracklib-2.8.9-r1.tbz2
-		mirror://gentoo/cups-1.2.6-nossl.tbz2
-		mirror://gentoo/db-4.2.52_p4-r2.tbz2
-		mirror://gentoo/dbus-1.0.2.tbz2
-		mirror://gentoo/dbus-glib-0.72.tbz2
-		mirror://gentoo/dbus-qt3-old-0.70.tbz2
-		mirror://gentoo/e2fsprogs-1.39.tbz2
-		mirror://gentoo/expat-1.95.8.tbz2
-		mirror://gentoo/file-4.18.tbz2
-		mirror://gentoo/gamin-0.1.8.tbz2
-		mirror://gentoo/gdbm-1.8.3-r3.tbz2
-		mirror://gentoo/giflib-4.1.4.tbz2
-		mirror://gentoo/glib-1.2.10-r5.tbz2
-		mirror://gentoo/glib-2.12.7.tbz2
-		mirror://gentoo/gpm-1.20.1-r5.tbz2
-		mirror://gentoo/jpeg-6b-r7.tbz2
-		mirror://gentoo/lcms-1.14-r1.tbz2
-		mirror://gentoo/libart_lgpl-2.3.17.tbz2
-		mirror://gentoo/libidn-0.5.15.tbz2
-		mirror://gentoo/libmng-1.0.9-r1.tbz2
-		mirror://gentoo/libperl-5.8.8-r1.tbz2
-		mirror://gentoo/libpng-1.2.15.tbz2
-		mirror://gentoo/libtool-1.5.22.tbz2
-		mirror://gentoo/libxml2-2.6.27.tbz2
-		mirror://gentoo/ncurses-5.5-r3.tbz2
-		mirror://gentoo/nss_ldap-253.tbz2
-		mirror://gentoo/openldap-2.3.30-r2.tbz2
-		mirror://gentoo/openssl-0.9.8d.tbz2
-		mirror://gentoo/pam-0.78-r5.tbz2
-		mirror://gentoo/pwdb-0.62.tbz2
-		mirror://gentoo/readline-5.1_p4.tbz2
-		mirror://gentoo/slang-1.4.9-r2.tbz2
-		mirror://gentoo/ss-1.39.tbz2
-		mirror://gentoo/tiff-3.8.2-r2.tbz2
-		mirror://gentoo/zlib-1.2.3-r1.tbz2"
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-libs_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo ${S}/usr/lib32/terminfo
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.5-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.5-r3.ebuild
deleted file mode 100644
index 296a8aa09a5f..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.5.5-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 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-2.5.5-r3.ebuild,v 1.3 2007/07/02 13:50:50 peper Exp $
-
-inherit eutils
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~dang/${P}.tar.bz2
-	mirror://gentoo/${P}-r2-emul.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="app-emulation/emul-linux-x86-compat"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv emul/linux/x86/lib lib32 || die
-	mkdir usr
-	mv emul/linux/x86/usr/lib usr/lib32 || die
-	rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die
-	mv lib32/pam_unix_*.so lib32/security/ || die
-	rm usr/lib32/libnss_ldap.so.2 || die
-	epatch ${P}-r2-emul.patch
-	rm ${P}-r2-emul.patch || die
-}
-
-src_install() {
-	cp -a "${WORKDIR}"/* "${D}"/ || die
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071114.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071114.ebuild
deleted file mode 100644
index 9c76ab646848..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071114.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071114.ebuild,v 1.2 2007/11/16 17:21:36 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071118.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071118.ebuild
deleted file mode 100644
index a06e009f0c1b..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071118.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071118.ebuild,v 1.2 2007/11/24 01:14:45 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071124.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071124.ebuild
deleted file mode 100644
index ba1dc013c59e..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071124.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071124.ebuild,v 1.1 2007/11/24 08:14:21 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071128.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071128.ebuild
deleted file mode 100644
index 4a3684adc51d..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071128.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071128.ebuild,v 1.2 2007/11/28 23:20:41 wolf31o2 Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071130.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071130.ebuild
deleted file mode 100644
index 7abae4ac7152..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071130.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071130.ebuild,v 1.2 2007/11/30 21:03:09 cardoe Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071215.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071215.ebuild
deleted file mode 100644
index f7b0832cc24f..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071215.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071215.ebuild,v 1.1 2007/12/15 16:33:53 welp Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071230.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071230.ebuild
deleted file mode 100644
index b292b0ea4145..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20071230.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2007 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-20071230.ebuild,v 1.2 2008/01/03 19:40:43 welp Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20080316.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20080316.ebuild
deleted file mode 100644
index a68dac60d20b..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20080316.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 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-20080316.ebuild,v 1.3 2009/05/10 18:27:38 arfrever Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-QA_DT_HASH="usr/lib32/.*"
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20081109.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20081109.ebuild
index fc99695a14c1..3646fb2fe4ef 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20081109.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20081109.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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-20081109.ebuild,v 1.3 2009/11/03 21:05:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20081109.ebuild,v 1.4 2010/01/01 21:25:51 pacho Exp $
 
 inherit emul-linux-x86
 
@@ -8,6 +8,7 @@ LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
 		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
 		PAM ZLIB as-is"
 KEYWORDS="-* amd64"
+IUSE=""
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091003_rc1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091003_rc1.ebuild
deleted file mode 100644
index ad0e58d416fb..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091003_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 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-20091003_rc1.ebuild,v 1.1 2009/10/04 00:33:03 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-QA_DT_HASH="usr/lib32/.*"
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091004_rc1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091004_rc1.ebuild
deleted file mode 100644
index dc6cc3ac8328..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091004_rc1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2009 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-20091004_rc1.ebuild,v 1.1 2009/10/04 17:23:09 kingtaco Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 MIT OPENLDAP openssl
-		PAM ZLIB as-is"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-QA_DT_HASH="usr/lib32/.*"
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" \
-			"${S}/usr/lib32/python2.4/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091226.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091226.ebuild
deleted file mode 100644
index 8da03d1a41fc..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20091226.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 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-20091226.ebuild,v 1.2 2009/12/28 21:04:50 mr_bones_ Exp $
-
-inherit emul-linux-x86
-
-LICENSE="|| ( Artistic GPL-2 ) || ( BSD GPL-2 ) BZIP2 CRACKLIB DB
-		GPL-2 || ( GPL-2 AFL-2.1 ) LGPL-2 LGPL-2.1 GPL-3 LGPL-3
-		MIT OPENLDAP OpenSoftware openssl OracleDB PAM ZLIB
-		tcp_wrappers_license as-is"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-QA_DT_HASH="usr/lib32/.*"
-
-src_unpack() {
-	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
-	emul-linux-x86_src_unpack
-	rm -rf "${S}/etc/env.d/binutils/" \
-			"${S}/usr/lib32/binutils/" \
-			"${S}/usr/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/"
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo"
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base b/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base
deleted file mode 100644
index bbc2111244f9..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH=/emul/linux/x86/lib:/emul/linux/x86/usr/lib