New version - 2.1

(Portage version: 2.0.51.19)

4 files changed, 67 insertions, 7 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 195927aa16b0..47b7f745c9d9 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.27 2005/04/15 21:06:02 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.28 2005/04/18 09:58:47 herbs Exp $
+
+*emul-linux-x86-xlibs-2.1 (18 Apr 2005)
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org>
+  +emul-linux-x86-xlibs-2.1.ebuild:
+  Added openmotif libs to keep opera happy, bug #89278. Removed unneccesary .a
+  files. Fixed SRC_URI.
 
 *emul-linux-x86-xlibs-2.0 (15 Apr 2005)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index 4a433a98853d..2e9a5a009538 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -1,13 +1,15 @@
-MD5 654bf0f95a71f4d426edbd37844366b1 ChangeLog 4906
-MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
-MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
 MD5 1bc94040ae985ed43cf336d4e8a854b6 emul-linux-x86-xlibs-1.2-r7.ebuild 2356
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
+MD5 19136382ae56465e5c5a7365d817fc68 emul-linux-x86-xlibs-2.1.ebuild 1074
+MD5 5aa3dda16a384e963673cea0f46d1bff emul-linux-x86-xlibs-1.2-r6.ebuild 2001
 MD5 ac1d70bb6f64985b10274165b4467eba emul-linux-x86-xlibs-2.0.ebuild 1160
-MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
+MD5 26af0271c02a589244e73f51df4410a2 emul-linux-x86-xlibs-1.2-r3.ebuild 1815
+MD5 654bf0f95a71f4d426edbd37844366b1 ChangeLog 4906
+MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
-MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
 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
 MD5 5a043dcc10263dc1938ac29c5de9f3dd files/digest-emul-linux-x86-xlibs-2.0 78
+MD5 e253f7387ec47f79eb8b9c55d221a8de files/digest-emul-linux-x86-xlibs-2.1 78
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1.ebuild
new file mode 100644
index 000000000000..2836c87e484c
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-2.1.ebuild
@@ -0,0 +1,50 @@
+# 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.1.ebuild,v 1.1 2005/04/18 09:58:47 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="opengl? ( >=x11-base/opengl-update-2.1.1 )"
+
+RDEPEND="${DEPEND}
+		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.1 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.1
new file mode 100644
index 000000000000..d0620de23900
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-2.1
@@ -0,0 +1 @@
+MD5 719b6fc06cc4a085f7a43dee626c2105 emul-linux-x86-xlibs-2.1.tar.bz2 4614195