Cleaned out old ebuilds, tidied up the symlink logic and bumped.

Package-Manager: portage-2.0.51-r15

18 files changed, 23 insertions, 311 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index bc390a2c5924..68c1751691ff 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.20 2005/02/07 22:55:22 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.21 2005/02/08 03:27:36 cryos Exp $
+
+*emul-linux-x86-xlibs-1.2-r6 (08 Feb 2005)
+
+  08 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  -emul-linux-x86-xlibs-1.0.ebuild, -emul-linux-x86-xlibs-1.1-r1.ebuild,
+  -emul-linux-x86-xlibs-1.1.ebuild, -emul-linux-x86-xlibs-1.2-r1.ebuild,
+  -emul-linux-x86-xlibs-1.2-r2.ebuild, -emul-linux-x86-xlibs-1.2-r4.ebuild,
+  -emul-linux-x86-xlibs-1.2-r5.ebuild, +emul-linux-x86-xlibs-1.2-r6.ebuild,
+  -emul-linux-x86-xlibs-1.2.ebuild:
+  Cleaned out old ebuilds, tidied up the symlink logic and bumped.
 
   07 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
   emul-linux-x86-xlibs-1.2-r5.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 322e41cce376..f6ae782c9392 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,33 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9db9c8d8d703ee9ef3baf1e3b6a88c12 emul-linux-x86-xlibs-1.2-r2.ebuild 1624
-MD5 c5f1365415b5c838e97626f22f559957 emul-linux-x86-xlibs-1.2-r4.ebuild 1494
-MD5 aebe8c4f7a9976e86923c346287b0f60 emul-linux-x86-xlibs-1.0.ebuild 794
-MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
-MD5 157995239867d0e41b12c8137ed1dd4f emul-linux-x86-xlibs-1.2.ebuild 708
+MD5 7a301b02741108a2bb244280d87ae114 emul-linux-x86-xlibs-1.2-r6.ebuild 1782
 MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 84793ce2a2c8e0d1fca353f31a5e9679 emul-linux-x86-xlibs-1.1-r1.ebuild 1585
-MD5 dff8600c43d41e31d98f088380fcf6d0 emul-linux-x86-xlibs-1.2-r5.ebuild 1666
-MD5 84d5ead4568b0d2af61d509ef4f387cb ChangeLog 3344
-MD5 d886d465972f57a9aebe34be2ae4a597 emul-linux-x86-xlibs-1.1.ebuild 1554
+MD5 59ce3e58fe3344623530c35ef084d89b ChangeLog 3842
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
-MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1-r1 79
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r1 78
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r2 78
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r3 78
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r4 78
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r5 78
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r6 78
 MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
-MD5 97c2c7b018d1e1d526ab438517a9ad07 files/digest-emul-linux-x86-xlibs-1.0 79
-MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1 79
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2 78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCB/HgntT9W3vfTuoRAsHiAJoCA5ZBpCSBbtDlJhY2yk2X5JB3mwCfc/Tu
-4x63FFmVJAtpVlGVRyCm5UI=
-=LdsL
+iD8DBQFCCDGwntT9W3vfTuoRAsbRAJ9llsjoPso5cBF8zxjKIjYzl3A1FwCff3xY
+uNVru4sgMKijbF7rYF1MTo4=
+=gUCF
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.0.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.0.ebuild
deleted file mode 100644
index a80dc2dabcf7..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 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-1.0.ebuild,v 1.9 2005/01/01 14:12:01 eradicator Exp $
-
-DESCRIPTION="Xfree86 for emulation of 32bit x86 on amd64/ia64"
-SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-xlibs-1.0.tar.bz2"
-HOMEPAGE=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND=">=app-emulation/emul-linux-x86-baselibs-1.0"
-
-src_install() {
-	cd ${WORKDIR}
-	mkdir -p ${D}/emul/linux/x86
-	mkdir -p ${D}/emul/linux/x86/lib
-	mkdir -p ${D}/emul/linux/x86/usr/lib
-	mkdir -p ${D}/lib
-	mkdir -p ${D}/usr
-	mkdir -p ${D}/etc/env.d
-	cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86
-	cp ${FILESDIR}/75emul-linux-x86-x ${D}/etc/env.d
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1-r1.ebuild
deleted file mode 100644
index 4b2468bc0098..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 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-1.1-r1.ebuild,v 1.3 2005/01/01 14:12:01 eradicator Exp $
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-xlibs-1.1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/emul/linux/x86
-	mkdir -p ${D}/emul/linux/x86/usr/lib/opengl
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/X11/locale
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/dri
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/fonts
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/codeconv
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/extensions
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/drivers
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/input
-	mkdir -p ${D}/etc/env.d
-
-	# ARGH, forgot to include env.d file, workaround till next version
-	# DONT define opengl stuff here anymore, opengl-update is handling this.
-	echo "LDPATH=/emul/linux/x86/usr/X11R6/lib" > ${D}/etc/env.d/75emul-linux-x86-xlibs
-	#mv -v ${WORKDIR}/etc/env.d/75emul-linux-x86-xlibs ${D}/etc/env.d/
-	#rm -Rf ${WORKDIR}/etc
-
-	# ARGH2, libxrx.so[.6] must be symlinks !
-	cd ${WORKDIR}/usr/X11R6/lib
-	rm -f libxrx.so
-	rm -f libxrx.so.6
-	ln -sf libxrx.so.6.3 libxrx.so
-	ln -sf libxrx.so.6.3 libxrx.so.6
-
-	cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild
deleted file mode 100644
index 5ec56dd5f8c6..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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-1.1.ebuild,v 1.10 2005/01/01 14:12:01 eradicator Exp $
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-xlibs-1.1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/emul/linux/x86
-	mkdir -p ${D}/emul/linux/x86/usr/lib/opengl
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/X11/locale
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/dri
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/fonts
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/codeconv
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/extensions
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/drivers
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib/modules/input
-	mkdir -p ${D}/etc/env.d
-
-	# ARGH, forgot to include env.d file, workaround till next version
-	echo "LDPATH=/emul/linux/x86/usr/X11R6/lib:/emul/linux/x86/usr/lib/opengl/xorg-x11/lib" > ${D}/etc/env.d/75emul-linux-x86-xlibs
-	#mv -v ${WORKDIR}/etc/env.d/75emul-linux-x86-xlibs ${D}/etc/env.d/
-	#rm -Rf ${WORKDIR}/etc
-
-	# ARGH2, libxrx.so[.6] must be symlinks !
-	cd ${WORKDIR}/usr/X11R6/lib
-	rm -f libxrx.so
-	rm -f libxrx.so.6
-	ln -sf libxrx.so.6.3 libxrx.so
-	ln -sf libxrx.so.6.3 libxrx.so.6
-
-	cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
deleted file mode 100644
index 0668593a151a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 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-1.2-r1.ebuild,v 1.4 2005/01/01 14:12:01 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=app-emulation/emul-linux-x86-baselibs-1.2.2"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
-	cp -Rpvf ${WORKDIR}/* ${D}/
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C
-	cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
-	cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
-}
-
-pkg_postinst() {
-	# do not replace any of the following with $(get_libdir)
-	if [ ! -e /usr/X11R6/lib/X11/locale/lib ] ; then
-		ln -s /emul/linux/x86/usr/X11R6/lib/X11/locale/lib /usr/X11R6/lib/X11/locale/lib
-	elif [ ! -h /usr/X11R6/lib/X11/locale/lib ] ; then
-		echo
-		ewarn "/usr/X11R6/lib/X11/locale/lib isnt a symlink, some apps will"
-		ewarn "refuse to work (adobe acrobat, staroffice, etc). Right now the"
-		ewarn "fix is to install at least xorg 6.7.99.903, which has been made"
-		ewarn "lib64 aware, and then reinstall emul-linux-x86-xlibs."
-		echo
-		epause 10
-	fi
-}
-
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild
deleted file mode 100644
index 8c51abef8e9f..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 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-1.2-r2.ebuild,v 1.1 2005/01/18 01:37:37 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=app-emulation/emul-linux-x86-baselibs-1.2.2-r2"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=/emul/linux/x86/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
-	cp -Rpvf ${WORKDIR}/* ${D}/
-
-	# We don't use this symlink any more
-	rm ${D}/usr/X11R6/lib32
-
-	mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C
-	cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
-	cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
-
-	chown -R root:root ${D}
-}
-
-pkg_postinst() {
-	# do not replace any of the following with $(get_libdir)
-	if [ ! -e /usr/X11R6/lib/X11/locale/lib ] ; then
-		ln -s /emul/linux/x86/usr/X11R6/lib/X11/locale/lib /usr/X11R6/lib/X11/locale/lib
-	elif [ ! -h /usr/X11R6/lib/X11/locale/lib ] ; then
-		echo
-		ewarn "/usr/X11R6/lib/X11/locale/lib isnt a symlink, some apps will"
-		ewarn "refuse to work (adobe acrobat, staroffice, etc). Right now the"
-		ewarn "fix is to install at least xorg 6.7.99.903, which has been made"
-		ewarn "lib64 aware, and then reinstall emul-linux-x86-xlibs."
-		echo
-		epause 10
-	fi
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r4.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r4.ebuild
deleted file mode 100644
index cab1635c8c9f..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 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-1.2-r4.ebuild,v 1.1 2005/02/05 09:09:43 eradicator Exp $
-
-inherit multilib
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-RDEPEND="virtual/libc
-	 >=x11-base/xorg-x11-6.8.0-r4
-	 >=app-emulation/emul-linux-x86-baselibs-1.2.2-r2"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/etc/env.d/
-	cp -Rpvf ${WORKDIR}/* ${D}/
-
-	local libdir="lib32"
-	if has_multilib_profile; then
-		libdir=$(get_abi_LIBDIR x86)
-	fi
-	dodir /usr/${libdir}/opengl
-	dosym /emul/linux/x86/usr/lib/opengl/xorg-x11 /usr/${libdir}/opengl/xorg-x11
-
-	dodir /emul/linux/x86/usr/lib/X11/locale/C
-	cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/lib/X11/locale/C/
-	cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/lib/X11/locale/C/
-
-	mv ${D}/emul/linux/x86/usr/X11R6/lib/* ${D}/emul/linux/x86/usr/lib/
-
-	# We don't use this any more
-	rm -rf ${D}/usr/X11R6
-	rm -rf ${D}/emul/linux/x86/usr/X11R6
-	rm -f ${D}/emul/linux/x86/usr/lib/X11
-
-	dosed "s:^libdir=.*$:libdir=\'/emul/linux/x86/usr/lib\':" /emul/linux/x86/usr/lib/libGLU.la
-
-	chown -R root:root ${D}
-}
-
-pkg_postinst() {
-	ln -s /emul/linux/x86/usr/lib/X11/locale/lib /usr/$(get_libdir)/X11/locale/lib
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r5.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r6.ebuild
index 9e9e263b8c9c..a41fb96a23c8 100644
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r5.ebuild
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-1.2-r5.ebuild,v 1.2 2005/02/07 22:55:22 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r6.ebuild,v 1.1 2005/02/08 03:27:36 cryos Exp $
 
 inherit multilib
 
@@ -49,9 +49,12 @@ src_install() {
 pkg_postinst() {
 	if [ -h /usr/$(get_libdir)/X11/locale/lib ]; then
 		rm -f /usr/$(get_libdir)/X11/locale/lib
-		ln -s /emul/linux/x86/usr/lib/X11/locale/lib \
-			/usr/$(get_libdir)/X11/locale/lib
 	else
 		ewarn "Error /usr/$(get_libdir)/X11/locale/lib is not a symlink."
+		ewarn "This may cause some 32 bit applications to fail."
+	fi
+	if [ ! -e /usr/$(get_libdir)/X11/locale/lib ]; then
+		ln -s /emul/linux/x86/usr/lib/X11/locale/lib \
+			/usr/$(get_libdir)/X11/locale/lib
 	fi
 }
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild
deleted file mode 100644
index 6087a267a6ff..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 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-1.2.ebuild,v 1.4 2005/01/01 14:12:01 eradicator Exp $
-
-DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=app-emulation/emul-linux-x86-baselibs-1.2.2"
-
-S=${WORKDIR}
-
-src_install() {
-	mkdir -p ${D}/etc/env.d/
-	echo "LDPATH=/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
-	cp -Rpvf ${WORKDIR}/* ${D}/
-}
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.0 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.0
deleted file mode 100644
index 12f565eaa4cb..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb1a830a72ac4115ba9796c686be24be emul-linux-x86-xlibs-1.0.tar.bz2 14819589
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1
deleted file mode 100644
index fd381f94574a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ac65c58eccbbc6a042c62cc1c3b55b emul-linux-x86-xlibs-1.1.tar.bz2 13901992
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1-r1
deleted file mode 100644
index fd381f94574a..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ac65c58eccbbc6a042c62cc1c3b55b emul-linux-x86-xlibs-1.1.tar.bz2 13901992
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1
deleted file mode 100644
index f9927af394de..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
deleted file mode 100644
index f9927af394de..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r4 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r4
deleted file mode 100644
index f9927af394de..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r5 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r5
deleted file mode 100644
index f9927af394de..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r6
index f9927af394de..f9927af394de 100644
--- a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r6