summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-01-18 01:37:37 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-01-18 01:37:37 +0000
commit95d9f2dfa658c75e209a1291c884bcccd745f26e (patch)
treea4d6ccc9f9710cf720efab104117bd9830c12ad3 /app-emulation/emul-linux-x86-xlibs
parentMask ebul ebuilds which don't provide working env.d entries. (diff)
downloadgentoo-2-95d9f2dfa658c75e209a1291c884bcccd745f26e.tar.gz
gentoo-2-95d9f2dfa658c75e209a1291c884bcccd745f26e.tar.bz2
gentoo-2-95d9f2dfa658c75e209a1291c884bcccd745f26e.zip
Use the emul dir in LDPATH.
(Portage version: 2.0.51-r13)
Diffstat (limited to 'app-emulation/emul-linux-x86-xlibs')
-rw-r--r--app-emulation/emul-linux-x86-xlibs/ChangeLog8
-rw-r--r--app-emulation/emul-linux-x86-xlibs/Manifest4
-rw-r--r--app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild49
-rw-r--r--app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r21
4 files changed, 60 insertions, 2 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index fbdb2d2a152f..e206144e4605 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
# 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.15 2005/01/01 14:12:01 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.16 2005/01/18 01:37:37 eradicator Exp $
+
+*emul-linux-x86-xlibs-1.2-r2 (17 Jan 2005)
+
+ 17 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ +emul-linux-x86-xlibs-1.2-r2.ebuild:
+ Use the emul dir in LDPATH.
06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
emul-linux-x86-xlibs-1.2-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/Manifest b/app-emulation/emul-linux-x86-xlibs/Manifest
index d580f04a5d50..bd6d55295c0b 100644
--- a/app-emulation/emul-linux-x86-xlibs/Manifest
+++ b/app-emulation/emul-linux-x86-xlibs/Manifest
@@ -3,8 +3,9 @@ MD5 aebe8c4f7a9976e86923c346287b0f60 emul-linux-x86-xlibs-1.0.ebuild 794
MD5 d886d465972f57a9aebe34be2ae4a597 emul-linux-x86-xlibs-1.1.ebuild 1554
MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
MD5 84793ce2a2c8e0d1fca353f31a5e9679 emul-linux-x86-xlibs-1.1-r1.ebuild 1585
-MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
MD5 157995239867d0e41b12c8137ed1dd4f emul-linux-x86-xlibs-1.2.ebuild 708
+MD5 3ce3935a01506668e1a04e6990e09dc0 emul-linux-x86-xlibs-1.2-r2.ebuild 1530
+MD5 4fbfc5f46798844e186e586f6c9e1c65 emul-linux-x86-xlibs-1.2-r1.ebuild 1516
MD5 42f42e0727df82ff01db88d5a027f010 files/75emul-linux-x86-x 81
MD5 97c2c7b018d1e1d526ab438517a9ad07 files/digest-emul-linux-x86-xlibs-1.0 79
MD5 2a633bccab7f80e5dc62b16adf011b6d files/digest-emul-linux-x86-xlibs-1.1 79
@@ -13,3 +14,4 @@ MD5 5a7b89b29d4fbc9bc81caf9da1a9ba1d files/XI18N_OBJS 333
MD5 7299ce6b3a61885dfca9c22ee8e4798d files/XLC_LOCALE 772
MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2 78
MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r1 78
+MD5 67e4eda745af1451f8adbc4824048d3a files/digest-emul-linux-x86-xlibs-1.2-r2 78
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.ebuild
new file mode 100644
index 000000000000..8c51abef8e9f
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-1.2-r2.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-1.2-r2.ebuild,v 1.1 2005/01/18 01:37:37 eradicator Exp $
+
+inherit eutils
+
+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=""
+
+DEPEND="virtual/libc
+ >=app-emulation/emul-linux-x86-baselibs-1.2.2-r2"
+
+S=${WORKDIR}
+
+src_install() {
+ mkdir -p ${D}/etc/env.d/
+ echo "LDPATH=/emul/linux/x86/usr/X11R6/lib32" > ${D}/etc/env.d/75emul-linux-x86-xlibs
+ cp -Rpvf ${WORKDIR}/* ${D}/
+
+ # We don't use this symlink any more
+ rm ${D}/usr/X11R6/lib32
+
+ mkdir -p ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C
+ cp ${FILESDIR}/XI18N_OBJS ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
+ cp ${FILESDIR}/XLC_LOCALE ${D}/emul/linux/x86/usr/X11R6/lib32/X11/locale/C/
+
+ chown -R root:root ${D}
+}
+
+pkg_postinst() {
+ # do not replace any of the following with $(get_libdir)
+ if [ ! -e /usr/X11R6/lib/X11/locale/lib ] ; then
+ ln -s /emul/linux/x86/usr/X11R6/lib/X11/locale/lib /usr/X11R6/lib/X11/locale/lib
+ elif [ ! -h /usr/X11R6/lib/X11/locale/lib ] ; then
+ echo
+ ewarn "/usr/X11R6/lib/X11/locale/lib isnt a symlink, some apps will"
+ ewarn "refuse to work (adobe acrobat, staroffice, etc). Right now the"
+ ewarn "fix is to install at least xorg 6.7.99.903, which has been made"
+ ewarn "lib64 aware, and then reinstall emul-linux-x86-xlibs."
+ echo
+ epause 10
+ fi
+}
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
new file mode 100644
index 000000000000..f9927af394de
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-1.2-r2
@@ -0,0 +1 @@
+MD5 d0fa1663457ae18571ace5473130f74a emul-linux-x86-xlibs-1.2.tar.bz2 4756900