Create gtk-2.0 and pango symlinks for 32 bit acroread 7 and firefox-bin, bug 80720.

(Portage version: 2.0.51.19)

4 files changed, 77 insertions, 4 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index bc198ad9fe8e..b4b64d267286 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.6 2005/01/01 14:10:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.7 2005/03/15 19:12:09 cryos Exp $
+
+*emul-linux-x86-gtklibs-1.2-r1 (15 Mar 2005)
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +emul-linux-x86-gtklibs-1.2-r1.ebuild:
+  Added extra logic to create symlinks, this should fix Acrobat Reader 7 and
+  firefox-bin (bug 80720).
 
   28 Aug 2004; Travis Tilley <lv@gentoo.org>
   emul-linux-x86-gtklibs-1.2.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 6bc36a4af6f1..2ab28f0752ae 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -1,8 +1,10 @@
-MD5 13906b78c4e1fb9df66742b949334835 ChangeLog 1157
-MD5 35f9a7d467f1c4497e83237dcfc8b352 emul-linux-x86-gtklibs-1.0.ebuild 723
+MD5 62fbf3cd443011093215078a2afff252 emul-linux-x86-gtklibs-1.2-r1.ebuild 1882
 MD5 9d003022d1a0b05ad781e67b8fabffd5 emul-linux-x86-gtklibs-1.1.ebuild 764
-MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
+MD5 35f9a7d467f1c4497e83237dcfc8b352 emul-linux-x86-gtklibs-1.0.ebuild 723
 MD5 ba2804e9e2469d9e9de20e5e88c4edbe emul-linux-x86-gtklibs-1.2.ebuild 706
+MD5 13906b78c4e1fb9df66742b949334835 ChangeLog 1157
+MD5 3d107142a3ec13f947ea538fdfe0f517 metadata.xml 290
 MD5 c5199632c7789b4160cbfd07f8ce7ede files/digest-emul-linux-x86-gtklibs-1.0 80
 MD5 335112ca7962a6335d2cacc04be643d3 files/digest-emul-linux-x86-gtklibs-1.1 80
 MD5 fc2af2f6465fd80b1212c9bef2cebc1b files/digest-emul-linux-x86-gtklibs-1.2 80
+MD5 fc2af2f6465fd80b1212c9bef2cebc1b files/digest-emul-linux-x86-gtklibs-1.2-r1 80
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2-r1.ebuild
new file mode 100644
index 000000000000..58cde50e38cd
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-1.2-r1.ebuild
@@ -0,0 +1,63 @@
+# 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-gtklibs/emul-linux-x86-gtklibs-1.2-r1.ebuild,v 1.1 2005/03/15 19:12:09 cryos Exp $
+
+DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
+SRC_URI="http://dev.gentoo.org/~lv/emul-linux-x86-gtklibs-${PV}.tar.bz2"
+HOMEPAGE=""
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+S="${WORKDIR}"
+
+DEPEND=">=app-emulation/emul-linux-x86-xlibs-1.2
+	>=app-emulation/emul-linux-x86-baselibs-1.2.2"
+
+pkg_preinst() {
+	# Check for bad symlinks before installing
+	if [ -L /usr/lib32/gtk-2.0 ]; then
+		rm -f /usr/lib32/gtk-2.0
+	fi
+	if [ -L /usr/lib32/pango ]; then
+		rm -f /usr/lib32/pango
+	fi
+}
+
+src_install() {
+	mkdir -p ${D}/etc/env.d
+	echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50emul-linux-x86-gtklibs
+	cp -RPvf ${WORKDIR}/* ${D}/
+}
+
+pkg_postinst() {
+	# Create the necessary symlinks for acroread 7 and firefox-bin
+	if [ -d /usr/lib32/gtk-2.0 ] || [ -d /usr/lib32/pango ]; then
+		if [ -L /usr/lib32 ]; then
+			# This is a 2004.3 profile or lower
+			einfo 2004.3 profile or lower - not creating symlinks
+		else
+			# 2005.0 or higher profile, directories present
+			ewarn Unable to create necessary gtk-2.0 and pango symlinks in
+			ewarn /usr/lib32/ - please check that these directories contain
+			ewarn 32 bit libraries.
+		fi
+	else
+		# Create symlinks
+		cd /usr/lib32
+		ln -s ../../emul/linux/x86/usr/lib32/gtk-2.0 gtk-2.0
+		ln -s ../../emul/linux/x86/usr/lib32/pango pango
+	fi
+}
+
+pkg_postrm() {
+	# The symlinks should be removed if this package is removed
+	if [ -L /usr/lib32/gtk-2.0 ] && [ ! -d /emul/linux/x86/usr/lib32/gtk-2.0 ] \
+		&& [ -L /usr/lib32/pango ] && \
+		[ ! -d /emul/linux/x86/usr/lib32/pango ]; then
+		# The package has been removed, not upgraded
+		rm -f /usr/lib32/gtk-2.0 /usr/lib32/pango
+	fi
+}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-1.2-r1 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-1.2-r1
new file mode 100644
index 000000000000..ae00075bf216
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-1.2-r1
@@ -0,0 +1 @@
+MD5 3badd19dc737500d8dffc2dfdf3626d4 emul-linux-x86-gtklibs-1.2.tar.bz2 2236305