Fix encoded /emul to point to lib32 #143390.

(Portage version: 2.1.2_rc4-r6)

3 files changed, 113 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 7fda5bc5d81e..7cbc4aa892f1 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 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.51 2007/01/03 07:35:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.52 2007/01/05 07:14:06 vapier Exp $
+
+*emul-linux-x86-xlibs-7.0-r7 (05 Jan 2007)
+
+  05 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +emul-linux-x86-xlibs-7.0-r7.ebuild:
+  Fix encoded /emul to point to lib32 #143390.
 
 *emul-linux-x86-xlibs-7.0-r6 (03 Jan 2007)
 
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r7.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r7.ebuild
new file mode 100644
index 000000000000..22370a8981f0
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-7.0-r7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 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-7.0-r7.ebuild,v 1.1 2007/01/05 07:14:06 vapier Exp $
+
+inherit eutils
+
+MY_P=${PN}-7.0-r5
+DESCRIPTION="X11R6 libraries for emulation of 32bit x86 on amd64"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="http://dev.gentooexperimental.org/~peper/distfiles/${MY_P}.tar.bz2
+	mirror://gentoo/${PF}-emul.patch.bz2
+	video_cards_i810? ( mirror://gentoo/emul-linux-x86-xlibs-i810_dri-${PV}.tar.bz2 )
+	video_cards_mach64? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+	video_cards_mga? ( mirror://gentoo/emul-linux-x86-xlibs-mga_dri-${PV}.tar.bz2 )
+	video_cards_r128? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+	video_cards_radeon? ( mirror://gentoo/emul-linux-x86-xlibs-ati_dri-${PV}.tar.bz2 )
+	video_cards_s3virge? ( mirror://gentoo/emul-linux-x86-xlibs-s3virge_dri-${PV}.tar.bz2 )
+	video_cards_savage? ( mirror://gentoo/emul-linux-x86-xlibs-savage_dri-${PV}.tar.bz2 )
+	video_cards_sis? ( mirror://gentoo/emul-linux-x86-xlibs-sis_dri-${PV}.tar.bz2 )
+	video_cards_tdfx? ( mirror://gentoo/emul-linux-x86-xlibs-tdfx_dri-${PV}.tar.bz2 )
+	video_cards_trident? ( mirror://gentoo/emul-linux-x86-xlibs-trident_dri-${PV}.tar.bz2 )
+	video_cards_via? ( mirror://gentoo/emul-linux-x86-xlibs-via_dri-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+IUSE_VIDEO_CARDS="
+	video_cards_i810
+	video_cards_mach64
+	video_cards_mga
+	video_cards_r128
+	video_cards_radeon
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="opengl ${IUSE_VIDEO_CARDS}"
+RESTRICT="nostrip"
+
+DEPEND=""
+RDEPEND="opengl? ( app-admin/eselect-opengl )
+	virtual/libc
+	>=app-emulation/emul-linux-x86-baselibs-2.5.5-r2"
+
+S=${WORKDIR}
+
+pkg_preinst() {
+	# Check for bad symlink before installing, bug 84441.
+	if [[ -L ${ROOT}/emul/linux/x86/usr/lib/X11 ]] ; then
+		rm -f "${ROOT}"/emul/linux/x86/usr/lib/X11
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir usr
+	mv emul/linux/x86/usr/lib usr/lib32 || die
+	rmdir emul/linux/x86/usr emul/linux/x86 emul/linux emul || die
+	epatch ${PF}-emul.patch
+}
+
+src_install() {
+	cp -a "${WORKDIR}"/* "${D}"/ || die
+}
+
+pkg_postinst() {
+	#update GL symlinks
+	use opengl && /usr/bin/eselect opengl set --use-old
+}
diff --git a/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r7 b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r7
new file mode 100644
index 000000000000..306829c74238
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/files/digest-emul-linux-x86-xlibs-7.0-r7
@@ -0,0 +1,33 @@
+MD5 5c6bd3cd5efa00ad7a650a43f13b655e emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
+RMD160 e778ad9600bc573b650f87da440722ad680b9836 emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
+SHA256 36485a9841b35f1b2cb6543269e752d0bf74f90404cb69835370f7562c04f2c4 emul-linux-x86-xlibs-7.0-r5.tar.bz2 3235393
+MD5 f6fd5777828e0bd22e8f1b08d0495966 emul-linux-x86-xlibs-7.0-r7-emul.patch.bz2 12116
+RMD160 cade978ec90b3f6ea28dfebaa14191aab09f0b7d emul-linux-x86-xlibs-7.0-r7-emul.patch.bz2 12116
+SHA256 5c1eeb1e01db414d5a562d154a3a4c89530d573f451a766eb25f46e289fb42cd emul-linux-x86-xlibs-7.0-r7-emul.patch.bz2 12116
+MD5 bf2fa2e8b937b767bcf16a2be8afff74 emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+RMD160 4bd8ac76725230b4c05ab06bcf194de93e4ab4ca emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+SHA256 febb86cc07eaee8d449f9e4d994ae29c7f3c4e9067d8f93fd14b4e4c5b5a063d emul-linux-x86-xlibs-ati_dri-7.0.tar.bz2 3743164
+MD5 e36bba25dd4955e761c9099695aae319 emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+RMD160 85257df90616c65f9ee28c87c478a07d6bb08dea emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+SHA256 e7b88b4b9a0071d5fccccb9185c4392c6119da84131530aa9194a57997f59d6f emul-linux-x86-xlibs-i810_dri-7.0.tar.bz2 2242803
+MD5 21a1f60641146ca5d3331ea982f97c7f emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+RMD160 3b8ccce3aae0ed508fbd8c24d513bdb33b8af23b emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+SHA256 159650c0df35b2a1b627a4c5a0f4ffbdd1d8192fac35ef378fd75d11ab7038fe emul-linux-x86-xlibs-mga_dri-7.0.tar.bz2 749975
+MD5 fe34e55e1dd5bc73904bbc4e96a3a134 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+RMD160 3df360b409e0432234f37c7662d8fca7fe74c5cd emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+SHA256 18fc5da1288a623ff2c0cd6ee5b177d90d3e634209c96675d244f8b435cdae93 emul-linux-x86-xlibs-s3virge_dri-7.0.tar.bz2 716284
+MD5 ada4398fc3e8845683fc5d1fbd2d16b2 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+RMD160 9545cadecc0dfa9dec1a801850fed63cb92b9a37 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+SHA256 33e82602e7c57e42e86ebcd29fc3fd568a06ada9091ba8484d3cbfda9d2a6230 emul-linux-x86-xlibs-savage_dri-7.0.tar.bz2 740433
+MD5 b0c2ebaea9b235b7c98287871ee3294f emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+RMD160 c980124403a183435ef7328c36decb857d4e344c emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+SHA256 b93c61db78c67de7188ac6e20edd8f39db5af9df58283c613e94d147742dac84 emul-linux-x86-xlibs-sis_dri-7.0.tar.bz2 727198
+MD5 57cf19d69012a5e682516ee214605cc4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+RMD160 6d70e3d16c903a8383a1168687363d7626318c8a emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+SHA256 e07cdf5f4d682c1856b83c5b06765b24ca51fb8f29f0d5c7ce7992ea499a0ca4 emul-linux-x86-xlibs-tdfx_dri-7.0.tar.bz2 741194
+MD5 cb538216fe6a7e5de5214a7715d3a6ef emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+RMD160 8460f56d6829d41c042c040bab830084dd1b9958 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+SHA256 d393ba2e1ba8cddd9b3861afdd7f19520b258400f76df8cd5c8fc056671256e5 emul-linux-x86-xlibs-trident_dri-7.0.tar.bz2 699399
+MD5 b91b5b76579259e59f7593c4733fa772 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
+RMD160 201d284ab22ac501ec7b20b2ca419696326f1532 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605
+SHA256 5a64d00eb39684e32f6b1aa045437fb6883e4a090303a70c8e6a7fc3f4e6a995 emul-linux-x86-xlibs-via_dri-7.0.tar.bz2 755605