drop =db-4.0*

(Portage version: 2.1.2-r9)

3 files changed, 24 insertions, 33 deletions

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index a5a3ef8d0b42..e771f4d834f4 100644
--- a/app-emulation/emul-linux-x86-baselibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/emul-linux-x86-baselibs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.66 2007/02/13 22:29:14 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.67 2007/02/14 10:45:07 blubb Exp $
+
+*emul-linux-x86-baselibs-10.1 (14 Feb 2007)
+
+  14 Feb 2007; Simon Stelling <blubb@gentoo.org>
+  -emul-linux-x86-baselibs-10.0.ebuild,
+  +emul-linux-x86-baselibs-10.1.ebuild:
+  drop =db-4.0*
 
 *emul-linux-x86-baselibs-10.0-r1 (13 Feb 2007)
 
diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.0.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild
index 40ae9cb17ecf..396548fc5196 100644
--- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.0.ebuild
+++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.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-baselibs/emul-linux-x86-baselibs-10.0.ebuild,v 1.5 2007/02/13 23:27:27 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild,v 1.1 2007/02/14 10:45:07 blubb Exp $
 
 DESCRIPTION="Provides precompiled 32bit libraries"
 HOMEPAGE="http://amd64.gentoo.org/emul/content.xml"
@@ -8,8 +8,7 @@ SRC_URI="mirror://gentoo/binutils-2.16.1-r3.tbz2
 		mirror://gentoo/bzip2-1.0.3-r6.tbz2
 		mirror://gentoo/com_err-1.39.tbz2
 		mirror://gentoo/cracklib-2.8.9-r1.tbz2
-		mirror://gentoo/cups-1.2.6.tbz2
-		mirror://gentoo/db-4.0.14-r3.tbz2
+		mirror://gentoo/cups-1.2.6-nossl.tbz2
 		mirror://gentoo/db-4.2.52_p4-r2.tbz2
 		mirror://gentoo/dbus-1.0.2.tbz2
 		mirror://gentoo/dbus-glib-0.72.tbz2
@@ -57,13 +56,6 @@ DEPEND=""
 RDEPEND=""
 
 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"
 }
@@ -72,26 +64,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	rm -rf {usr/,}{s,}bin/
-	rm -rf var/
-	rm -rf etc/env.d/binutils/
-
-	local dir=${S}/etc
-	find ${dir} -depth | egrep -v "(^${dir}/env.d|^${dir}$)" | xargs rm -rf
+	WHITELIST="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d)"
+	# the following line is broken up because we have files with spaces in the filename
+	find ${S} ! -type d ! -name '*.so*' | egrep -v "${WHITELIST}" | xargs -d '
+' rm -f
+	rm -rf ${S}/etc/env.d/binutils/ ${S}/usr/lib32/binutils/
+	rm -rf ${S}/usr/lib32/engines/ ${S}/usr/lib32/openldap/
+	rm -rf ${S}/usr/lib32/python2.4/
 
-	rm -rf usr/i686-pc-linux-gnu
-	rm -rf usr/include
-	[[ -d usr/lib ]] && rm -rf usr/lib/
-	rm -rf usr/libexec
-	rm -rf usr/share
+	ln -s ../share/terminfo ${S}/usr/lib32/terminfo
 }
 
 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
@@ -100,5 +84,8 @@ src_install() {
 		fi
 	done
 
+	# remove void directories or portage will show weird output
+	find ${S} -depth -type d | xargs rmdir 2&>/dev/null
+
 	cp -a "${WORKDIR}"/* "${D}"/ || die "copying files failed!"
 }
diff --git a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.0 b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1
index 3f14ec22a0a4..a96ff71cad13 100644
--- a/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.0
+++ b/app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1
@@ -10,12 +10,9 @@ SHA256 78ea521c95c95c1fe23e8a4b0cdac2d923a085a16d7f152c01bc0d27e34e4ff2 com_err-
 MD5 2c0a0ef022ee7a8e6a6737a5cccaafe4 cracklib-2.8.9-r1.tbz2 270339
 RMD160 d1c623ca5bd0cf0fe5e815015ca71baf7be80715 cracklib-2.8.9-r1.tbz2 270339
 SHA256 8dd89b018d31573f6bf5aea273f4147e8bbbc4711dd1c9c0cdd60f3a14b67185 cracklib-2.8.9-r1.tbz2 270339
-MD5 bb3d7cae5c5737a88222f8eb9d37de73 cups-1.2.6.tbz2 2360103
-RMD160 e6eb975bc1e9009d0afd72ad030740f1cee74ac3 cups-1.2.6.tbz2 2360103
-SHA256 0ad7675e7e5c7cb9afe41a072b1c1161b1192466544bfb0035c0dbf0a83aa353 cups-1.2.6.tbz2 2360103
-MD5 9e94f347806ad925690e88778aee3fe7 db-4.0.14-r3.tbz2 1145555
-RMD160 7d833f8969d6e71657422123a79756fab6dc485c db-4.0.14-r3.tbz2 1145555
-SHA256 c1d78854dcdd7c44b05adeebf2980cf9652373066cc3ba80fafadc6ba7669deb db-4.0.14-r3.tbz2 1145555
+MD5 d77e54712dd3b96782e6cafdff3df37a cups-1.2.6-nossl.tbz2 2350315
+RMD160 bd970a9c5830fe886c56b973444df2a2b07aff2b cups-1.2.6-nossl.tbz2 2350315
+SHA256 0081ac624ac39276bf69809d82d3263d6bc2709b754f76ee1f1c37b178c55c37 cups-1.2.6-nossl.tbz2 2350315
 MD5 92f6549bf3f3a0aeb07fbb8c8fe81d74 db-4.2.52_p4-r2.tbz2 1517284
 RMD160 0dcc49736c88d6072a5a4d66f736f008d42dff20 db-4.2.52_p4-r2.tbz2 1517284
 SHA256 b215b71a50c49312392b549f4398273abc6d40f86ed87a0d7f41757206d2a795 db-4.2.52_p4-r2.tbz2 1517284