Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 15 insertions, 66 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index bc11d48109f6..789d289accde 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.125 2011/10/16 12:09:55 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.126 2012/01/27 17:51:13 pacho Exp $
+
+*emul-linux-x86-baselibs-20120127 (27 Jan 2012)
+
+  27 Jan 2012; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-baselibs-20120127.ebuild,
+  -emul-linux-x86-baselibs-20110129.ebuild,
+  -emul-linux-x86-baselibs-20110722-r99.ebuild,
+  -emul-linux-x86-baselibs-20110722.ebuild:
+  Version bump, remove old.
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   emul-linux-x86-baselibs-20110928.ebuild:
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild
deleted file mode 100644
index d2e93f56d352..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110129.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 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-20110129.ebuild,v 1.2 2011/02/12 20:19:02 hwoarang 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 MPL-1.1 OPENLDAP OpenSoftware openssl OracleDB ZLIB
-		tcp_wrappers_license as-is UoI-NCSA"
-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/i686-pc-linux-gnu/lib" \
-			"${S}/usr/lib32/engines/" \
-			"${S}/usr/lib32/openldap/" || die
-
-	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110722-r99.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110722-r99.ebuild
deleted file mode 100644
index ba34748948f9..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110722-r99.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 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-20110722-r99.ebuild,v 1.1 2011/07/22 19:08:59 pacho Exp $
-
-EAPI="4"
-
-inherit emul-linux-x86
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/llvm-2.9-r2.tbz2
-	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libffi-3.0.9-r2.tbz2"
-
-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 MPL-1.1 OPENLDAP OpenSoftware openssl OracleDB ZLIB
-		tcp_wrappers_license as-is UoI-NCSA"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507
-
-QA_DT_HASH="usr/lib32/.*"
-
-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
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110722.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20120127.ebuild
index 657cf8c2b91c..7772b5ebf1d6 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20110722.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20120127.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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-20110722.ebuild,v 1.2 2011/08/24 09:42:12 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20120127.ebuild,v 1.1 2012/01/27 17:51:13 pacho Exp $
 
 EAPI="4"
 
@@ -9,8 +9,8 @@ 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 MPL-1.1 OPENLDAP OpenSoftware openssl OracleDB ZLIB
-		tcp_wrappers_license as-is UoI-NCSA"
-KEYWORDS="-* amd64"
+		tcp_wrappers_license as-is UoI-NCSA wxWinLL-3.1"
+KEYWORDS="-* ~amd64"
 
 DEPEND=""
 RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2" # bug 168507