Fix bug 309283

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

3 files changed, 79 insertions, 5 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/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 4e11c5a3cbd1..d020318ffaea 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -3,14 +3,16 @@ Hash: SHA1
 
 DIST emul-linux-x86-gtklibs-20091231.tar.bz2 5692919 RMD160 de0d067a1218a6cc675ba1837750700c905d65e1 SHA1 3e9d50eb630050053833f1594cfb816603c74e09 SHA256 1f9224a6508c90522cb88e35edcbd8df0ba670caefe664cc43667b0260a3aae0
 DIST emul-linux-x86-gtklibs-20100220.tar.bz2 5771720 RMD160 1bf20ca06fd0978d0abecdcadf9f5d84ac13af0b SHA1 9e6b528878966d48d19841d866c422c7aa7cd428 SHA256 c1257d834ef66f235da3478461b9fb69bc6d7134ac6bf79337ed6f81278a2502
+DIST libglade-2.0.so.0.0.7 88892 RMD160 235b20c3fc07f9a6bad717dd092e164c86670b43 SHA1 66084a8c35426175c1d69f61a6a34ca79e5bca9a SHA256 2c359fc763ac4bfc4d51aff376022c61a4997e7fe2b2688704b0bb029febda21
 EBUILD emul-linux-x86-gtklibs-20091231.ebuild 1898 RMD160 714bb2cedbb61d27cb83350b9bc2035f7e09504a SHA1 64d4d946f0d53cd6387c5a71d5f0c079078965c8 SHA256 a3120b690519f7751fd7b979e4fd076ce2f5105ede9bc74a688ad5926bd5d667
+EBUILD emul-linux-x86-gtklibs-20100220-r1.ebuild 2215 RMD160 d80cdd033d9c1e8ef50ef5090329b5691f01ce12 SHA1 d8a8f376d22704c79ad93e798a229d099be2aac6 SHA256 3add6b6d677899ccca1c5568f3910a82a5bdb174b2d81a74077d59fd783d7dab
 EBUILD emul-linux-x86-gtklibs-20100220.ebuild 1899 RMD160 0eb4f4bae8ed9273dec493e9fdbf3874eb7b5c2f SHA1 7eff2e5e38b3e098eb23c792f2d57f0c3316e36d SHA256 f02c8bf523b4287359a9b64f67ebe8053cb75df928d7dc70017789d2403400ee
-MISC ChangeLog 12732 RMD160 7301375ff4893cd7d9d7475fbea4178f53281fe5 SHA1 cec567e160714b993c080bfa2c01a3312f120268 SHA256 58a6bdad200023ca73b975a966dda374851c2367fbc33c99c74b7e269d803a08
+MISC ChangeLog 12988 RMD160 b2cec3a97dce0ba2e5f415a16c4bc07e820eaf74 SHA1 898e020cc0e9a8ac1edd8f7253ede1b15390bea4 SHA256 5c18a6fd2f66a889ae417460bd28a44df150ffb5fc11336733a8d93ec2cd7eb4
 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuAauoACgkQCaWpQKGI+9QWUgCgg7N4N1Hd2ivEcV4mITEdxqW2
-S4EAn147f6v4Tu+EO2QcQw0v9Mrvfxn5
-=nFec
+iEYEARECAAYFAkub5VkACgkQCaWpQKGI+9TUugCeJKUwXnNiIhLN8UaHHdKsTS64
+RuYAmwQz1VBVl3oebpTE/AW0Z0e60HPj
+=oZeB
 -----END PGP SIGNATURE-----
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
+}