Index: emul-linux-x86-xlibs-20130224-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224-r1.ebuild,v
retrieving revision 1.1
diff -u -B -r1.1 emul-linux-x86-xlibs-20130224-r1.ebuild
--- emul-linux-x86-xlibs-20130224-r1.ebuild	26 Feb 2013 22:59:48 -0000	1.1
+++ emul-linux-x86-xlibs-20130224-r1.ebuild	13 Mar 2013 20:57:02 -0000
@@ -3,47 +3,91 @@
 # $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
+inherit emul-linux-x86
 
-DESCRIPTION="Backwards compat for emul-linux-x86-xlibs using multilib"
-HOMEPAGE="http://dev.gentoo.org/~pacho/emul.html"
-SRC_URI=""
+# Note: hidden hackery.
+# with abi_x86_32, it is a meta-package pulling in multilib deps,
+# without it, it is a regular emul-linux package installing the libs.
+
+LICENSE="abi_x86_32? ( metapackage )
+	!abi_x86_32? ( FTL GPL-2 MIT )"
 
-LICENSE="metapackage"
-SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="development opengl"
+IUSE="abi_x86_32 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]"
+	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? (
+		x11-libs/libX11
+		!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_unpack() {
+	use abi_x86_32 || default
+}
+
+src_install() {
+	use abi_x86_32 || emul-linux-x86_src_install
+}