Fix bug 309283

(Portage version: 2.1.7.17/cvs/Linux x86_64)

2 files changed, 73 insertions, 1 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index 5507f66c1f91..42b17e9bc29a 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 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.72 2010/02/20 23:06:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.73 2010/03/13 19:19:48 pacho Exp $
+
+*emul-linux-x86-gtklibs-20100220-r1 (13 Mar 2010)
+
+  13 Mar 2010; Pacho Ramos <pacho@gentoo.org>
+  +emul-linux-x86-gtklibs-20100220-r1.ebuild:
+  Fix bug 309283 to provide gnome-base/libglade, that will be included into
+  the tarball in the next emul set.
 
 *emul-linux-x86-gtklibs-20100220 (20 Feb 2010)
 
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild
new file mode 100644
index 000000000000..6d38783edeca
--- /dev/null
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20100220-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 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-20100220-r1.ebuild,v 1.1 2010/03/13 19:19:48 pacho Exp $
+
+inherit emul-linux-x86
+
+SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2
+	http://dev.gentoo.org/~pacho/emul-linux-x86-${PV}/libglade-2.0.so.0.0.7"
+
+LICENSE="GPL-3 GPL-2 LGPL-2 LGPL-2.1 FTL MIT || ( LGPL-2.1 MPL-1.1 )"
+KEYWORDS="-* ~amd64"
+
+IUSE=""
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+	~app-emulation/emul-linux-x86-xlibs-${PV}"
+
+src_unpack() {
+	query_tools="${S}/usr/bin/gtk-query-immodules-2.0|${S}/usr/bin/gdk-pixbuf-query-loaders|${S}/usr/bin/pango-querymodules"
+	ALLOWED="(${S}/etc/env.d|${S}/etc/gtk-2.0|${S}/etc/pango/i686-pc-linux-gnu|${query_tools})"
+	emul-linux-x86_src_unpack
+
+	# these tools generate an index in /etc/{pango,gtk-2.0}/${CHOST}
+	mv -f "${S}/usr/bin/pango-querymodules"{,32} || die
+	mv -f "${S}/usr/bin/gtk-query-immodules-2.0"{,-32} || die
+	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32} || die
+}
+
+src_install() {
+	emul-linux-x86_src_install
+	insinto /usr/lib32/
+	doins "${DISTDIR}"/libglade-2.0.so.0.0.7 || die
+	dosym /usr/lib32/libglade-2.0.so.0.0.7 /usr/lib32/libglade-2.0.so.0 || die
+}
+
+pkg_preinst() {
+	#bug 169058
+	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
+		[[ -L ${l} ]] && rm -f ${l}
+	done
+}
+
+pkg_postinst() {
+	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
+	if [[ ${ROOT} == "/" ]] ; then
+		einfo "Generating pango modules listing..."
+		mkdir -p ${PANGO_CONFDIR}
+		pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
+	fi
+
+	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
+	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."
+	mkdir -p ${GTK2_CONFDIR}
+	gtk-query-immodules-2.0-32 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	gdk-pixbuf-query-loaders32 > "${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+
+	# gdk-pixbuf.loaders should be in their CHOST directories respectively.
+	if [[ -e ${ROOT}/etc/gtk-2.0/gdk-pixbuf.loaders ]] ; then
+		ewarn
+		ewarn "File /etc/gtk-2.0/gdk-pixbuf.loaders shouldn't be present on"
+		ewarn "multilib systems, please remove it by hand."
+		ewarn
+	fi
+}