drop =db-4.0*

Package-Manager: portage-2.1.2-r9

diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog
index a5a3ef8d0b42c241393fa23e1f09598fd10b34dd..e771f4d834f421b3f3e76549ee78426e93a99312 100644 (file)
--- 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/Manifest b/app-emulation/emul-linux-x86-baselibs/Manifest
index c4592ed15150224580155cc8cabc41f663410e03..7ce88d3019d786fcd9cc6d09ddffb1c92b6fa8a3 100644 (file)
--- a/app-emulation/emul-linux-x86-baselibs/Manifest
+++ b/app-emulation/emul-linux-x86-baselibs/Manifest
@@ -7,7 +7,6 @@ DIST bzip2-1.0.3-r6.tbz2 415886 RMD160 e0bcc162152734941e11f2904377968ec617061e
 DIST com_err-1.39.tbz2 47417 RMD160 c4461a6c77da9521008e00b80e2f609b698997ef SHA1 0724f873d9a940682243df085273529a785b9cbe SHA256 78ea521c95c95c1fe23e8a4b0cdac2d923a085a16d7f152c01bc0d27e34e4ff2
 DIST cracklib-2.8.9-r1.tbz2 270339 RMD160 d1c623ca5bd0cf0fe5e815015ca71baf7be80715 SHA1 d9a83d4527b4f76ebabeff3903536dabd1eef72b SHA256 8dd89b018d31573f6bf5aea273f4147e8bbbc4711dd1c9c0cdd60f3a14b67185
 DIST cups-1.2.6-nossl.tbz2 2350315 RMD160 bd970a9c5830fe886c56b973444df2a2b07aff2b SHA1 97251cbbfb77e3e5fbbdbbbdb35f44f5b7a87447 SHA256 0081ac624ac39276bf69809d82d3263d6bc2709b754f76ee1f1c37b178c55c37
-DIST cups-1.2.6.tbz2 2360103 RMD160 e6eb975bc1e9009d0afd72ad030740f1cee74ac3 SHA1 351d7e0f2dc717bed31809eba88930681b2d75d0 SHA256 0ad7675e7e5c7cb9afe41a072b1c1161b1192466544bfb0035c0dbf0a83aa353
 DIST db-4.0.14-r3.tbz2 1145555 RMD160 7d833f8969d6e71657422123a79756fab6dc485c SHA1 c42682c7554da7bb5f2873131457dc6d3bdcf5d0 SHA256 c1d78854dcdd7c44b05adeebf2980cf9652373066cc3ba80fafadc6ba7669deb
 DIST db-4.2.52_p4-r2.tbz2 1517284 RMD160 0dcc49736c88d6072a5a4d66f736f008d42dff20 SHA1 00566a7d87cfcd7b847fa0fc821a80480308b064 SHA256 b215b71a50c49312392b549f4398273abc6d40f86ed87a0d7f41757206d2a795
 DIST dbus-1.0.2.tbz2 512875 RMD160 96205fcb574c9c59f9b0710e05bad4856318c413 SHA1 8d9495b08aa7978ac6a06391c90b846eb40feb96 SHA256 579ce552280bf9dfeec71280a11495fa76b8eb27e2ece22f8013167804eb594a
@@ -50,10 +49,10 @@ EBUILD emul-linux-x86-baselibs-10.0-r1.ebuild 3030 RMD160 54a047b07e5769c1dc58d4
 MD5 2c14bdd13297b122fafd3d98c7b4b0e1 emul-linux-x86-baselibs-10.0-r1.ebuild 3030
 RMD160 54a047b07e5769c1dc58d4e7e7ebc1f60b797463 emul-linux-x86-baselibs-10.0-r1.ebuild 3030
 SHA256 b04de5532a4f9ea26e920a2328168e2d458d5f25f85fe6e3f280753ec4ca99a5 emul-linux-x86-baselibs-10.0-r1.ebuild 3030
-EBUILD emul-linux-x86-baselibs-10.0.ebuild 2954 RMD160 7f1a22406fb3dbcdcfa695604811743358e0cb3b SHA1 ac1069c6544bb3f092a702058060fc19a71d0c79 SHA256 fe1d09814985895f0a1818ef578886fbbf493517404c23943edbc82a4834176b
-MD5 577c44f27e375aa4b08dea71b249ccdc emul-linux-x86-baselibs-10.0.ebuild 2954
-RMD160 7f1a22406fb3dbcdcfa695604811743358e0cb3b emul-linux-x86-baselibs-10.0.ebuild 2954
-SHA256 fe1d09814985895f0a1818ef578886fbbf493517404c23943edbc82a4834176b emul-linux-x86-baselibs-10.0.ebuild 2954
+EBUILD emul-linux-x86-baselibs-10.1.ebuild 2937 RMD160 736ca404b61d2217b1ea000b0c65ed63a657fbc2 SHA1 eec4ecb2911df77de3edd10a84bd173eaf6637f0 SHA256 d494fce1ec2130b81f6a5ba5413641314a41230ce2bd77faf6b5794436e2cd14
+MD5 30ecc16a387bb4b4eb31b7e8abe7a57e emul-linux-x86-baselibs-10.1.ebuild 2937
+RMD160 736ca404b61d2217b1ea000b0c65ed63a657fbc2 emul-linux-x86-baselibs-10.1.ebuild 2937
+SHA256 d494fce1ec2130b81f6a5ba5413641314a41230ce2bd77faf6b5794436e2cd14 emul-linux-x86-baselibs-10.1.ebuild 2937
 EBUILD emul-linux-x86-baselibs-2.5.1.ebuild 693 RMD160 79a14cb1f5dbc6f0aedb07f0c03964276382ae17 SHA1 ebf94bba568bcee7a90a3b399b5e2a2fb5ae6cc0 SHA256 c4539b1dd968c0e748364ef2b2c1e5729ba65b564e3ce58a2af300dc59c4f9da
 MD5 9a4f8be0444e048e6b7306d6e846a738 emul-linux-x86-baselibs-2.5.1.ebuild 693
 RMD160 79a14cb1f5dbc6f0aedb07f0c03964276382ae17 emul-linux-x86-baselibs-2.5.1.ebuild 693
@@ -74,20 +73,20 @@ EBUILD emul-linux-x86-baselibs-2.5.5.ebuild 677 RMD160 48ea77f138d7539f832ab3730
 MD5 8ed540342179049281b88885ef528b39 emul-linux-x86-baselibs-2.5.5.ebuild 677
 RMD160 48ea77f138d7539f832ab373053d983cdcda0e33 emul-linux-x86-baselibs-2.5.5.ebuild 677
 SHA256 4e4e0f5446b6178cc59321f1b4fec2c45630b1d306a843ac9d33de98041c34fd emul-linux-x86-baselibs-2.5.5.ebuild 677
-MISC ChangeLog 11656 RMD160 635eca3c1ecbdc90a4c3ecfea5302321c560d8b8 SHA1 20ec0f69ce7b58e2921ee9c1089578b36fc75816 SHA256 95d175d62fe53577b9b908b1e3b0c2fc277cf9799a1b0504cede0c631ce274ff
-MD5 8723f68b2e8d732c31599f78a25080fa ChangeLog 11656
-RMD160 635eca3c1ecbdc90a4c3ecfea5302321c560d8b8 ChangeLog 11656
-SHA256 95d175d62fe53577b9b908b1e3b0c2fc277cf9799a1b0504cede0c631ce274ff ChangeLog 11656
+MISC ChangeLog 11847 RMD160 e56575cac3c4f5d9f8dcdf2add7964592a930c1a SHA1 05050de6109ae3583b5eb24de516ab23497bb1e7 SHA256 3a712d3954e6e5a4e0ed071033bcefe8a6d53aec7eadf5c2525f066620b3bc30
+MD5 e4ce212bdff9331c29720b993dd80b8a ChangeLog 11847
+RMD160 e56575cac3c4f5d9f8dcdf2add7964592a930c1a ChangeLog 11847
+SHA256 3a712d3954e6e5a4e0ed071033bcefe8a6d53aec7eadf5c2525f066620b3bc30 ChangeLog 11847
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
 SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
-MD5 2de0474595a32c450f57ba6dffd62670 files/digest-emul-linux-x86-baselibs-10.0 8969
-RMD160 c6d2bb5d83b88bd67e6364153a8357c7d29674f8 files/digest-emul-linux-x86-baselibs-10.0 8969
-SHA256 ad5f6366a2d59262b4a651b4c08ad70d40f6cbf53424c157f83ea1a0b72866ac files/digest-emul-linux-x86-baselibs-10.0 8969
 MD5 1e577c39db034130d040744bb6d5d3fc files/digest-emul-linux-x86-baselibs-10.0-r1 8987
 RMD160 7199d45660d4a7a22bbd35334676c84a2c8103a7 files/digest-emul-linux-x86-baselibs-10.0-r1 8987
 SHA256 5719d38769dba18397307fcb3b45121b7011f02806683616400d62b665abf6bf files/digest-emul-linux-x86-baselibs-10.0-r1 8987
+MD5 320c02c13a56ee8406c59ef02932f2ba files/digest-emul-linux-x86-baselibs-10.1 8752
+RMD160 f3c99d7c3bd7590f82b0fb44f4fd17afdae41d8e files/digest-emul-linux-x86-baselibs-10.1 8752
+SHA256 805a4b5ee9e2a6d38c020de301ae4e8bee76c3cc91ca6a2be19d77ff107ffb28 files/digest-emul-linux-x86-baselibs-10.1 8752
 MD5 ef0336e032b994d49b12ec120d36a9bc files/digest-emul-linux-x86-baselibs-2.5.1 295
 RMD160 12f07fcdfb0d170a21e0b4447d8a4ed57b93a59f files/digest-emul-linux-x86-baselibs-2.5.1 295
 SHA256 a9329090c9886142f507466f9bc64a16668abcdcb2d36ac04412e0c30aaf5ad6 files/digest-emul-linux-x86-baselibs-2.5.1 295

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
similarity index 76%
rename from app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.0.ebuild
rename to app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-10.1.ebuild
index 40ae9cb17ecf88e50fd351c390c55ba81378f807..396548fc51964bfc06ffc960871b55daba234244 100644 (file)
--- 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
similarity index 94%
rename from app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.0
rename to app-emulation/emul-linux-x86-baselibs/files/digest-emul-linux-x86-baselibs-10.1
index 3f14ec22a0a4892328fdd306a725bdf61bfa3cb1..a96ff71cad13f7563a72f88544090a43f7eeda16 100644 (file)
--- 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