Bump with libs from newer xorg.

(Portage version: 2.0.53)

6 files changed, 116 insertions, 15 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 2b03e1c3bcdd..54bffcbbbd41 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2005/09/06 12:46:34 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.33 2005/12/06 21:52:04 herbs Exp $
+
+*emul-linux-x86-xlibs-2.2-r1 (06 Dec 2005)
+*emul-linux-x86-xlibs-2.2 (06 Dec 2005)
+
+  06 Dec 2005; Herbie Hopkins <herbs@gentoo.org>
+  +emul-linux-x86-xlibs-2.2.ebuild, +emul-linux-x86-xlibs-2.2-r1.ebuild:
+  Bump with libs from updated version of xorg-x11.
 
   06 Sep 2005; Herbie Hopkins <herbs@gentoo.org> -files/XI18N_OBJS,
   -files/XLC_LOCALE, metadata.xml, -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 00245c9f9349..cc3cc3e069e1 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ad51a611fffb16ad146d0e15b653fe64 emul-linux-x86-xlibs-2.1.ebuild 1199
-MD5 87a5eef7da6975162fce34891c454267 ChangeLog 5825
-MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
+MD5 9182f9378ce090c48b93387e36224523 ChangeLog 6083
 MD5 18f8cd2aff37076230afc8093f15dd2b emul-linux-x86-xlibs-2.1-r1.ebuild 1142
-MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1-r1 78
+MD5 ad51a611fffb16ad146d0e15b653fe64 emul-linux-x86-xlibs-2.1.ebuild 1199
+MD5 18f8cd2aff37076230afc8093f15dd2b emul-linux-x86-xlibs-2.2-r1.ebuild 1142
+MD5 28e24736d8a597f018232ed5fb81eb98 emul-linux-x86-xlibs-2.2.ebuild 1135
 MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHY/A2G5bA0cA/ScRAh+7AJ9dcQjqWNT3VtSxQ0Ia5X4qdhSRkwCg8IAa
-N8J5uV7o9ol+QNe3dIkfBOA=
-=ReHH
------END PGP SIGNATURE-----
+MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1-r1 78
+MD5 154016337adfbdad0fe47c48a81b4194 files/digest-emul-linux-x86-xlibs-2.2 78
+MD5 154016337adfbdad0fe47c48a81b4194 files/digest-emul-linux-x86-xlibs-2.2-r1 78
+MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2-r1.ebuild
new file mode 100644
index 000000000000..77af65657409
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2-r1.ebuild
@@ -0,0 +1,49 @@
+# 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.2-r1.ebuild,v 1.1 2005/12/06 21:52:04 herbs Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+
+RDEPEND="opengl? ( app-admin/eselect-opengl )
+	 virtual/libc
+	 >=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 ; then
+		/usr/bin/eselect opengl set --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.ebuild
new file mode 100644
index 000000000000..2eeb88013f3c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.ebuild
@@ -0,0 +1,49 @@
+# 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.2.ebuild,v 1.1 2005/12/06 21:52:04 herbs Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="opengl"
+
+DEPEND=""
+
+RDEPEND="opengl? ( x11-base/opengl-update )
+	 virtual/libc
+	 >=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 ; then
+		/usr/bin/opengl-update --use-old
+	fi
+}
+
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2
new file mode 100644
index 000000000000..e9dd91755fe3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2
@@ -0,0 +1 @@
+MD5 5407c4ab44052f12dd3932011e968051 emul-linux-x86-xlibs-2.2.tar.bz2 4677611
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2-r1
new file mode 100644
index 000000000000..e9dd91755fe3
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2-r1
@@ -0,0 +1 @@
+MD5 5407c4ab44052f12dd3932011e968051 emul-linux-x86-xlibs-2.2.tar.bz2 4677611