Fixes for bugs 84441 and 81045.

(Portage version: 2.0.51.19)

4 files changed, 86 insertions, 12 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index fd576ab435a7..7ea0637e7b14 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.22 2005/02/08 10:31:40 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.23 2005/03/09 22:35:39 cryos Exp $
+
+*emul-linux-x86-xlibs-1.2-r7 (09 Mar 2005)
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +emul-linux-x86-xlibs-1.2-r7.ebuild:
+  Fixed pkg_postrm() function logic not to remove the symlink on upgrades,
+  closes bug 84441. Also added some extra symlinks as requested in bug 81045.
 
   08 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
   emul-linux-x86-xlibs-1.2-r6.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 815f8554259e..f0f7525e8207 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 e55317aa7c4359eafc4dfc05b5d704ef emul-linux-x86-xlibs-1.2-r7.ebuild 2172
 MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
 MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 fd0d98ed581aec4209c458a2e719422c ChangeLog 4006
+MD5 e7c5e2c92b574c8f9cb7f5c818e931e1 ChangeLog 4295
 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)
-
-iD8DBQFCCJUWntT9W3vfTuoRArHpAJ9xYWdWmPwnovpmvX6mhWx3aOgYTwCgp3Px
-qr7QABNxYTXM6+kaPIeOX+M=
-=Qus5
------END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild
new file mode 100644
index 000000000000..502931bbe302
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r7.ebuild
@@ -0,0 +1,74 @@
+# 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-1.2-r7.ebuild,v 1.1 2005/03/09 22:35:39 cryos Exp $
+
+inherit multilib
+
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-xlibs-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+RDEPEND="virtual/libc
+	 >=x11-base/xorg-x11-6.8.0-r4
+	 >=app-emulation/emul-linux-x86-baselibs-1.2.2-r2"
+
+S=${WORKDIR}
+
+src_install() {
+	mkdir -p ${D}/etc/env.d/
+	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
+
+	dodir /emul/linux/x86/usr/lib/X11/locale/C
+	cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/lib/X11/locale/C/
+	cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/lib/X11/locale/C/
+
+	rm -f ${D}/emul/linux/x86/usr/lib/X11
+	mv ${D}/emul/linux/x86/usr/X11R6/lib/* ${D}/emul/linux/x86/usr/lib/
+
+	# Create some extra symlinks, bug 81045.
+	cd ${D}/emul/linux/x86/usr/lib
+	ln -s libX11.so.6 libX11.so
+	ln -s libXext.so.6 libXext.so
+
+	# We don't use this any more
+	rm -rf ${D}/usr/X11R6
+	rm -rf ${D}/emul/linux/x86/usr/X11R6
+
+	dosed "s:^libdir=.*$:libdir=\'/emul/linux/x86/usr/lib\':" /emul/linux/x86/usr/lib/libGLU.la
+
+	chown -R root:root ${D}
+}
+
+pkg_postinst() {
+	# Ensure that the proper symlink is set, or a warning generated.
+	if [ -h /usr/$(get_libdir)/X11/locale/lib ]; then
+		rm -f /usr/$(get_libdir)/X11/locale/lib
+	fi
+	if [ ! -e /usr/$(get_libdir)/X11/locale/lib ]; then
+		ln -s /emul/linux/x86/usr/lib/X11/locale/lib \
+			/usr/$(get_libdir)/X11/locale/lib
+	else
+		ewarn "Error /usr/$(get_libdir)/X11/locale/lib is not a symlink."
+		ewarn "This may cause some 32 bit applications to fail."
+	fi
+}
+
+pkg_postrm() {
+	# The symlink should be removed too.
+	if [ -L /usr/$(get_libdir)/X11/locale/lib && \
+		! -d /emul/linux/x86/usr/lib ]; then
+		rm -f /usr/$(get_libdir)/X11/locale/lib
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r7 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r7
new file mode 100644
index 000000000000..f9927af394de
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r7
@@ -0,0 +1 @@
+MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900