Fixed BUG #51034. Missing /usr/lib32.

5 files changed, 5 insertions, 56 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 739a16479a0b..bd5d76f13f79 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,9 +1,7 @@
 MD5 2294eeb179da7dfb985a87f4285427ef ChangeLog 1382
 MD5 23a4cedea955d22fd89ecd5fd73086af emul-linux-x86-baselibs-1.0.ebuild 984
 MD5 a7a332e2b05d0668320a3c274384100b metadata.xml 220
-MD5 5a6f8865e339320acec47c35a9fbd1e2 emul-linux-x86-baselibs-1.1.ebuild 1682
-MD5 c658663641a32523657dbaa9677187cd emul-linux-x86-baselibs-1.1-r1.ebuild 1725
+MD5 fb2d8679ca1883aba56925d001129bff emul-linux-x86-baselibs-1.1-r2.ebuild 1746
 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 82
-MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r1 82
+MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r2 82
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r2.ebuild
index 48209cfc0fee..51b9d54fbf85 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r1.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r2.ebuild
@@ -1,8 +1,7 @@
 # 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-baselibs/emul-linux-x86-baselibs-1.1-r1.ebuild,v 1.1 2004/05/03 12:31:00 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r2.ebuild,v 1.1 2004/05/15 09:29:49 kugelfang Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-baselibs-1.1.tar.bz2"
 HOMEPAGE=""
@@ -37,6 +36,8 @@ src_install() {
 
 	# 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/
 	rm -Rf ${WORKDIR}/etc
 	cp -RPvf ${WORKDIR}/* ${D}/emul/linux/x86/
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1.ebuild
deleted file mode 100644
index 514473d48726..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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-baselibs/emul-linux-x86-baselibs-1.1.ebuild,v 1.3 2004/04/15 01:54:02 kugelfang Exp $
-
-S=${WORKDIR}/${P}
-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"
-
-DEPEND="virtual/glibc"
-
-src_unpack () {
-	unpack ${A}
-}
-
-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
-	mv ${WORKDIR}/etc/env.d/75emul-linux-x86-baselibs ${D}/etc/env.d/
-	rm -Rf ${WORKDIR}/etc
-	cp -RPvf ${WORKDIR}/* ${D}/emul/linux/x86/
-
-	# Fixes BUG #47817
-	cd ${D}/emul/linux/x86/usr/lib
-	sed -e "s/\/lib\//\/lib32\//g" libc.so > libc.so.new
-	mv libc.so.new libc.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-r1 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r1
deleted file mode 100644
index 31e5cc068051..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 01dcb10f7618e8676e9d0afea2d60e62 emul-linux-x86-baselibs-1.1.tar.bz2 24771818
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r2
index 31e5cc068051..31e5cc068051 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1
+++ b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r2