only install libraries that previous versions also installed; bug 166584

Package-Manager: portage-2.1.2-r9

3 files changed, 20 insertions, 25 deletions

diff --git a/app-emulation/emul-linux-x86-qtlibs/ChangeLog b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
index 81a0e6ce0fb3..007ec7eb6858 100644
--- a/app-emulation/emul-linux-x86-qtlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-qtlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/emul-linux-x86-qtlibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.26 2007/02/13 14:04:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/ChangeLog,v 1.27 2007/02/13 21:02:40 blubb Exp $
+
+  13 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  emul-linux-x86-qtlibs-10.0.ebuild:
+  only install libraries that previous versions also installed; bug 166584
 
   13 Feb 2007; Simon Stelling <blubb@gentoo.org>
   emul-linux-x86-qtlibs-10.0.ebuild:
diff --git a/app-emulation/emul-linux-x86-qtlibs/Manifest b/app-emulation/emul-linux-x86-qtlibs/Manifest
index 0b4160908836..48e0add27f2f 100644
--- a/app-emulation/emul-linux-x86-qtlibs/Manifest
+++ b/app-emulation/emul-linux-x86-qtlibs/Manifest
@@ -14,10 +14,10 @@ DIST emul-linux-x86-qtlibs-noime-3.4.4.tar.bz2 2792643 RMD160 db06ed120a8633cd3b
 DIST kdeartwork-styles-3.5.5.tbz2 125009 RMD160 de07d2c343637d7b9343ef31a7712a3590bac6ec SHA1 ebf1228df3e1221ba1ee59b8fab1fe4a77ceff69 SHA256 a63178e8b5c91e67d3a7eae848f3532fc3edd6d5a818703c278fddc346125578
 DIST kdelibs-3.5.5-r8.tbz2 18111478 RMD160 c4aa3c68a56ae7a5dd2d0da1203be3f408216958 SHA1 6defe809f29512c5ac9891b3151d160c987620d5 SHA256 f243eb9528b0a2985abdc8a674a701a9618a9bd69afd99e7343bc673358249ab
 DIST qt-3.3.6-r4.tbz2 8057713 RMD160 400f46973d65247645819007c3dffbf2860a0619 SHA1 b463493a2d414ec3a470b041912770ae60065a63 SHA256 4d44943fcf759371d3ef2e913c0b6760037c098b39cbf1aaa2e375e5640d3f96
-EBUILD emul-linux-x86-qtlibs-10.0.ebuild 1527 RMD160 cd626aec16c07fdd5f7ebb8965e948a5839a20bf SHA1 a661fbc97d7180345e25985003a82b7dbab1e132 SHA256 3717d7df6f4822e0bcd4455b984866e9b81151b322f2c023ef4973a7ae928b1a
-MD5 11546ee6db5f96f808ef7e8b89301ed4 emul-linux-x86-qtlibs-10.0.ebuild 1527
-RMD160 cd626aec16c07fdd5f7ebb8965e948a5839a20bf emul-linux-x86-qtlibs-10.0.ebuild 1527
-SHA256 3717d7df6f4822e0bcd4455b984866e9b81151b322f2c023ef4973a7ae928b1a emul-linux-x86-qtlibs-10.0.ebuild 1527
+EBUILD emul-linux-x86-qtlibs-10.0.ebuild 1429 RMD160 0443fe098592e9627f45708ed88c371105dbbca1 SHA1 5bc70046bcc1a34b206ebe1653219e2bcfefe9e6 SHA256 330eef941b9e23d851232a075bbe423c400c3f284ae95472b325f64fcd13a944
+MD5 798565f14d04b44945f39c46566c49f4 emul-linux-x86-qtlibs-10.0.ebuild 1429
+RMD160 0443fe098592e9627f45708ed88c371105dbbca1 emul-linux-x86-qtlibs-10.0.ebuild 1429
+SHA256 330eef941b9e23d851232a075bbe423c400c3f284ae95472b325f64fcd13a944 emul-linux-x86-qtlibs-10.0.ebuild 1429
 EBUILD emul-linux-x86-qtlibs-2.2.ebuild 649 RMD160 1c6d37ce559ace98982a28f727935e26612a005e SHA1 74d3c9d918e6be699a3b5da03b8edf38f5d06cc8 SHA256 6b7a207e771dec99aa646cc895ab62e2edde6d7e468ee0aab1d2755da3b10564
 MD5 d4f5f68c00a37823972c27daa997de6a emul-linux-x86-qtlibs-2.2.ebuild 649
 RMD160 1c6d37ce559ace98982a28f727935e26612a005e emul-linux-x86-qtlibs-2.2.ebuild 649
@@ -38,10 +38,10 @@ EBUILD emul-linux-x86-qtlibs-3.4.4.ebuild 854 RMD160 21735d8f971ce23b2031a694dbd
 MD5 7db6f7722697e455bc41c0b22694d67b emul-linux-x86-qtlibs-3.4.4.ebuild 854
 RMD160 21735d8f971ce23b2031a694dbd0d191fb8e9a04 emul-linux-x86-qtlibs-3.4.4.ebuild 854
 SHA256 da743b3029257d0fbf741b97f4f69d1eeda3d794dca0b3e80f3237a55df18512 emul-linux-x86-qtlibs-3.4.4.ebuild 854
-MISC ChangeLog 4702 RMD160 08c58622bc4c7ed9baa8ca90068a57f94c69935a SHA1 4d3cda668fb3511214a45577059a927678fc44a5 SHA256 34357f9da2620aaaea9476419e3d6f797c2d76a2b73bdd1b58ce657485e21bc5
-MD5 9f5327dda4396bc54b6e17d7e63f235a ChangeLog 4702
-RMD160 08c58622bc4c7ed9baa8ca90068a57f94c69935a ChangeLog 4702
-SHA256 34357f9da2620aaaea9476419e3d6f797c2d76a2b73bdd1b58ce657485e21bc5 ChangeLog 4702
+MISC ChangeLog 4864 RMD160 7e6656ead360c6d6f79030bfd823d84a3d2e8bbc SHA1 fed4a7baa0e1e9972216966fbe94eede57b4b938 SHA256 e7c9ae467e75bfb6a473ce29723a9023aa644a2225a5e0f7900c267972f45d96
+MD5 dbb872978f5a52e16ce7ffbf082484da ChangeLog 4864
+RMD160 7e6656ead360c6d6f79030bfd823d84a3d2e8bbc ChangeLog 4864
+SHA256 e7c9ae467e75bfb6a473ce29723a9023aa644a2225a5e0f7900c267972f45d96 ChangeLog 4864
 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-qtlibs/emul-linux-x86-qtlibs-10.0.ebuild b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-10.0.ebuild
index a9848ee7cdc4..2b185025b40d 100644
--- a/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-10.0.ebuild
+++ b/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-10.0.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-qtlibs/emul-linux-x86-qtlibs-10.0.ebuild,v 1.2 2007/02/13 14:04:00 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-10.0.ebuild,v 1.3 2007/02/13 21:02:40 blubb Exp $
 
 DESCRIPTION="Provides precompiled 32bit libraries"
 HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
@@ -21,13 +21,6 @@ RDEPEND=">=app-emulation/emul-linux-x86-baselibs-10.0
 		>=app-emulation/emul-linux-x86-xlibs-7.0-r7"
 
 pkg_setup() {
-	einfo
-	elog "This package contains prebuilt versions of the following packages:"
-	for a in ${A} ; do 
-		elog "	${a//.tbz2}"
-	done
-	einfo
-	echo
 	einfo "Note: You can safely ignore the 'trailing garbage after EOF'"
 	einfo "      warnings below"
 }
@@ -36,17 +29,12 @@ src_unpack() {
 	unpack ${A}
 
 	# we only want the libs
-	cd ${S}/usr && rm -rf share/
-	for dir in ${S}/usr/{qt/3,kde/3.5} ; do
-		find ${dir} -depth | egrep -v "(^${dir}/lib32|^${dir}$)" | xargs rm -rf
-	done
+	find ${S}/usr ! -type d ! -name '*.so*' | xargs rm -f
+	NEEDED="(libDCOP.so|libkdecore.so|libkdefx.so|libqt-mt.so|libqt.so|libqui.so)"
+	find ${S} -name '*.so*' | egrep -v "${NEEDED}" | xargs rm -f
 }
 
 src_install() {
-	 # nobody needs *.la, *.h *.a
-	 find ${S} -type f -name '*.a' -or -name '*.la' -or -name '*.h' \
-		| xargs rm -f
-
 	for dir in etc/env.d etc/revdep-rebuild ; do
 		if [[ -d ${S}/${dir} ]] ; then
 			for f in ${S}/${dir}/* ; do
@@ -55,5 +43,8 @@ src_install() {
 		fi
 	done
 
+	# remove void directories or portage will show wierd output
+	find ${S} -type d -depth | xargs rmdir 2&>/dev/null
+
 	cp -a "${WORKDIR}"/* "${D}"/ || die "copying files failed!"
 }