Version bump to fix BUG #55247.

4 files changed, 76 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 453ea21daf4e..c019a7678674 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.8 2004/06/24 22:31:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.9 2004/06/28 22:33:50 kugelfang Exp $
+
+*emul-linux-x86-baselibs-1.1-r3 (29 Jun 2004)
+
+  29 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +emul-linux-x86-baselibs-1.1-r3.ebuild:
+  Version bump to fix BUG #55247. ALL ld scripts need to be changed to point
+  towards lib32 instead lib.
 
 *emul-linux-x86-baselibs-1.1-r1 (03 May 2004)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 2af292ad024c..bab6e98bbf82 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4bd90d29684c1e3d68d0b0f5e7441ac4 ChangeLog 1372
+MD5 2520390b0f1386e62f8a4a9e59e24721 ChangeLog 1621
 MD5 e282e08cbc5a9e54e41d957990f64b74 emul-linux-x86-baselibs-1.0.ebuild 867
+MD5 0ee5bf5260b267b461733929789eaab3 emul-linux-x86-baselibs-1.1-r3.ebuild 2407
 MD5 a7a332e2b05d0668320a3c274384100b metadata.xml 220
 MD5 05f39c7a02a3572ff8622f440ed370ca emul-linux-x86-baselibs-1.1-r2.ebuild 1782
 MD5 00b9e83e4f6ea15a4c2d4a697bc81f35 files/75emul-linux-x86-base 72
 MD5 df2a8724b2eeacedbc58d864f7a73e73 files/digest-emul-linux-x86-baselibs-1.0 82
 MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r2 82
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA31IlHTu7gpaalycRAuATAJ9g5Qsz3/XhHUrNYU9SAIDp16u1kACg3Eeb
-VcvIVHFs0peMVi4xyfjvljA=
-=keqj
------END PGP SIGNATURE-----
+MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r3 82
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild
new file mode 100644
index 000000000000..1d8d26d4afc3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild,v 1.1 2004/06/28 22:33:50 kugelfang Exp $
+
+DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
+SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-baselibs-1.1.tar.bz2"
+HOMEPAGE=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="virtual/glibc"
+
+src_install() {
+	cd ${WORKDIR}
+	mkdir -p ${D}/emul/linux/x86
+	mkdir -p ${D}/emul/linux/x86/lib/dev-state
+	mkdir -p ${D}/emul/linux/x86/lib/security/pam_filter
+	mkdir -p ${D}/emul/linux/x86/lib/rcscripts/sh
+	mkdir -p ${D}/emul/linux/x86/lib/rcscripts/awk
+	mkdir -p ${D}/emul/linux/x86/usr/lib/misc
+	mkdir -p ${D}/emul/linux/x86/usr/lib/awk
+	mkdir -p ${D}/emul/linux/x86/usr/lib/gcc-config
+	mkdir -p ${D}/emul/linux/x86/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.2
+	mkdir -p ${D}/emul/linux/x86/usr/lib/gettext
+	mkdir -p ${D}/emul/linux/x86/usr/lib/gconv
+	mkdir -p ${D}/emul/linux/x86/usr/lib/nsbrowser/plugins
+	mkdir -p ${D}/emul/linux/x86/usr/lib/glib/include
+	mkdir -p ${D}/emul/linux/x86/usr/lib/pkgconfig
+	mkdir -p ${D}/etc/env.d
+
+	# Fixes BUG #49678
+	mkdir -p ${D}/lib
+	# Fixes BUG #51034
+	mkdir -p ${D}/usr
+	mv ${WORKDIR}/etc/env.d/75emul-linux-x86-baselibs ${D}/etc/env.d/
+	chmod 644 ${D}/etc/env.d/75emul-linux-x86-baselibs
+	rm -Rf ${WORKDIR}/etc
+	cp -RPvf ${WORKDIR}/* ${D}/emul/linux/x86/
+
+	# Fixes BUG #47817 && BUG #55247
+	cd ${D}/emul/linux/x86/usr/lib
+	sed -i -e "s/\/lib\//\/lib32\//g" libc.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpthread.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libcom_err.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libe2p.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libext2fs.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libhistory.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libncurses.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libblkid.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpam.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpam_misc.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpamc.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libpwdb.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libreadline.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libss.so
+	sed -i -e "s/\/lib\//\/lib32\//g" libuuid.so
+
+	ln -sf /emul/linux/x86/lib/ld-linux.so.2 ${D}/lib/ld-linux.so.2
+	ln -sf /emul/linux/x86/lib ${D}/lib32
+	ln -sf /emul/linux/x86/usr/lib ${D}/usr/lib32
+}
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r3 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r3
new file mode 100644
index 000000000000..31e5cc068051
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r3
@@ -0,0 +1 @@
+MD5 01dcb10f7618e8676e9d0afea2d60e62 emul-linux-x86-baselibs-1.1.tar.bz2 24771818