Add a new version using USE=abi_x86_32 to compatibly support both the gx86-multilib users and emul-linux users.

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

3 files changed, 98 insertions, 50 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 8d2882c689c5..f69d9b858afb 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.121 2013/03/16 15:24:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.122 2013/07/30 19:00:31 mgorny Exp $
+
+*emul-linux-x86-xlibs-20130224-r2 (30 Jul 2013)
+
+  30 Jul 2013; Michał Górny <mgorny@gentoo.org>
+  +emul-linux-x86-xlibs-20130224-r2.ebuild,
+  -emul-linux-x86-xlibs-20130224-r1.ebuild:
+  Add a new version using USE=abi_x86_32 to compatibly support both the
+  gx86-multilib users and emul-linux users.
 
   16 Mar 2013; Pacho Ramos <pacho@gentoo.org>
   emul-linux-x86-xlibs-20130224.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r1.ebuild
deleted file mode 100644
index c6d2016c44ad..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r1.ebuild,v 1.1 2013/02/26 22:59:48 mgorny Exp $
-
-EAPI=5
-
-DESCRIPTION="Backwards compat for emul-linux-x86-xlibs using multilib"
-HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="development opengl"
-
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-	opengl? ( app-emulation/emul-linux-x86-opengl )
-
-	media-libs/fontconfig[abi_x86_32]
-	media-libs/freetype[abi_x86_32]
-	x11-libs/libICE[abi_x86_32]
-	x11-libs/libpciaccess[abi_x86_32]
-	x11-libs/libSM[abi_x86_32]
-	x11-libs/libvdpau[abi_x86_32]
-	x11-libs/libX11[abi_x86_32]
-	x11-libs/libXau[abi_x86_32]
-	x11-libs/libXaw[abi_x86_32]
-	x11-libs/libxcb[abi_x86_32]
-	x11-libs/libXcomposite[abi_x86_32]
-	x11-libs/libXcursor[abi_x86_32]
-	x11-libs/libXdamage[abi_x86_32]
-	x11-libs/libXdmcp[abi_x86_32]
-	x11-libs/libXext[abi_x86_32]
-	x11-libs/libXfixes[abi_x86_32]
-	x11-libs/libXft[abi_x86_32]
-	x11-libs/libXi[abi_x86_32]
-	x11-libs/libXinerama[abi_x86_32]
-	x11-libs/libXmu[abi_x86_32]
-	x11-libs/libXp[abi_x86_32]
-	x11-libs/libXpm[abi_x86_32]
-	x11-libs/libXrandr[abi_x86_32]
-	x11-libs/libXrender[abi_x86_32]
-	x11-libs/libXScrnSaver[abi_x86_32]
-	x11-libs/libXt[abi_x86_32]
-	x11-libs/libXtst[abi_x86_32]
-	x11-libs/libXv[abi_x86_32]
-	x11-libs/libXvMC[abi_x86_32]
-	x11-libs/libXxf86dga[abi_x86_32]
-	x11-libs/libXxf86vm[abi_x86_32]"
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r2.ebuild
new file mode 100644
index 000000000000..240adb71fef6
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r2.ebuild,v 1.1 2013/07/30 19:00:31 mgorny Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+LICENSE="FTL GPL-2 MIT"
+
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32 opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	x11-libs/libX11
+	opengl? ( app-emulation/emul-linux-x86-opengl )
+
+	!abi_x86_32? (
+		!media-libs/fontconfig[abi_x86_32(-)]
+		!media-libs/freetype[abi_x86_32(-)]
+		!x11-libs/libICE[abi_x86_32(-)]
+		!x11-libs/libpciaccess[abi_x86_32(-)]
+		!x11-libs/libSM[abi_x86_32(-)]
+		!x11-libs/libvdpau[abi_x86_32(-)]
+		!x11-libs/libX11[abi_x86_32(-)]
+		!x11-libs/libXau[abi_x86_32(-)]
+		!x11-libs/libXaw[abi_x86_32(-)]
+		!x11-libs/libxcb[abi_x86_32(-)]
+		!x11-libs/libXcomposite[abi_x86_32(-)]
+		!x11-libs/libXcursor[abi_x86_32(-)]
+		!x11-libs/libXdamage[abi_x86_32(-)]
+		!x11-libs/libXdmcp[abi_x86_32(-)]
+		!x11-libs/libXext[abi_x86_32(-)]
+		!x11-libs/libXfixes[abi_x86_32(-)]
+		!x11-libs/libXft[abi_x86_32(-)]
+		!x11-libs/libXi[abi_x86_32(-)]
+		!x11-libs/libXinerama[abi_x86_32(-)]
+		!x11-libs/libXmu[abi_x86_32(-)]
+		!x11-libs/libXp[abi_x86_32(-)]
+		!x11-libs/libXpm[abi_x86_32(-)]
+		!x11-libs/libXrandr[abi_x86_32(-)]
+		!x11-libs/libXrender[abi_x86_32(-)]
+		!x11-libs/libXScrnSaver[abi_x86_32(-)]
+		!x11-libs/libXt[abi_x86_32(-)]
+		!x11-libs/libXtst[abi_x86_32(-)]
+		!x11-libs/libXv[abi_x86_32(-)]
+		!x11-libs/libXvMC[abi_x86_32(-)]
+		!x11-libs/libXxf86dga[abi_x86_32(-)]
+		!x11-libs/libXxf86vm[abi_x86_32(-)] )
+	abi_x86_32? (
+		media-libs/fontconfig[abi_x86_32(-)]
+		media-libs/freetype[abi_x86_32(-)]
+		x11-libs/libICE[abi_x86_32(-)]
+		x11-libs/libpciaccess[abi_x86_32(-)]
+		x11-libs/libSM[abi_x86_32(-)]
+		x11-libs/libvdpau[abi_x86_32(-)]
+		x11-libs/libX11[abi_x86_32(-)]
+		x11-libs/libXau[abi_x86_32(-)]
+		x11-libs/libXaw[abi_x86_32(-)]
+		x11-libs/libxcb[abi_x86_32(-)]
+		x11-libs/libXcomposite[abi_x86_32(-)]
+		x11-libs/libXcursor[abi_x86_32(-)]
+		x11-libs/libXdamage[abi_x86_32(-)]
+		x11-libs/libXdmcp[abi_x86_32(-)]
+		x11-libs/libXext[abi_x86_32(-)]
+		x11-libs/libXfixes[abi_x86_32(-)]
+		x11-libs/libXft[abi_x86_32(-)]
+		x11-libs/libXi[abi_x86_32(-)]
+		x11-libs/libXinerama[abi_x86_32(-)]
+		x11-libs/libXmu[abi_x86_32(-)]
+		x11-libs/libXp[abi_x86_32(-)]
+		x11-libs/libXpm[abi_x86_32(-)]
+		x11-libs/libXrandr[abi_x86_32(-)]
+		x11-libs/libXrender[abi_x86_32(-)]
+		x11-libs/libXScrnSaver[abi_x86_32(-)]
+		x11-libs/libXt[abi_x86_32(-)]
+		x11-libs/libXtst[abi_x86_32(-)]
+		x11-libs/libXv[abi_x86_32(-)]
+		x11-libs/libXvMC[abi_x86_32(-)]
+		x11-libs/libXxf86dga[abi_x86_32(-)]
+		x11-libs/libXxf86vm[abi_x86_32(-)] )"
+
+src_prepare() {
+	use abi_x86_32 || emul-linux-x86_src_prepare
+}
+
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
+}