Switched to use doenvd.

Package-Manager: portage-2.0.51.19

12 files changed, 17 insertions, 182 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index caa2d5e723c9..cb581c6d2153 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.23 2005/04/18 09:48:32 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.24 2005/04/21 09:46:15 herbs Exp $
+
+  21 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  files/75emul-linux-x86-base, -emul-linux-x86-baselibs-1.0.ebuild,
+  -emul-linux-x86-baselibs-1.1-r3.ebuild,
+  -emul-linux-x86-baselibs-1.2.2-r1.ebuild,
+  -emul-linux-x86-baselibs-2.0.ebuild, emul-linux-x86-baselibs-2.1.ebuild:
+  Switched to using doenvd. Remove old versions.
 
 *emul-linux-x86-baselibs-2.1 (18 Apr 2005)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 6897199bfc04..06ad9f007dbb 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6ac0da3d4cc7464a88d80d946f2d6df9 emul-linux-x86-baselibs-2.0.ebuild 910
 MD5 92eed292bdb88bbd8f8838cd8a385b6a emul-linux-x86-baselibs-1.2.3.ebuild 917
 MD5 c921257abd0782a1d349b298fa04a905 emul-linux-x86-baselibs-1.2.2-r2.ebuild 1108
-MD5 aacf5d94a3aec76b73f2c6d6f75717f7 emul-linux-x86-baselibs-2.1.ebuild 857
-MD5 c4be6e9cc14a3234d6bc321ec4a6d523 emul-linux-x86-baselibs-1.1-r3.ebuild 2550
-MD5 abdbdad1b967be646c378b3a1c7807a7 emul-linux-x86-baselibs-1.2.2-r1.ebuild 767
-MD5 41d7ed06d012ad8c70dcfd6158632332 emul-linux-x86-baselibs-1.0.ebuild 910
-MD5 3aae32ba06d6c0fbc91762ab70b205c4 ChangeLog 3993
+MD5 6cb980a717e004d158d33ddb06df0422 emul-linux-x86-baselibs-2.1.ebuild 689
+MD5 74aa40ba2775f4ec843fc3ad06b030ee ChangeLog 4321
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 31f67d1cdf921a2f2b2f9c382b0aa8a6 files/digest-emul-linux-x86-baselibs-1.2.3 83
-MD5 da0bdfe31fa4eb39ad7e1a660f4844cf files/digest-emul-linux-x86-baselibs-1.2.2-r1 83
 MD5 da0bdfe31fa4eb39ad7e1a660f4844cf files/digest-emul-linux-x86-baselibs-1.2.2-r2 83
-MD5 00b9e83e4f6ea15a4c2d4a697bc81f35 files/75emul-linux-x86-base 72
-MD5 df2a8724b2eeacedbc58d864f7a73e73 files/digest-emul-linux-x86-baselibs-1.0 82
-MD5 d92f7d1e0e99f1df66bb536dbca3f934 files/digest-emul-linux-x86-baselibs-2.0 81
+MD5 3ac141b3a5850345c246b5c4ce924ccc files/75emul-linux-x86-base 51
 MD5 e2d7a44fb61bff476666cd877b51ccdf files/digest-emul-linux-x86-baselibs-2.1 81
-MD5 006db482d561512d1449fe5ba11f152e files/digest-emul-linux-x86-baselibs-1.1-r3 82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCY4KJ2G5bA0cA/ScRAvQ5AJ9HQEut8gUlrdvNEra8oSGzDkE81gCfW3Az
-ZKoyH8wrOSbb1JpDhiciNfk=
-=uM/0
+iD8DBQFCZ3Z72G5bA0cA/ScRAtXfAKC9DUh/8cI7VViF03B68NqvcM98mwCggABI
+0AlByLrvP7wwhm5mcyYg+7g=
+=kYnp
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.0.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.0.ebuild
deleted file mode 100644
index 6e6bef9658ac..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.0.ebuild
+++ /dev/null
@@ -1,27 +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-baselibs/emul-linux-x86-baselibs-1.0.ebuild,v 1.11 2005/01/01 14:10:07 eradicator Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64/ia64"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/distfiles/emul-linux-x86-baselibs-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-		!app-emulation/emul-linux-x86-glibc"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir /emul/linux/x86/lib /emul/linux/x86/usr/lib
-	dodir /lib /usr /etc/env.d
-	cp -Rpvf ${WORKDIR}/* ${D}/emul/linux/x86/
-	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
-	cp ${FILESDIR}/75emul-linux-x86-base ${D}/etc/env.d
-}
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
deleted file mode 100644
index a1b4c56e7c7f..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild
+++ /dev/null
@@ -1,67 +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-baselibs/emul-linux-x86-baselibs-1.1-r3.ebuild,v 1.6 2005/01/01 14:10:07 eradicator 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"
-# Compiled with CFLAGS="-march=athlon-xp -msse2", won't work on ia64 or intel's em64t
-KEYWORDS="-* amd64"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	!app-emulation/emul-linux-x86-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/emul-linux-x86-baselibs-1.2.2-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r1.ebuild
deleted file mode 100644
index de2dfb2468bb..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +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-baselibs/emul-linux-x86-baselibs-1.2.2-r1.ebuild,v 1.2 2005/01/01 14:10:07 eradicator Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-baselibs-${PV}.tar.bz2"
-HOMEPAGE=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* amd64"
-IUSE=""
-
-# stop confusing portage 0.o
-S=${WORKDIR}
-
-DEPEND="virtual/libc
-	>=sys-apps/sed-4
-	app-emulation/emul-linux-x86-glibc
-	app-emulation/emul-linux-x86-compat"
-
-src_install() {
-	cd ${WORKDIR}
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	# oops. fix bug 65276
-	cd ${D}/emul/linux/x86/lib/
-	ln -s libz.so.? libz.so
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.0.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.0.ebuild
deleted file mode 100644
index b746c164fce2..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.0.ebuild
+++ /dev/null
@@ -1,31 +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-baselibs/emul-linux-x86-baselibs-2.0.ebuild,v 1.1 2005/04/15 21:04:52 blubb Exp $
-
-DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
-SRC_URI="http://fermat.ma.rhul.ac.uk/~herbie/emul/emul-linux-x86-baselibs-${PV}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-# stop confusing portage 0.o
-S=${WORKDIR}
-
-DEPEND="virtual/libc
-	app-emulation/emul-linux-x86-glibc
-	app-emulation/emul-linux-x86-compat"
-
-src_install() {
-	cd ${WORKDIR}
-	cp -RPvf ${WORKDIR}/* ${D}/
-
-	# create env.d entry
-	mkdir -p ${D}/etc/env.d
-	cat > ${D}/etc/env.d/75emul-linux-x86-base <<ENDOFENV
-LDPATH=/emul/linux/x86/lib:/emul/linux/x86/usr/lib
-ENDOFENV
-	chmod 644 ${D}/etc/env.d/75emul-linux-x86-base
-}
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.ebuild
index 638989538fce..aba8fbafca76 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.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-baselibs/emul-linux-x86-baselibs-2.1.ebuild,v 1.1 2005/04/18 09:48:32 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.1.ebuild,v 1.2 2005/04/21 09:46:15 herbs Exp $
 
 DESCRIPTION="Base libraries for emulation of 32bit x86 on amd64"
 SRC_URI="mirror://gentoo/emul-linux-x86-baselibs-${PV}.tar.bz2"
@@ -21,10 +21,5 @@ src_install() {
 	cd ${WORKDIR}
 	cp -RPvf ${WORKDIR}/* ${D}/
 
-	# create env.d entry
-	mkdir -p ${D}/etc/env.d
-	cat > ${D}/etc/env.d/75emul-linux-x86-base <<ENDOFENV
-LDPATH=/emul/linux/x86/lib:/emul/linux/x86/usr/lib
-ENDOFENV
-	chmod 644 ${D}/etc/env.d/75emul-linux-x86-base
+	doenvd ${FILESDIR}/75emul-linux-x86-base
 }
diff --git a/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base b/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base
index d967adb4df43..bbc2111244f9 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base
+++ b/app-emulation/emul-linux-x86-baselibs/files/75emul-linux-x86-base
@@ -1,2 +1 @@
-LDPATH="/lib32:/usr/lib32:/usr/lib32/gcc-lib/i386-pc-linux-gnu/3.2.3/"
-
+LDPATH=/emul/linux/x86/lib:/emul/linux/x86/usr/lib
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.0 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.0
deleted file mode 100644
index 88930f2640a7..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4f81f1bcb0e678ed417bf560690a3030 emul-linux-x86-baselibs-1.0.tar.bz2 23036004
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
deleted file mode 100644
index 31e5cc068051..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.1-r3
+++ /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.2.2-r1 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.2.2-r1
deleted file mode 100644
index 6bc3ab7fac27..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-1.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 26e0f9d649b58dddf6acb1c4aacd62f1 emul-linux-x86-baselibs-1.2.2.tar.bz2 3727682
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.0 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.0
deleted file mode 100644
index 92bf60c956d4..000000000000
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07b69bbb894bf33d4559c2f3b20595b2 emul-linux-x86-baselibs-2.0.tar.bz2 7783373