version bump to fix security bug 116481

(Portage version: 2.0.51.22-r3)

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 54bffcbbbd41..f7c4944b9aef 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.33 2005/12/06 21:52:04 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.34 2005/12/23 21:57:42 blubb Exp $
+
+*emul-linux-x86-xlibs-2.2.1-r1 (23 Dec 2005)
+*emul-linux-x86-xlibs-2.2.1 (23 Dec 2005)
+
+  23 Dec 2005; Simon Stelling <blubb@gentoo.org>
+  +emul-linux-x86-xlibs-2.2.1.ebuild, +emul-linux-x86-xlibs-2.2.1-r1.ebuild:
+  version bump to fix security bug 116481
 
 *emul-linux-x86-xlibs-2.2-r1 (06 Dec 2005)
 *emul-linux-x86-xlibs-2.2 (06 Dec 2005)
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 9a784f103670..2d6e067c5294 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 da9cf72d187698996d098ad9d891a1a7 ChangeLog 6083
-MD5 18f8cd2aff37076230afc8093f15dd2b emul-linux-x86-xlibs-2.1-r1.ebuild 1142
+MD5 8e3be6b533d5cf121d135cec18704c15 emul-linux-x86-xlibs-2.2.1-r1.ebuild 1137
 MD5 ad51a611fffb16ad146d0e15b653fe64 emul-linux-x86-xlibs-2.1.ebuild 1199
+MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
+MD5 18f8cd2aff37076230afc8093f15dd2b emul-linux-x86-xlibs-2.1-r1.ebuild 1142
 MD5 8e3be6b533d5cf121d135cec18704c15 emul-linux-x86-xlibs-2.2-r1.ebuild 1137
 MD5 85d03ce30e14f05ac6c616c9c0a4ab65 emul-linux-x86-xlibs-2.2.ebuild 1127
-MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1 78
-MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1-r1 78
+MD5 85d03ce30e14f05ac6c616c9c0a4ab65 emul-linux-x86-xlibs-2.2.1.ebuild 1127
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDlggQ2G5bA0cA/ScRAsCfAJ0ZODbuL9ZM5SS6vxu343+7Uae8egCgvNBf
-4eQB9H44AFutcTXX1xwOHao=
-=7LDk
------END PGP SIGNATURE-----
+MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1 78
+MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1-r1 78
+MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1-r1 80
+MD5 0393dcaadf58787ed27c9f9207de7cea files/digest-emul-linux-x86-xlibs-2.2.1 80
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-r1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..54a1fb01ef35
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1-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.1-r1.ebuild,v 1.1 2005/12/23 21:57:42 blubb 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.1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1.ebuild
new file mode 100644
index 000000000000..95ce9363293e
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.2.1.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.1.ebuild,v 1.1 2005/12/23 21:57:42 blubb 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.1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1
new file mode 100644
index 000000000000..258dbb40892a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1
@@ -0,0 +1 @@
+MD5 c3ffb22742958f8f4a0e5f90557bd555 emul-linux-x86-xlibs-2.2.1.tar.bz2 4644402
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1
new file mode 100644
index 000000000000..258dbb40892a
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.2.1-r1
@@ -0,0 +1 @@
+MD5 c3ffb22742958f8f4a0e5f90557bd555 emul-linux-x86-xlibs-2.2.1.tar.bz2 4644402