Don't put stuff in the X11R6 directories. Closes bug #80740.

(Portage version: 2.0.51-r15)

4 files changed, 67 insertions, 18 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 42dbeaf14120..b33077fdaefb 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.17 2005/01/18 03:03:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.18 2005/02/05 09:09:43 eradicator Exp $
+
+*emul-linux-x86-xlibs-1.2-r4 (05 Feb 2005)
+
+  05 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +emul-linux-x86-xlibs-1.2-r4.ebuild:
+  Don't put stuff in the X11R6 directories.  Closes bug #80740.
 
 *emul-linux-x86-xlibs-1.2-r3 (17 Jan 2005)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 3b4cec36ff0c..e2c147163f1d 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,29 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 446d09f6e319ec7383b75162f8226b82 ChangeLog 2711
 MD5 aebe8c4f7a9976e86923c346287b0f60 emul-linux-x86-xlibs-1.0.ebuild 794
-MD5 d886d465972f57a9aebe34be2ae4a597 emul-linux-x86-xlibs-1.1.ebuild 1554
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 84793ce2a2c8e0d1fca353f31a5e9679 emul-linux-x86-xlibs-1.1-r1.ebuild 1585
-MD5 157995239867d0e41b12c8137ed1dd4f emul-linux-x86-xlibs-1.2.ebuild 708
-MD5 9db9c8d8d703ee9ef3baf1e3b6a88c12 emul-linux-x86-xlibs-1.2-r2.ebuild 1624
+MD5 d886d465972f57a9aebe34be2ae4a597 emul-linux-x86-xlibs-1.1.ebuild 1554
 MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
-MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
+MD5 9db9c8d8d703ee9ef3baf1e3b6a88c12 emul-linux-x86-xlibs-1.2-r2.ebuild 1624
+MD5 157995239867d0e41b12c8137ed1dd4f emul-linux-x86-xlibs-1.2.ebuild 708
+MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
+MD5 1e5e034395b399b840f9d23437ee08dc emul-linux-x86-xlibs-1.2-r4.ebuild 1361
 MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
+MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
+MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 MD5 97c2c7b018d1e1d526ab438517a9ad07 files/digest-emul-linux-x86-xlibs-1.0 79
 MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1 79
 MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1-r1 79
-MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
-MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2 78
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB7HyQArHZZzCEUG0RAgQQAJ4vkqt/g0JKckFSvvwmAldrQC876QCeMSAD
-R2ZzDksv6KlTh+UaRdkJUQo=
-=v9ic
------END PGP SIGNATURE-----
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r4 78
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
new file mode 100644
index 000000000000..cab1635c8c9f
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r4.ebuild
@@ -0,0 +1,51 @@
+# 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/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
new file mode 100644
index 000000000000..f9927af394de
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r4
@@ -0,0 +1 @@
+MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900