only install libraries that previous versions also installed; bug 166584

(Portage version: 2.1.2-r9)

2 files changed, 12 insertions, 17 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/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!"
 }