fix bug 169368

Package-Manager: portage-2.1.2-r13

3 files changed, 21 insertions, 10 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/ChangeLog b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
index fffe37637cb0..87a189ebfc6d 100644
--- a/app-emulation/emul-linux-x86-gtklibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-gtklibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-gtklibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.43 2007/03/02 15:58:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/ChangeLog,v 1.44 2007/03/05 15:19:54 blubb Exp $
+
+  05 Mar 2007; Simon Stelling <blubb@gentoo.org>
+  emul-linux-x86-gtklibs-10.0-r1.ebuild:
+  fix bug 169368
 
   02 Mar 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-gtklibs-10.0-r1.ebuild:
diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 80fe02d5882a..a88b17782bd5 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -15,10 +15,10 @@ DIST gtk-engines-qt-0.7-r1.tbz2 135604 RMD160 00cd362aac0244a36634346c2801fd7c5c
 DIST gtk-engines-xfce-2.2.8-r1.tbz2 59465 RMD160 2436b2356e234886bd19efa4212f2378ac7058d0 SHA1 8a878ce632cddca18b1c95ad28a9342af5eba927 SHA256 c84b593a45356efee72bd085bb6b2fd25ce4dc3758c0901862a231d5db204e03
 DIST imlib-1.9.14-r3.tbz2 604079 RMD160 8e2d84cd870f6a4a10681e26c38bcdc9c1c80edc SHA1 01682a815c2e23cf7dc4021a219edef9f364f9f6 SHA256 0efd7f15178f5b987ddf2017fda1ba8d5633699ad83186f5cf87c77268b9a814
 DIST pango-1.14.9.tbz2 632667 RMD160 4194800b2f85623be8f3e7d995efd4e5fd21421d SHA1 21b8c85ae48197e1b2288fe6235b0019cabdef2e SHA256 c97cf00ee1e988f54f70b765f4e87048f56665ab9dd239ceab4e7625e7b6e1a0
-EBUILD emul-linux-x86-gtklibs-10.0-r1.ebuild 2113 RMD160 3c88c5b00c25459a51e950d1317c33fc239c9b19 SHA1 ebf5dc18c298eac697d0b13be763554a0b1c591f SHA256 faf6abffe8c20f4e9905974a79d0cf696bd61bdc726899d62c7ea4410e1d3f59
-MD5 3b1733f05ff22db3ada65189ce580baf emul-linux-x86-gtklibs-10.0-r1.ebuild 2113
-RMD160 3c88c5b00c25459a51e950d1317c33fc239c9b19 emul-linux-x86-gtklibs-10.0-r1.ebuild 2113
-SHA256 faf6abffe8c20f4e9905974a79d0cf696bd61bdc726899d62c7ea4410e1d3f59 emul-linux-x86-gtklibs-10.0-r1.ebuild 2113
+EBUILD emul-linux-x86-gtklibs-10.0-r1.ebuild 2230 RMD160 879a6cfb72f937144353c2ff14590b3fc69802f5 SHA1 0d21b996f8e15ccf226c66b1b5fc5bac6224dc82 SHA256 6eb98daafbe30ab1b981c1e9c5b2e8427b0d9bb6194d03b1f44cd592084e901f
+MD5 722c9f8c90ff4a7b852494de09c5befe emul-linux-x86-gtklibs-10.0-r1.ebuild 2230
+RMD160 879a6cfb72f937144353c2ff14590b3fc69802f5 emul-linux-x86-gtklibs-10.0-r1.ebuild 2230
+SHA256 6eb98daafbe30ab1b981c1e9c5b2e8427b0d9bb6194d03b1f44cd592084e901f emul-linux-x86-gtklibs-10.0-r1.ebuild 2230
 EBUILD emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild 1374 RMD160 b8e5d762d34f7f63fe90c5fe08aea19fc8883eb6 SHA1 7d91d06919d9c0f4afb85cfc28e0e9d0856bf8d0 SHA256 8f97de6bb9e48dc5f62c257789851e88d5d36e34ea38a832135bb3167c016df2
 MD5 b9221e1c403b0e95cb67209a7a6776b6 emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild 1374
 RMD160 b8e5d762d34f7f63fe90c5fe08aea19fc8883eb6 emul-linux-x86-gtklibs-2.10.6.3-r3.ebuild 1374
@@ -35,10 +35,10 @@ EBUILD emul-linux-x86-gtklibs-2.8.8.ebuild 1036 RMD160 d5c6101ac1718795085478a0a
 MD5 5568a53572590115d285168e9166796d emul-linux-x86-gtklibs-2.8.8.ebuild 1036
 RMD160 d5c6101ac1718795085478a0a8768aac1656b54a emul-linux-x86-gtklibs-2.8.8.ebuild 1036
 SHA256 e2a8aba1ef3655f81888016f00e5ffe8aaabf880e3ece3cfe939d981bf2f2eb0 emul-linux-x86-gtklibs-2.8.8.ebuild 1036
-MISC ChangeLog 7680 RMD160 dd5e39d296ec3fbc803a8ac47ea8ce6329a75d9f SHA1 219a8609b8ed2406ff2f8a5ca52548ce3488e13b SHA256 196ff3d154955073014061093dce90ad4920b9535e7e2daa65008d47fd06866f
-MD5 85f9a017a6c13ff3a1dea71297951ca7 ChangeLog 7680
-RMD160 dd5e39d296ec3fbc803a8ac47ea8ce6329a75d9f ChangeLog 7680
-SHA256 196ff3d154955073014061093dce90ad4920b9535e7e2daa65008d47fd06866f ChangeLog 7680
+MISC ChangeLog 7788 RMD160 56a57d733d966ba450170f71ece6f3274f0f9fed SHA1 7544fdd103020e609b6046bb4a2f9cef5607ef6f SHA256 5c2ff6f7eaac9241140bda505ba1727c81b60a7d0b97d70736c4aa938ffd3f40
+MD5 8bf8083db773596786bebba7d196d35e ChangeLog 7788
+RMD160 56a57d733d966ba450170f71ece6f3274f0f9fed ChangeLog 7788
+SHA256 5c2ff6f7eaac9241140bda505ba1727c81b60a7d0b97d70736c4aa938ffd3f40 ChangeLog 7788
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
index d46f396996d1..009ccca3096e 100644
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
+++ b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild,v 1.4 2007/03/02 15:58:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-10.0-r1.ebuild,v 1.5 2007/03/05 15:19:54 blubb Exp $
 
 inherit emul-libs
 
@@ -37,6 +37,13 @@ src_unpack() {
 	[[ -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so ]] && rm -f ${S}/usr/lib32/kde3/kcm_kcmgtk.so
 }
 
+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