version bump

(Portage version: 2.0.51.19)

8 files changed, 98 insertions, 46 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index 3b8181c5c75b..8f49e5d02c7f 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2005/03/21 07:26:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.22 2005/04/15 21:04:52 blubb Exp $
+
+*emul-linux-x86-baselibs-2.0 (15 Apr 2005)
+
+  15 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  +emul-linux-x86-baselibs-2.0.ebuild:
+  new version provided by Herbie Hopkins
 
 *emul-linux-x86-baselibs-1.2.3 (21 Mar 2005)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index 54683dca9ec8..b7e9712ca02d 100644
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -1,23 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7cc134e97e70080897764608255fe28b ChangeLog 3595
-MD5 41d7ed06d012ad8c70dcfd6158632332 emul-linux-x86-baselibs-1.0.ebuild 910
-MD5 c4be6e9cc14a3234d6bc321ec4a6d523 emul-linux-x86-baselibs-1.1-r3.ebuild 2550
-MD5 abdbdad1b967be646c378b3a1c7807a7 emul-linux-x86-baselibs-1.2.2-r1.ebuild 767
-MD5 c921257abd0782a1d349b298fa04a905 emul-linux-x86-baselibs-1.2.2-r2.ebuild 1108
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 92eed292bdb88bbd8f8838cd8a385b6a emul-linux-x86-baselibs-1.2.3.ebuild 917
-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-r3 82
-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 31f67d1cdf921a2f2b2f9c382b0aa8a6 files/digest-emul-linux-x86-baselibs-1.2.3 83
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCPndJArHZZzCEUG0RAmZ4AJ9trhnxISY5b41gTNECVoaYhg0WuwCfb05D
-+203B5EgyLdVrT8E40nW8gs=
-=+OEz
------END PGP SIGNATURE-----
+MD5 19ab94245992216ed9ba0235cd346b54 emul-linux-x86-baselibs-2.0.ebuild 773
+MD5 d92f7d1e0e99f1df66bb536dbca3f934 files/digest-emul-linux-x86-baselibs-2.0 81
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
new file mode 100644
index 000000000000..b746c164fce2
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-2.0.ebuild
@@ -0,0 +1,31 @@
+# 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/files/digest-emul-linux-x86-baselibs-2.0 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.0
new file mode 100644
index 000000000000..92bf60c956d4
--- /dev/null
+++ b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-2.0
@@ -0,0 +1 @@
+MD5 07b69bbb894bf33d4559c2f3b20595b2 emul-linux-x86-baselibs-2.0.tar.bz2 7783373
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index a4c836699862..195927aa16b0 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.26 2005/03/10 19:01:02 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.27 2005/04/15 21:06:02 blubb Exp $
+
+*emul-linux-x86-xlibs-2.0 (15 Apr 2005)
+
+  15 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  +emul-linux-x86-xlibs-2.0.ebuild:
+  added new version provided by Herbie Hopkins
 
   10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
   emul-linux-x86-xlibs-1.2-r7.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 5369620425fd..7c1355c70aa4 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,21 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1bc94040ae985ed43cf336d4e8a854b6 emul-linux-x86-xlibs-1.2-r7.ebuild 2356
-MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
-MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 d30bd05ace36590f12eb06fb902758bc ChangeLog 4732
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r3 78
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r6 78
-MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r7 78
-MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
-MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCMJl/ntT9W3vfTuoRAowYAJ4n7UqLj3JVTeP08j0WOURmBz4HXACdHHaA
-rL0ASCaeoj7sHk1lo1tHx18=
-=zR98
------END PGP SIGNATURE-----
+MD5 d1859fa71df97ff81e76ba980056171c emul-linux-x86-xlibs-2.0.ebuild 1033
+MD5 5a043dcc10263dc1938ac29c5de9f3dd files/digest-emul-linux-x86-xlibs-2.0 78
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.0.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.0.ebuild
new file mode 100644
index 000000000000..767c742e45fd
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.0.ebuild
@@ -0,0 +1,47 @@
+# 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-2.0.ebuild,v 1.1 2005/04/15 21:06:02 blubb Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://fermat.ma.rhul.ac.uk/~herbie/emul/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+RDEPEND="virtual/libc
+	 >=x11-base/xorg-x11-6.8.0-r4
+	 >=app-emulation/emul-linux-x86-baselibs-2.0"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+	# Check for bad symlink before installing, bug 84441.
+	if [ -L /emul/linux/x86/usr/lib/X11 ]; then
+		rm -f /emul/linux/x86/usr/lib/X11
+	fi
+}
+
+src_install() {
+	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
+}
+
+pkg_postinst() {
+	#update GL symlinks
+	if use opengl && [[ ${ROOT} == "/" ]] ; then
+		/usr/sbin/opengl-update --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.0 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.0
new file mode 100644
index 000000000000..ae540975cef2
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.0
@@ -0,0 +1 @@
+MD5 f968e2deea6e75049d5b34eb47a36f9d emul-linux-x86-xlibs-2.0.tar.bz2 4006387