Version bump. Remove old versions.

Package-Manager: portage-2.1.2-r10

15 files changed, 57 insertions, 534 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 59e584e2cdcb..43cdb2cb65e3 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.47 2007/02/16 14:23:57 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.48 2007/02/24 04:24:46 pioto Exp $
+
+*paludis-0.20.0 (24 Feb 2007)
+
+  24 Feb 2007; Mike Kelly <pioto@gentoo.org>
+  -files/paludis-0.14.3-ruby-so.patch, -files/paludis-0.16.0-gcc34.patch,
+  -files/paludis-0.18.0-do_config.patch,
+  +files/paludis-0.20.0-dotfiles.patch, -paludis-0.14.3.ebuild,
+  -paludis-0.16.0.ebuild, -paludis-0.16.1.ebuild, -paludis-0.18.0.ebuild,
+  +paludis-0.20.0.ebuild:
+  Version bump. Remove old versions.
 
   16 Feb 2007; Mike Kelly <pioto@gentoo.org> paludis-0.18.1.ebuild:
   Dep on >=app-shells/bash-3.1 now (we use += in some places).
 
+*paludis-0.18.1 (08 Feb 2007)
+
   08 Feb 2007; Fernando J. Pereda <ferdy@gentoo.org> paludis-0.18.1.ebuild:
   New upstream version.
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 6b404e7a42df..2861860c20ef 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,78 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX paludis-0.14.3-ruby-so.patch 2928 RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 SHA1 2ed6ec390895f2b3989e9524530161cf8cc20a6d SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78
-MD5 6e833fdf8bb2c4776daed146a6cee01a files/paludis-0.14.3-ruby-so.patch 2928
-RMD160 44bd41903c00dc0b4f0de72c8013ef741cfffed6 files/paludis-0.14.3-ruby-so.patch 2928
-SHA256 cd32065d3188910759e6dcd211c5ba0e6edbd9e6b7cfa4de82d09449b8a84b78 files/paludis-0.14.3-ruby-so.patch 2928
-AUX paludis-0.16.0-gcc34.patch 1128 RMD160 4f2022d4a97ee826b117f411e6bb8b49c24df3cd SHA1 9e96ab51cc06f73cc1fc179138db360f6fd2f4d7 SHA256 cc32da718d25b0e13fa12feb10cc2370d5006d68f334a4e3992a7ca1114d4063
-MD5 1e21317afc1ca58f768015dfe558cd53 files/paludis-0.16.0-gcc34.patch 1128
-RMD160 4f2022d4a97ee826b117f411e6bb8b49c24df3cd files/paludis-0.16.0-gcc34.patch 1128
-SHA256 cc32da718d25b0e13fa12feb10cc2370d5006d68f334a4e3992a7ca1114d4063 files/paludis-0.16.0-gcc34.patch 1128
-AUX paludis-0.18.0-do_config.patch 369 RMD160 33a3d64b75685c076c9cf93eb2eb8e0ec9dd7e2e SHA1 d11ca049c32ff134a4c822ba4c2f09d46b119d7a SHA256 92c9da3f5a852770f39775e84a71931ea7d112fa0257137ec6507ebc89b0a10c
-MD5 20af40437967747fc7b31615eb5325ae files/paludis-0.18.0-do_config.patch 369
-RMD160 33a3d64b75685c076c9cf93eb2eb8e0ec9dd7e2e files/paludis-0.18.0-do_config.patch 369
-SHA256 92c9da3f5a852770f39775e84a71931ea7d112fa0257137ec6507ebc89b0a10c files/paludis-0.18.0-do_config.patch 369
-DIST paludis-0.14.3.tar.bz2 1254602 RMD160 e5a33425072ef2d71236dd78708146195ebb3008 SHA1 6c93bfcdb3ed4a5886057c97fb3b2c5bee245087 SHA256 343e6dfd382a84ca80d70f6bdb226fcf94e9a26c3aa9c7e5c3b1edb48ff078d2
-DIST paludis-0.16.0.tar.bz2 1311995 RMD160 34de8430d6571163563199d731acc2ea8bb6eb56 SHA1 901fd160227274c69ef47ec827b350dfad811a82 SHA256 d94bfbb80f2d09ce916f995664e9e15ac088847ee5d7521b1d7c6d84bac38217
-DIST paludis-0.16.1.tar.bz2 1312849 RMD160 39b7f2f1968dcc599e3eece427ad3883f891fdc1 SHA1 efeeceac6d1e7f700472e2118f3768415805a3ec SHA256 cc87600f4b49649e33fda3568958e4e9d7dfb3fe1c1bb2c490ec383b449b74f5
+AUX paludis-0.20.0-dotfiles.patch 438 RMD160 340dac9b5cea826c4b92b5482f86652f063d8ac4 SHA1 e296be80fe7ec14d42aab3e7e405d29973bde4cd SHA256 5163a2966a946dc431d3ad59d6af72cd1f2660fc150afa94c103d2c575fdfc73
+MD5 998ee2ca20d1ff8a2fef5adfc0d70910 files/paludis-0.20.0-dotfiles.patch 438
+RMD160 340dac9b5cea826c4b92b5482f86652f063d8ac4 files/paludis-0.20.0-dotfiles.patch 438
+SHA256 5163a2966a946dc431d3ad59d6af72cd1f2660fc150afa94c103d2c575fdfc73 files/paludis-0.20.0-dotfiles.patch 438
 DIST paludis-0.16.2.tar.bz2 1314288 RMD160 5930536b05e2324861f168d3ffc7201c5865082a SHA1 a1655b5ebc6caa6986868b7a9f0756b1a15fb1e6 SHA256 0bc8d051e593d1269e040b25760940b119d8e843ef6e66234a917c540ff26025
-DIST paludis-0.18.0.tar.bz2 1324497 RMD160 e18ce332b5fb86f4ec195b343fca3833ee27f77e SHA1 069464dc899b1d28e25c2d0dc8d41fc91d79f759 SHA256 170d971ce18377f3705a1b400fb6f4bbb0384678be53708772da00300ab4c25c
 DIST paludis-0.18.1.tar.bz2 1326891 RMD160 603218762efa4e468b4e1117579de2710a887378 SHA1 d8a157cef29bff749abd925bc06fe23225a70da9 SHA256 4ed291796ac8287d565cb301a3b6bc4cf9f06b76e823431af6c1695d7d866720
-EBUILD paludis-0.14.3.ebuild 3183 RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 SHA1 45717dd03d3782ce798d76f24dc7c2d42f93ae3d SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3
-MD5 4a2d4a6cc2815b3b9f3e3699634373b1 paludis-0.14.3.ebuild 3183
-RMD160 ebb6a1af610968f5f0320e3cf5ed9ad948e4ccd2 paludis-0.14.3.ebuild 3183
-SHA256 1ffe8b1099370c8c26f2c7151be0bf9fad0139ea7f5eb9ddf2b446392925c3a3 paludis-0.14.3.ebuild 3183
-EBUILD paludis-0.16.0.ebuild 3180 RMD160 d2ebb7191e591b02abfb04ff17fea6ca146721cc SHA1 af3bac32e8b167e7867a320cbce1bacc6c1a4ead SHA256 3c4147c9bab6595778b5c8ff1502ce951b26b073a97522cdc1261778875935f7
-MD5 7f9b3d03c523925f202138179c9f0d80 paludis-0.16.0.ebuild 3180
-RMD160 d2ebb7191e591b02abfb04ff17fea6ca146721cc paludis-0.16.0.ebuild 3180
-SHA256 3c4147c9bab6595778b5c8ff1502ce951b26b073a97522cdc1261778875935f7 paludis-0.16.0.ebuild 3180
-EBUILD paludis-0.16.1.ebuild 3098 RMD160 4a16c4d6043cc52bbee8c0c6876231abb78dbf1a SHA1 38345cd60b292b0deccfa59c258f0505626f687a SHA256 f386c53a523e00c9f026a8413815876cdc8cb529fe621ed7661abe768d3348e5
-MD5 9832a21329069a9f2b1a15a9322e0b66 paludis-0.16.1.ebuild 3098
-RMD160 4a16c4d6043cc52bbee8c0c6876231abb78dbf1a paludis-0.16.1.ebuild 3098
-SHA256 f386c53a523e00c9f026a8413815876cdc8cb529fe621ed7661abe768d3348e5 paludis-0.16.1.ebuild 3098
+DIST paludis-0.20.0.tar.bz2 1374604 RMD160 ec69ae0a1826f4e511efc7f23578421572ae3d36 SHA1 47125b810955928f92db34e34c9f8026180112af SHA256 9dcc15a8f6d1a9b26afbdfa51c42cf4a4b1d264af6615e239cf5c24c75010dde
 EBUILD paludis-0.16.2.ebuild 3098 RMD160 6a08a0b79b36e99340ece26f21a5189146ad1e98 SHA1 4659b08ad5b49ae6337b81294cc8209609b6a3d8 SHA256 2341eea6da711a9d72a2ef050e54272adf42eace56558517c0fc3f464ddcc3b3
 MD5 9cd9db41adb7752f511ef01aff0146c9 paludis-0.16.2.ebuild 3098
 RMD160 6a08a0b79b36e99340ece26f21a5189146ad1e98 paludis-0.16.2.ebuild 3098
 SHA256 2341eea6da711a9d72a2ef050e54272adf42eace56558517c0fc3f464ddcc3b3 paludis-0.16.2.ebuild 3098
-EBUILD paludis-0.18.0.ebuild 3079 RMD160 3f5d73768fd1014564bada402bdce3bbfc808173 SHA1 63996f785ee7a0343e17b69643715c7315894088 SHA256 dcedb6e28037309ad90d38629898b8322dc161e7a6f4cb9c5fd31165550c8512
-MD5 68ad488bdc1aa54fd322e0bde47293e8 paludis-0.18.0.ebuild 3079
-RMD160 3f5d73768fd1014564bada402bdce3bbfc808173 paludis-0.18.0.ebuild 3079
-SHA256 dcedb6e28037309ad90d38629898b8322dc161e7a6f4cb9c5fd31165550c8512 paludis-0.18.0.ebuild 3079
 EBUILD paludis-0.18.1.ebuild 3034 RMD160 da40dfff3fa0ef166040a996a415ea8c0c031ed9 SHA1 3a9aa90c88ca962468cae2e6377a4bf09e6183ea SHA256 9a8a97b5cb2348427335a37c8c9246f6ad563fe2803d7faaf3aceca751b8e45e
 MD5 bd020341420bae61b5daefc9b4af4937 paludis-0.18.1.ebuild 3034
 RMD160 da40dfff3fa0ef166040a996a415ea8c0c031ed9 paludis-0.18.1.ebuild 3034
 SHA256 9a8a97b5cb2348427335a37c8c9246f6ad563fe2803d7faaf3aceca751b8e45e paludis-0.18.1.ebuild 3034
-MISC ChangeLog 6635 RMD160 2c1f345f6839546ca1bb8a6225577af93b1f6d8d SHA1 4b5f73a7fce90c96d204f4c0f767a8e76ab8162b SHA256 6ceb5f643241918e24c6f87dac53564d5469a06aa841efd6d4971fd2ca0ba27b
-MD5 69b1e9656ca1991b937eca9e872c1536 ChangeLog 6635
-RMD160 2c1f345f6839546ca1bb8a6225577af93b1f6d8d ChangeLog 6635
-SHA256 6ceb5f643241918e24c6f87dac53564d5469a06aa841efd6d4971fd2ca0ba27b ChangeLog 6635
+EBUILD paludis-0.20.0.ebuild 3146 RMD160 13145dd33c9e155b894c8b8d7223d263e5318e0b SHA1 3ddd4f96fcdeff24667891ae23ae16bef9f2ef8d SHA256 6bb0dad63ba3243f8b62fc8053ce59455872fe37053c5283f1fcb688754d5404
+MD5 32b5ddeb973ddf4cdb0ebcb7d837444e paludis-0.20.0.ebuild 3146
+RMD160 13145dd33c9e155b894c8b8d7223d263e5318e0b paludis-0.20.0.ebuild 3146
+SHA256 6bb0dad63ba3243f8b62fc8053ce59455872fe37053c5283f1fcb688754d5404 paludis-0.20.0.ebuild 3146
+MISC ChangeLog 7059 RMD160 53462760d4029e3460eac1b5a3e72df0eeb9903b SHA1 c3250e78a29cb1be7da3ee04e07a9c24b73efe84 SHA256 fec24e5ecbec010f873d5db709f5aa682cc5e0abab8dac79901708c54e943bde
+MD5 c5b3ae96cd811878760fb70a7ca058b3 ChangeLog 7059
+RMD160 53462760d4029e3460eac1b5a3e72df0eeb9903b ChangeLog 7059
+SHA256 fec24e5ecbec010f873d5db709f5aa682cc5e0abab8dac79901708c54e943bde ChangeLog 7059
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
 MD5 8c5e29d94c8a82c144af81732a6eaf13 metadata.xml 215
 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e metadata.xml 215
 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1 metadata.xml 215
-MD5 99ac0ea1f860ae7c93ae65c757cba997 files/digest-paludis-0.14.3 250
-RMD160 a7c42d8d13eee637a534bb505f71f6730188153e files/digest-paludis-0.14.3 250
-SHA256 783bcf24487da267064058eff6e690c5aaf0b552dd3c8c33191572ad275dc303 files/digest-paludis-0.14.3 250
-MD5 4d1b4e83e157827395657b29621f4004 files/digest-paludis-0.16.0 250
-RMD160 f555bda1f5aae28751e687a01556ac5a6265c163 files/digest-paludis-0.16.0 250
-SHA256 373ff8bab4cfc41197ac2fdd31d22e83fdec4e5eb2f0fe3aac61caf2dbf65420 files/digest-paludis-0.16.0 250
-MD5 e289123a57a52d6734718f51cb090f74 files/digest-paludis-0.16.1 250
-RMD160 f2154e02ccfef6c62fe9f6b84b78fb946953098b files/digest-paludis-0.16.1 250
-SHA256 5cfb6acea637666792e85effe7de918ca7cb7b56fb45c36cf1ee5bc64ac731f4 files/digest-paludis-0.16.1 250
 MD5 7b58294777ad1791ba82ae40e6b8405c files/digest-paludis-0.16.2 250
 RMD160 17e889b7b142f7da41624f1c1157b44b8cb5f514 files/digest-paludis-0.16.2 250
 SHA256 4e773a2526c1098435dd5640ee784c0c6b5cda76859aa530af581db10aa083d2 files/digest-paludis-0.16.2 250
-MD5 11eedb9e928284562a6d0729363d02b3 files/digest-paludis-0.18.0 250
-RMD160 39d6bdbf8de1cbcc33108c29a8391da637694691 files/digest-paludis-0.18.0 250
-SHA256 3c766ab4ffdb691bfeee1cef6f9a0c6b3ad6189d138aa49f5ace288fd401da99 files/digest-paludis-0.18.0 250
 MD5 f4517b0d296f4cb51c6413ecc7696653 files/digest-paludis-0.18.1 250
 RMD160 907beac2d302411d12d48db013278114320ba0d3 files/digest-paludis-0.18.1 250
 SHA256 262ecc884100c4269576dfc2ef85531c621598bbe3545bc3bf1c88e586b72789 files/digest-paludis-0.18.1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF1b6YokMzJ47YCzoRAtwVAKCTmC045UXWYG9nfX3LujlUBnZYngCgsiMF
-91NE84K7wAFZtDUteYQQjnc=
-=EujO
------END PGP SIGNATURE-----
+MD5 7e3aa8fa9ce76ed6ffee5ec5ac8cdc6f files/digest-paludis-0.20.0 250
+RMD160 7dfcc07fef0630d581bfeef9fbdd7455bb4e37ad files/digest-paludis-0.20.0 250
+SHA256 094d34bb8b98c4aa6f4381ae70db01c07a993e5911fd2524af30a3d3f119d533 files/digest-paludis-0.20.0 250
diff --git a/sys-apps/paludis/files/digest-paludis-0.14.3 b/sys-apps/paludis/files/digest-paludis-0.14.3
deleted file mode 100644
index abef3311bc58..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.14.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aff589c5f44889fa7db4a3f555cbff5d paludis-0.14.3.tar.bz2 1254602
-RMD160 e5a33425072ef2d71236dd78708146195ebb3008 paludis-0.14.3.tar.bz2 1254602
-SHA256 343e6dfd382a84ca80d70f6bdb226fcf94e9a26c3aa9c7e5c3b1edb48ff078d2 paludis-0.14.3.tar.bz2 1254602
diff --git a/sys-apps/paludis/files/digest-paludis-0.16.0 b/sys-apps/paludis/files/digest-paludis-0.16.0
deleted file mode 100644
index 33708c2d5e4f..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.16.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b3ab53ee047702481955fe6b73046ea6 paludis-0.16.0.tar.bz2 1311995
-RMD160 34de8430d6571163563199d731acc2ea8bb6eb56 paludis-0.16.0.tar.bz2 1311995
-SHA256 d94bfbb80f2d09ce916f995664e9e15ac088847ee5d7521b1d7c6d84bac38217 paludis-0.16.0.tar.bz2 1311995
diff --git a/sys-apps/paludis/files/digest-paludis-0.16.1 b/sys-apps/paludis/files/digest-paludis-0.16.1
deleted file mode 100644
index 2e90f23de0df..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.16.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2ce50b0c0eec4e8e75cb43c3aa43a7ba paludis-0.16.1.tar.bz2 1312849
-RMD160 39b7f2f1968dcc599e3eece427ad3883f891fdc1 paludis-0.16.1.tar.bz2 1312849
-SHA256 cc87600f4b49649e33fda3568958e4e9d7dfb3fe1c1bb2c490ec383b449b74f5 paludis-0.16.1.tar.bz2 1312849
diff --git a/sys-apps/paludis/files/digest-paludis-0.18.0 b/sys-apps/paludis/files/digest-paludis-0.18.0
deleted file mode 100644
index aae4021d15a6..000000000000
--- a/sys-apps/paludis/files/digest-paludis-0.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a16a14cba503c4c9b572a9e7665c41d1 paludis-0.18.0.tar.bz2 1324497
-RMD160 e18ce332b5fb86f4ec195b343fca3833ee27f77e paludis-0.18.0.tar.bz2 1324497
-SHA256 170d971ce18377f3705a1b400fb6f4bbb0384678be53708772da00300ab4c25c paludis-0.18.0.tar.bz2 1324497
diff --git a/sys-apps/paludis/files/digest-paludis-0.20.0 b/sys-apps/paludis/files/digest-paludis-0.20.0
new file mode 100644
index 000000000000..fa11a7711be6
--- /dev/null
+++ b/sys-apps/paludis/files/digest-paludis-0.20.0
@@ -0,0 +1,3 @@
+MD5 0637a2d688baccf2302e11b9e95cd30e paludis-0.20.0.tar.bz2 1374604
+RMD160 ec69ae0a1826f4e511efc7f23578421572ae3d36 paludis-0.20.0.tar.bz2 1374604
+SHA256 9dcc15a8f6d1a9b26afbdfa51c42cf4a4b1d264af6615e239cf5c24c75010dde paludis-0.20.0.tar.bz2 1374604
diff --git a/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch b/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
deleted file mode 100644
index 81595a0dc439..000000000000
--- a/sys-apps/paludis/files/paludis-0.14.3-ruby-so.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: ruby/Makefile.am
-===================================================================
---- ruby/Makefile.am	(revision 2133)
-+++ ruby/Makefile.am	(revision 2165)
-@@ -84,6 +84,7 @@
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/default/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/environment/no_config/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/dep_list/.libs\`: \
-+			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/qa/.libs\`: \
- 			\`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/libxml/.libs\`" \
- 			| tr -d ' '` \
-@@ -207,6 +208,7 @@
- 	    $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
- 	    $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
- 	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
-+	    $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so \
- 	    $(top_builddir)/paludis/qa/.libs/libpaludisqa.so \
- 	    $(top_builddir)/paludis/libxml/.libs/libpaludislibxml.so \
- 	    $(PCREPLUSPLUS_LIBS)
-@@ -223,6 +225,7 @@
- 	    -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
- 	    -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
- 	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
-+	    -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories \
- 	    -L$(top_builddir)/paludis/qa/.libs/ -lpaludisqa \
- 	    -L$(top_builddir)/paludis/libxml/.libs/ -lpaludislibxml \
- 	    $(PCREPLUSPLUS_LIBS)
-@@ -240,8 +243,9 @@
- 	    $(top_builddir)/paludis/util/.libs/libpaludisutil.so \
- 	    $(top_builddir)/paludis/.libs/libpaludis.so \
- 	    $(top_builddir)/paludis/environment/default/.libs/libpaludisdefaultenvironment.so \
--	    $(top_builddir)/paludis/environment/no_config/.libs/libpaldisnoconfigenvironment.so \
--	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so
-+	    $(top_builddir)/paludis/environment/no_config/.libs/libpaludisnoconfigenvironment.so \
-+	    $(top_builddir)/paludis/dep_list/.libs/libpaludisdeplist.so \
-+	    $(top_builddir)/paludis/repositories/.libs/libpaludisrepositories.so
- 
- Paludis.so : $(OUR_OBJECTS)
- 	$(CXX) -fPIC -shared $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -254,7 +258,8 @@
- 	    -L$(top_builddir)/paludis/.libs/ -lpaludis \
- 	    -L$(top_builddir)/paludis/environment/default/.libs/ -lpaludisdefaultenvironment \
- 	    -L$(top_builddir)/paludis/environment/no_config/.libs/ -lpaludisnoconfigenvironment \
--	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist
-+	    -L$(top_builddir)/paludis/dep_list/.libs -lpaludisdeplist \
-+	    -L$(top_builddir)/paludis/repositories/.libs -lpaludisrepositories
- 
- endif
- 
diff --git a/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch b/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
deleted file mode 100644
index fa7257c8ccf2..000000000000
--- a/sys-apps/paludis/files/paludis-0.16.0-gcc34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: paludis-0.16.0/paludis/dep_list/dep_list.cc
-===================================================================
---- paludis-0.16.0.orig/paludis/dep_list/dep_list.cc
-+++ paludis-0.16.0/paludis/dep_list/dep_list.cc
-@@ -1117,7 +1117,7 @@ DepList::add_error_package(const Package
-     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
-             _imp->merge_list_index.equal_range(p.name));
- 
--    for ( ; pp.first != pp.second ; ++pp.first)
-+    for ( ; pp.second != pp.first ; ++pp.first)
-     {
-         if (pp.first->second->kind == kind && pp.first->second->package == p)
-         {
-@@ -1156,7 +1156,7 @@ DepList::add_suggested_package(const Pac
-     std::pair<MergeListIndex::iterator, MergeListIndex::const_iterator> pp(
-             _imp->merge_list_index.equal_range(p.name));
- 
--    for ( ; pp.first != pp.second ; ++pp.first)
-+    for ( ; pp.second != pp.first ; ++pp.first)
-     {
-         if ((pp.first->second->kind == dlk_suggested || pp.first->second->kind == dlk_already_installed
-                     || pp.first->second->kind == dlk_package || pp.first->second->kind == dlk_provided
\ No newline at end of file
diff --git a/sys-apps/paludis/files/paludis-0.18.0-do_config.patch b/sys-apps/paludis/files/paludis-0.18.0-do_config.patch
deleted file mode 100644
index 586c83c01875..000000000000
--- a/sys-apps/paludis/files/paludis-0.18.0-do_config.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: src/clients/paludis/do_config.cc
-===================================================================
---- src/clients/paludis/do_config.cc    (revision 2400)
-+++ src/clients/paludis/do_config.cc    (working copy)
-@@ -41,6 +41,10 @@
-             matches(m)
-         {
-         }
-+
-+        ~AmbiguousConfigTarget() throw ()
-+        {
-+        }
-     };
-
-     int
diff --git a/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch b/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch
new file mode 100644
index 000000000000..30f09a506b68
--- /dev/null
+++ b/sys-apps/paludis/files/paludis-0.20.0-dotfiles.patch
@@ -0,0 +1,13 @@
+Index: paludis/merger/merger.cc
+===================================================================
+--- paludis/merger/merger.cc	(revision 2510)
++++ paludis/merger/merger.cc	(revision 2511)
+@@ -144,7 +144,7 @@
+ 
+     on_enter_dir(is_check, src);
+ 
+-    for (DirIterator d(src), d_end ; d != d_end ; ++d)
++    for (DirIterator d(src, false), d_end ; d != d_end ; ++d)
+     {
+         MergerEntryType m(entry_type(*d));
+         switch (m)
diff --git a/sys-apps/paludis/paludis-0.14.3.ebuild b/sys-apps/paludis/paludis-0.14.3.ebuild
deleted file mode 100644
index 360a41e50863..000000000000
--- a/sys-apps/paludis/paludis-0.14.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.14.3.ebuild,v 1.2 2007/01/14 23:12:29 kugelfang Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/${P}-ruby-so.patch
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README ChangeLog NEWS
-
-	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
-	BASH_COMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		doins zsh-completion/_paludis_packages
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	emake check || die "Make check failed"
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.16.0.ebuild b/sys-apps/paludis/paludis-0.16.0.ebuild
deleted file mode 100644
index a339940b21b8..000000000000
--- a/sys-apps/paludis/paludis-0.16.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.0.ebuild,v 1.2 2007/01/25 17:51:40 phreak Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc34.patch"
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README ChangeLog NEWS
-
-	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
-	BASH_COMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		doins zsh-completion/_paludis_packages
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	emake check || die "Make check failed"
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.16.1.ebuild b/sys-apps/paludis/paludis-0.16.1.ebuild
deleted file mode 100644
index d68df5f863ba..000000000000
--- a/sys-apps/paludis/paludis-0.16.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.16.1.ebuild,v 1.1 2007/01/26 21:51:27 eroyf Exp $
-
-inherit bash-completion eutils flag-o-matic
-
-DESCRIPTION="paludis, the other package mangler"
-HOMEPAGE="http://paludis.pioto.org/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="contrarius cran doc glsa pink qa ruby selinux zsh-completion"
-
-COMMON_DEPEND="
-	>=app-shells/bash-3
-	selinux? ( sys-libs/libselinux )
-	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
-	glsa? ( >=dev-libs/libxml2-2.6 )
-	ruby? ( >=dev-lang/ruby-1.8 )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/libebt
-	>=dev-cpp/libwrapiter-1.0.0
-	doc? ( app-doc/doxygen media-gfx/imagemagick )"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-admin/eselect-1.0.2
-	net-misc/wget
-	net-misc/rsync
-	!mips? ( sys-apps/sandbox )"
-
-PROVIDE="virtual/portage"
-
-pkg_setup() {
-	# gcc generates bad code...
-	use amd64 && replace-flags -Os -O2
-
-	if is-ldflagq -Wl,--as-needed || is-ldflagq --as-needed ; then
-		echo
-		ewarn "Stripping as-needed from LDFLAGS."
-		ewarn "You should not set this variable globally. Please read:"
-		ewarn "    http://ciaranm.org/show_post.pl?post_id=13"
-		echo
-		epause 10
-	fi
-	filter-ldflags -Wl,--as-needed --as-needed
-}
-
-src_compile() {
-	local repositories=`echo default $(usev cran) | tr -s \  ,`
-	local clients=`echo default $(usev contrarius) | tr -s \  ,`
-	econf \
-		$(use_enable doc doxygen ) \
-		$(use_enable !mips sandbox ) \
-		$(use_enable pink) \
-		$(use_enable selinux) \
-		$(use_enable qa) \
-		$(use_enable ruby) \
-		$(use_enable glsa) \
-		--with-repositories=${repositories} \
-		--with-clients=${clients} \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-	if use doc ; then
-		make doxygen || die "make doxygen failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS README ChangeLog NEWS
-
-	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
-	BASH_COMPLETION_NAME="paludis" dobashcompletion bash-completion/paludis
-	use qa && \
-		BASH_COMPLETION_NAME="qualudis" dobashcompletion bash-completion/qualudis
-
-	if use doc ; then
-		dohtml -r -V doc/www/*
-	fi
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins zsh-completion/_paludis
-		doins zsh-completion/_adjutrix
-		doins zsh-completion/_paludis_packages
-	fi
-}
-
-src_test() {
-	# Work around Portage bugs
-	export PALUDIS_DO_NOTHING_SANDBOXY="portage sucks"
-	export BASH_ENV=/dev/null
-
-	emake check || die "Make check failed"
-}
-
-pkg_postinst() {
-	if use bash-completion ; then
-		echo
-		einfo "The following bash completion scripts have been installed:"
-		einfo "  paludis"
-		einfo "  adjutrix"
-		use qa && einfo "  qualudis"
-		einfo
-		einfo "To enable these scripts, run:"
-		einfo "  eselect bashcomp enable <scriptname>"
-	fi
-
-	echo
-	einfo "Before using Paludis and before reporting issues, you should read:"
-	einfo "    http://paludis.pioto.org/faq.html"
-	echo
-}
-
diff --git a/sys-apps/paludis/paludis-0.18.0.ebuild b/sys-apps/paludis/paludis-0.20.0.ebuild
index 3c9fd2f9b12f..a664b8d183ac 100644
--- a/sys-apps/paludis/paludis-0.18.0.ebuild
+++ b/sys-apps/paludis/paludis-0.20.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/sys-apps/paludis/paludis-0.18.0.ebuild,v 1.2 2007/02/07 21:28:32 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/paludis-0.20.0.ebuild,v 1.1 2007/02/24 04:24:46 pioto Exp $
 
 inherit bash-completion eutils flag-o-matic
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
 IUSE="contrarius cran doc glsa inquisitio pink qa ruby selinux zsh-completion"
 
 COMMON_DEPEND="
-	>=app-shells/bash-3
+	>=app-shells/bash-3.1
 	selinux? ( sys-libs/libselinux )
 	qa? ( dev-libs/pcre++ >=dev-libs/libxml2-2.6 app-crypt/gnupg )
 	inquisitio? ( dev-libs/pcre++ )
@@ -34,7 +34,8 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 	>=app-admin/eselect-1.0.2
 	net-misc/wget
-	net-misc/rsync"
+	net-misc/rsync
+	!mips? ( sys-apps/sandbox )"
 
 PROVIDE="virtual/portage"
 
@@ -42,13 +43,15 @@ pkg_setup() {
 	replace-flags -Os -O2
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-dotfiles.patch"
+}
+
 src_compile() {
 	local repositories=`echo default $(usev cran) | tr -s \  ,`
 	local clients=`echo default $(usev contrarius) $(usev inquisitio) | tr -s \  ,`
-
-	# Fix bug #165824
-	epatch ${FILESDIR}/${P}-do_config.patch
-
 	econf \
 		$(use_enable doc doxygen ) \
 		$(use_enable !mips sandbox ) \
@@ -68,7 +71,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc AUTHORS README ChangeLog NEWS
 
 	BASH_COMPLETION_NAME="adjutrix" dobashcompletion bash-completion/adjutrix
@@ -114,4 +117,3 @@ pkg_postinst() {
 	einfo "    http://paludis.pioto.org/faq.html"
 	echo
 }
-