Fixing BUG #47773 (missing /etc/env.d/75emul-linux-x86-xlibs)

3 files changed, 13 insertions, 7 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 4e85ccbd62cd..ebcff4c249da 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-xlibs
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.5 2004/04/14 05:50:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.6 2004/04/14 11:47:28 kugelfang Exp $
+
+  14 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild:
+  Ebuild now adds /etc/env.d/75emul-linux-x86-xlibs "on the fly", I forgot to
+  include that into the tarball. Fixes BUG #47773.
 
   14 Apr 2004; Travis Tilley <lv@gentoo.org> emul-linux-x86-xlibs-1.1.ebuild:
   it seems xlibs 1.1 is broken for some people, so i'm going to mask it for now
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index e6fea2091236..8670efa1069b 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,7 +1,7 @@
-MD5 0c30d229421241007dd6e1887eceb791 ChangeLog 1026
+MD5 7200e2afe1098cfd9583a06ab83f6dfc ChangeLog 1248
 MD5 67e4545757684af50678aabf1f108d25 emul-linux-x86-xlibs-1.0.ebuild 842
 MD5 a7a332e2b05d0668320a3c274384100b metadata.xml 220
-MD5 b9a59d8d6f81036ab3966854aac0e5ab emul-linux-x86-xlibs-1.1.ebuild 1172
+MD5 cc0b5ec517e219c74206390f21dc8f01 emul-linux-x86-xlibs-1.1.ebuild 1385
 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
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
index 6851053d2007..6b42482b5ebd 100644
--- 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
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.2 2004/04/14 05:50:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.1.ebuild,v 1.3 2004/04/14 11:47:28 kugelfang Exp $
 
 DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-xlibs-1.1.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE=""
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-*"
+KEYWORDS="~amd64"
 
 DEPEND="virtual/glibc"
 
@@ -28,7 +28,9 @@ src_install() {
 	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
-	mv ${WORKDIR}/etc/env.d/75emul-linux-x86-xlibs ${D}/etc/env.d/
-	rm -Rf ${WORKDIR}/etc
+	# 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
 	cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86
 }