Version bump to x86 glibc. This uses 2.3.4.20041102 with CFLAGS=-march="i686 -O2 -pipe -fomit-frame-pointer".

(Portage version: 2.0.51-r15)

4 files changed, 67 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-glibc/ChangeLog b/app-emulation/emul-linux-x86-glibc/ChangeLog
index 6e68bbf33f11..30b64bc3e40b 100644
--- a/app-emulation/emul-linux-x86-glibc/ChangeLog
+++ b/app-emulation/emul-linux-x86-glibc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-glibc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.7 2005/01/12 04:07:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-glibc/ChangeLog,v 1.8 2005/02/02 06:41:11 eradicator Exp $
+
+*emul-linux-x86-glibc-1.2 (01 Feb 2005)
+
+  01 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +emul-linux-x86-glibc-1.2.ebuild:
+  Version bump to x86 glibc. This uses 2.3.4.20041102 with CFLAGS=-march="i686
+  -O2 -pipe -fomit-frame-pointer".
 
 *emul-linux-x86-glibc-1000 (11 Jan 2005)
 
diff --git a/app-emulation/emul-linux-x86-glibc/Manifest b/app-emulation/emul-linux-x86-glibc/Manifest
index 04e445a270fb..7c32f40863fe 100644
--- a/app-emulation/emul-linux-x86-glibc/Manifest
+++ b/app-emulation/emul-linux-x86-glibc/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 b08ecda7296b701e260578af64d85660 ChangeLog 1377
+MD5 65cfc985c329c3b1dce8d49e1dfd76b5 emul-linux-x86-glibc-1.1.ebuild 1903
 MD5 40ca4d354cbeefab2150be25b2d27cd8 emul-linux-x86-glibc-1000.ebuild 523
 MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
-MD5 65cfc985c329c3b1dce8d49e1dfd76b5 emul-linux-x86-glibc-1.1.ebuild 1903
+MD5 8c9d53d85c296916ece3c568e6ed76cf emul-linux-x86-glibc-1.2.ebuild 1707
 MD5 8dccc3aa6c05f10bd497c77ecae9f0f9 files/digest-emul-linux-x86-glibc-1.1 78
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emul-linux-x86-glibc-1000 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB5KKBArHZZzCEUG0RAg0oAJ4kqhKdCpJa3ZIxhShfgP6iYapIdACdFce1
-u/fjTsuu+IMlUhKsyVGOp/c=
-=8Ghy
------END PGP SIGNATURE-----
+MD5 eba553c837d2b3d83a253dea9efaa7a2 files/digest-emul-linux-x86-glibc-1.2 251
diff --git a/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.2.ebuild b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.2.ebuild
new file mode 100644
index 000000000000..bd9e17c71317
--- /dev/null
+++ b/app-emulation/emul-linux-x86-glibc/emul-linux-x86-glibc-1.2.ebuild
@@ -0,0 +1,53 @@
+# 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-glibc/emul-linux-x86-glibc-1.2.ebuild,v 1.1 2005/02/02 06:41:11 eradicator Exp $
+
+IUSE="nptl nptlonly"
+
+DESCRIPTION="GNU C Library for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
+SRC_URI="!nptl? ( ${BASE_URI}/${PN}-${PV}-lt.tar.bz2 )
+	 nptl? ( !nptlonly? ( ${BASE_URI}/${PN}-${PV}-nptl.tar.bz2 ) )
+	 nptl? ( nptlonly? ( ${BASE_URI}/${PN}-${PV}-nptlonly.tar.bz2 ) )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="!<app-emulation/emul-linux-x86-baselibs-1.2
+	 ~sys-libs/glibc-2.3.4.20041102"
+
+S=${WORKDIR}
+
+src_install() {
+	tar -c -f - . | tar -x -f - -C ${D}
+
+	# create env.d entry
+	mkdir -p ${D}/etc/env.d
+	cat > ${D}/etc/env.d/40emul-linux-x86-glibc <<ENDOFENV
+LDPATH=/emul/linux/x86/lib:/emul/linux/x86/usr/lib
+ENDOFENV
+	chmod 644 ${D}/etc/env.d/40emul-linux-x86-glibc
+}
+
+run_verbose() {
+	echo "running $@"
+	$@ || die "unable to $@"
+}
+
+pkg_postinst() {
+	# for some reason we have users with lib32 as a directory and not a symlink.
+	# my guess is a broken version of opengl-update somewhere... but since
+	# having lib32 as a directory is definately broken, lets fix that here.
+	if [ ! -L /usr/lib32 ] ; then
+		ewarn "/usr/lib32 is not a symlink... fixing"
+		run_verbose mv /usr/lib32 /usr/lib32-bork-bork-bork
+		run_verbose ln -sf /emul/linux/x86/usr/lib /usr/lib32
+		echo "moving /usr/lib32-bork-bork-bork/* to /usr/lib32/"
+		mv -v /usr/lib32-bork-bork-bork/* /usr/lib32/
+		run_verbose rm -rf /usr/lib32-bork-bork-bork
+		einfo "fixed!"
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.2 b/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.2
new file mode 100644
index 000000000000..030319a87861
--- /dev/null
+++ b/app-emulation/emul-linux-x86-glibc/files/digest-emul-linux-x86-glibc-1.2
@@ -0,0 +1,3 @@
+MD5 73624b9a5c6888cd16695822d6e7cc11 emul-linux-x86-glibc-1.2-lt.tar.bz2 3427163
+MD5 476241142c6d8425d4700056c2d86a66 emul-linux-x86-glibc-1.2-nptl.tar.bz2 4762536
+MD5 e7910732ee6c12bdf5e622356098e546 emul-linux-x86-glibc-1.2-nptlonly.tar.bz2 3463616