Cleanup, Version bump (Bug #133187), add myself as maintainer, fix autotools handling (Bug #160169)

Package-Manager: portage-2.1.3_rc8

15 files changed, 203 insertions, 81 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 13bf5537414d..477970a4698b 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.94 2007/07/08 18:47:30 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.95 2007/07/22 09:23:51 dertobi123 Exp $
+
+*cyrus-imapd-2.2.13 (22 Jul 2007)
+
+  22 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/cyrus-imapd-2.2.12-db45.patch, +files/cyrus-imapd-2.2-db45.patch,
+  -files/cyrus-imapd-2.2.12-libwrap.patch,
+  +files/cyrus-imapd-2.2.13-afs.patch, +files/cyrus-imapd-2.2.13-drac.patch,
+  +files/cyrus-imapd-2.2.13-pts.patch, +files/cyrus-imapd-2.2-libwrap.patch,
+  metadata.xml, -cyrus-imapd-2.2.12.ebuild, cyrus-imapd-2.2.12-r4.ebuild,
+  cyrus-imapd-2.2.12-r5.ebuild, +cyrus-imapd-2.2.13.ebuild:
+  Cleanup, Version bump (Bug #133187), add myself as maintainer, fix autotools
+  handling (Bug #160169)
 
   08 Jul 2007; Samuli Suominen <drac@gentoo.org> files/cyrus.rc6:
   Replace "need net" with "use net" for bug 116534.
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index e6383bb9254e..cf2e927b88c9 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,3 +1,11 @@
+AUX cyrus-imapd-2.2-db45.patch 1283 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 SHA1 b074166f6092ee58db685038c45382f77479bdb1 SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e
+MD5 94e33770741d5309d51ba7f4edbe1fc5 files/cyrus-imapd-2.2-db45.patch 1283
+RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 files/cyrus-imapd-2.2-db45.patch 1283
+SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e files/cyrus-imapd-2.2-db45.patch 1283
+AUX cyrus-imapd-2.2-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
+MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2-libwrap.patch 390
+RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2-libwrap.patch 390
+SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2-libwrap.patch 390
 AUX cyrus-imapd-2.2.10-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.10-drac.patch 926
@@ -6,10 +14,6 @@ AUX cyrus-imapd-2.2.10-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8e
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.10-libwrap.patch 390
 SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.10-libwrap.patch 390
-AUX cyrus-imapd-2.2.12-db45.patch 1283 RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 SHA1 b074166f6092ee58db685038c45382f77479bdb1 SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e
-MD5 94e33770741d5309d51ba7f4edbe1fc5 files/cyrus-imapd-2.2.12-db45.patch 1283
-RMD160 e3925988a6c628eb5567aa482351bb6a8ab01113 files/cyrus-imapd-2.2.12-db45.patch 1283
-SHA256 4d814546280b83cf420855faf067ac95d36818be8b2a9ad9973805f261c1d90e files/cyrus-imapd-2.2.12-db45.patch 1283
 AUX cyrus-imapd-2.2.12-drac.patch 926 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 SHA1 bae33be47b618516caea435d52990abca38e6fe7 SHA256 9c9b297767ef787bc76fa134b178848695199b662860515f0157f59f726b5b84
 MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
 RMD160 7a587e2f756e6058262348d19c80fd27ad169a52 files/cyrus-imapd-2.2.12-drac.patch 926
@@ -18,10 +22,18 @@ AUX cyrus-imapd-2.2.12-gcc4.patch 396 RMD160 b01f76386facd436cd9db247a7a4c31129a
 MD5 77413f5bcf777e10908f9a755e6ff55e files/cyrus-imapd-2.2.12-gcc4.patch 396
 RMD160 b01f76386facd436cd9db247a7a4c31129ae55b8 files/cyrus-imapd-2.2.12-gcc4.patch 396
 SHA256 f5c8e11355df0ac41ede1fa18381241097e143669ba5903c90ff4b20aeed273c files/cyrus-imapd-2.2.12-gcc4.patch 396
-AUX cyrus-imapd-2.2.12-libwrap.patch 390 RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 SHA1 0075421585a73f2673e3daff9a4c140d9cc5046e SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e
-MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.12-libwrap.patch 390
-RMD160 4ed2b14f549ccfab487cff66e5f2cb8ebdd39427 files/cyrus-imapd-2.2.12-libwrap.patch 390
-SHA256 2bddad2045130090ea23f5ad65d797cfa1f6083446bd00411cb1540cb56d4e0e files/cyrus-imapd-2.2.12-libwrap.patch 390
+AUX cyrus-imapd-2.2.13-afs.patch 832 RMD160 1e1926551fe1aa8d6e307fc171ec94f359bcc65b SHA1 e509df991b7428910af9cf26c290b74840ec2949 SHA256 f2b58252a50071df246f35367b53b5bb54d8979f5ebf4e59d13af03f6657c8be
+MD5 6b3778bb8be3026a6cf089c52fb65ef7 files/cyrus-imapd-2.2.13-afs.patch 832
+RMD160 1e1926551fe1aa8d6e307fc171ec94f359bcc65b files/cyrus-imapd-2.2.13-afs.patch 832
+SHA256 f2b58252a50071df246f35367b53b5bb54d8979f5ebf4e59d13af03f6657c8be files/cyrus-imapd-2.2.13-afs.patch 832
+AUX cyrus-imapd-2.2.13-drac.patch 1495 RMD160 c7ebd9768e5508160c606a86b58435eb00b14a27 SHA1 2b08b77921dc4e23bcb0b269391a262e340b3988 SHA256 e2cd3f69cd59dda1b137d597d3fff13fb2d42a9d6c726336be50d08737c29376
+MD5 90e221272e3bc2d01d65946e2008816c files/cyrus-imapd-2.2.13-drac.patch 1495
+RMD160 c7ebd9768e5508160c606a86b58435eb00b14a27 files/cyrus-imapd-2.2.13-drac.patch 1495
+SHA256 e2cd3f69cd59dda1b137d597d3fff13fb2d42a9d6c726336be50d08737c29376 files/cyrus-imapd-2.2.13-drac.patch 1495
+AUX cyrus-imapd-2.2.13-pts.patch 647 RMD160 f321203e723a39508df8812e30ba3a660c5bd526 SHA1 6bcda459c3356b21cea2044b2b40ffdf1069655d SHA256 d775fbc182402b8bf6aec160bc3eedbbb23f4d44f64f07a8ab0d44ef9ca54f77
+MD5 64a35455ea1674129587faeba44a0106 files/cyrus-imapd-2.2.13-pts.patch 647
+RMD160 f321203e723a39508df8812e30ba3a660c5bd526 files/cyrus-imapd-2.2.13-pts.patch 647
+SHA256 d775fbc182402b8bf6aec160bc3eedbbb23f4d44f64f07a8ab0d44ef9ca54f77 files/cyrus-imapd-2.2.13-pts.patch 647
 AUX cyrus-imapd-2.3.1-drac.patch 896 RMD160 8f66ae7ca569964e45f4691cee04e5a078da27e0 SHA1 dec856045905f4f852f6c9748b0a9f5aed3f19c7 SHA256 d8f086c99750e0045215bcc96bf4abbbd1ad48b89b6767de17e3145df170dec0
 MD5 0e81f80785347aff06cecae136fda4e5 files/cyrus-imapd-2.3.1-drac.patch 896
 RMD160 8f66ae7ca569964e45f4691cee04e5a078da27e0 files/cyrus-imapd-2.3.1-drac.patch 896
@@ -80,22 +92,23 @@ RMD160 74e02af5daa7648ce7e366478c1b89b112750e6b files/imapd.conf 1587
 SHA256 69eacd9fffad55f20990fcf3b117fe4e2ac55233515ed70698c65a6deb42503f files/imapd.conf 1587
 DIST cyrus-imapd-2.2.12-64bit-quota.tgz 6537 RMD160 d739761d39656b7081f52f4ba2e5f3428c19203e SHA1 6e850d2279fb25e439f5b786d23bfa59ad49f482 SHA256 a7e1fde21479dbce7441f68e0a86de1947744cea0ec424f759e77583ee7e90f6
 DIST cyrus-imapd-2.2.12.tar.gz 1961161 RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 SHA1 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06 SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b
+DIST cyrus-imapd-2.2.13.tar.gz 2109770 RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 SHA1 ba84b67a1cae4c15d5a588d010764031167970c4 SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c
 DIST cyrus-imapd-2.3.1.tar.gz 2212999 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 SHA1 6af81e311992a3d89c2f093f00b88ea38708c176 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c
 DIST cyrus-imapd-2.3.6.tar.gz 2250241 RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 SHA1 adbd02f629d38152a1380360a7348f79261aa078 SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd
 DIST cyrus-imapd-2.3.7-uoa.tbz2 17788 RMD160 22f2aa3f0755bc924e9bef8613e59924b3d971a6 SHA1 678eea9049058ad7ea8e34da51034f3d70b0f92e SHA256 5a79970e70af26525d48c279ed53267c6a285bc259bf9201ff289a4c1050aca7
 DIST cyrus-imapd-2.3.7.tar.gz 2254961 RMD160 5f2170677f1a013a3707b1fbb07713a8f93fc3c6 SHA1 8eaad216859d4aaa2a4ec3b37ed215bde9abb6ff SHA256 ff58c60999f2c6495e218b81a25b6f5ef1805e4a160122db2744a6645a753b6d
-EBUILD cyrus-imapd-2.2.12-r4.ebuild 9408 RMD160 d626fc60c7a9445ee88acf66f94e2af7d3959b81 SHA1 73ad74be0d08ee7159a62c4fe9cafcb717459795 SHA256 406f81eb0c81595018729b4e5e3eee629e16b42cf67bf7947c6132c0c086227f
-MD5 3027639966e05ca6097db2424092978b cyrus-imapd-2.2.12-r4.ebuild 9408
-RMD160 d626fc60c7a9445ee88acf66f94e2af7d3959b81 cyrus-imapd-2.2.12-r4.ebuild 9408
-SHA256 406f81eb0c81595018729b4e5e3eee629e16b42cf67bf7947c6132c0c086227f cyrus-imapd-2.2.12-r4.ebuild 9408
-EBUILD cyrus-imapd-2.2.12-r5.ebuild 9414 RMD160 c25a238e77ad18b03a134dc9a3f8f4e175b864af SHA1 87588dfb6f7a1e019cf2044b0841ed032df7152b SHA256 7b533f32a057929a344092dfc17eb2c5a9b0232cdd146c5d936645fd3cc08d73
-MD5 f4563506f8e2ca14102ee56bbc631fd7 cyrus-imapd-2.2.12-r5.ebuild 9414
-RMD160 c25a238e77ad18b03a134dc9a3f8f4e175b864af cyrus-imapd-2.2.12-r5.ebuild 9414
-SHA256 7b533f32a057929a344092dfc17eb2c5a9b0232cdd146c5d936645fd3cc08d73 cyrus-imapd-2.2.12-r5.ebuild 9414
-EBUILD cyrus-imapd-2.2.12.ebuild 9115 RMD160 a70cd203b2b08d8bea915cf6404874fe18e61bf7 SHA1 ea101844ea41f95b50a63b8965fe50fdd276e216 SHA256 6c3d7554d00794131531df4d038c6c49725fbecad34b7b44c14f74a152f957b8
-MD5 b7e72b2806300ab7303ace6f57f93fb9 cyrus-imapd-2.2.12.ebuild 9115
-RMD160 a70cd203b2b08d8bea915cf6404874fe18e61bf7 cyrus-imapd-2.2.12.ebuild 9115
-SHA256 6c3d7554d00794131531df4d038c6c49725fbecad34b7b44c14f74a152f957b8 cyrus-imapd-2.2.12.ebuild 9115
+EBUILD cyrus-imapd-2.2.12-r4.ebuild 9291 RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f SHA1 4c3f97280bfb18fcc75c9896a273fe186fb9a53a SHA256 ece32053f0764ca2e4bcd066fa784aaf46275ea71a4a7b9bff2f8103fe6504b0
+MD5 eaaaef280594ffc872c7de53016c5eff cyrus-imapd-2.2.12-r4.ebuild 9291
+RMD160 33aafae49131264bcf0458391e6e8e6ac8d7305f cyrus-imapd-2.2.12-r4.ebuild 9291
+SHA256 ece32053f0764ca2e4bcd066fa784aaf46275ea71a4a7b9bff2f8103fe6504b0 cyrus-imapd-2.2.12-r4.ebuild 9291
+EBUILD cyrus-imapd-2.2.12-r5.ebuild 9420 RMD160 43a34ad2c6c75703a75ed622c380f4375f24056f SHA1 901e12d47b404f93d1ab9505f15090272485d3ac SHA256 b0f21fbe8822cbbfc7921b4fb2111024e85a1d5b19dcdcabd4f8ecbcb121c3fb
+MD5 ff3e364b0856133bd9b9be5503ce4082 cyrus-imapd-2.2.12-r5.ebuild 9420
+RMD160 43a34ad2c6c75703a75ed622c380f4375f24056f cyrus-imapd-2.2.12-r5.ebuild 9420
+SHA256 b0f21fbe8822cbbfc7921b4fb2111024e85a1d5b19dcdcabd4f8ecbcb121c3fb cyrus-imapd-2.2.12-r5.ebuild 9420
+EBUILD cyrus-imapd-2.2.13.ebuild 9521 RMD160 2f9c79d04fe54447efafce35897e8ff2c6c09727 SHA1 6681befc732c8d161d264e286a8883d2bd71c1b4 SHA256 8157ca04fa2b29c68423f02ec5e951f817015c6f2b922cc2a1f9e6727fdc30e8
+MD5 3068c6eca2973954ac769baa12ba8bb7 cyrus-imapd-2.2.13.ebuild 9521
+RMD160 2f9c79d04fe54447efafce35897e8ff2c6c09727 cyrus-imapd-2.2.13.ebuild 9521
+SHA256 8157ca04fa2b29c68423f02ec5e951f817015c6f2b922cc2a1f9e6727fdc30e8 cyrus-imapd-2.2.13.ebuild 9521
 EBUILD cyrus-imapd-2.3.1.ebuild 8161 RMD160 be4a5851672f49e6b40c2b56a643878e1cff2305 SHA1 b4c14ceb108532841a8c889e76d46eb4490f72f7 SHA256 7a727d28abcc34606453deeab668a5962d07d3de10cafba96d25d35060aaaf4b
 MD5 f8792828f711dcd95e88fd30d75caeb5 cyrus-imapd-2.3.1.ebuild 8161
 RMD160 be4a5851672f49e6b40c2b56a643878e1cff2305 cyrus-imapd-2.3.1.ebuild 8161
@@ -108,29 +121,29 @@ EBUILD cyrus-imapd-2.3.7.ebuild 8233 RMD160 8b9067cbf6d0698309ba05d421d738c25a6d
 MD5 a95de77e8b35c59006c79e5404de0f71 cyrus-imapd-2.3.7.ebuild 8233
 RMD160 8b9067cbf6d0698309ba05d421d738c25a6d8d22 cyrus-imapd-2.3.7.ebuild 8233
 SHA256 946b3441e42ca5b4b7e2e2f6e37e51975681030e2d355bedd2086d70d0e7fbeb cyrus-imapd-2.3.7.ebuild 8233
-MISC ChangeLog 18465 RMD160 dc50a83e4252b6168132d324a51a136d439f8fa1 SHA1 81a1a8ecd5b50a5989bdd0f50ff24c85f1607597 SHA256 fbd1bc18de9345c2b4316671955ad78770fe45adc64107169aa46ae6fca49532
-MD5 6fbed2c6f5a1bcd08d8029693d671b1c ChangeLog 18465
-RMD160 dc50a83e4252b6168132d324a51a136d439f8fa1 ChangeLog 18465
-SHA256 fbd1bc18de9345c2b4316671955ad78770fe45adc64107169aa46ae6fca49532 ChangeLog 18465
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
-SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161
-MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imapd-2.2.12 259
-RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imapd-2.2.12 259
-SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imapd-2.2.12 259
+MISC ChangeLog 19073 RMD160 f14faba598ba6042b42118be6f5e6a7bc1526e9c SHA1 8150cbf53893e6a8ee27a1e45a5f5a0e04f53411 SHA256 a3abf9b4f56c44ea93975ae5842f31922d6fc1e69de7aad21f273099594e2726
+MD5 37211234836053fde30a77f5e3d285a3 ChangeLog 19073
+RMD160 f14faba598ba6042b42118be6f5e6a7bc1526e9c ChangeLog 19073
+SHA256 a3abf9b4f56c44ea93975ae5842f31922d6fc1e69de7aad21f273099594e2726 ChangeLog 19073
+MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
+MD5 a562a93428a4efa4b0b4c0943075e3ff metadata.xml 227
+RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 metadata.xml 227
+SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c metadata.xml 227
 MD5 8c219986e0c374c302460c7204eb96fe files/digest-cyrus-imapd-2.2.12-r4 259
 RMD160 c3b34254e2030756e02decdb2593e4ebb3604994 files/digest-cyrus-imapd-2.2.12-r4 259
 SHA256 ad62d41892313174ffa09db9b0f48fdbc5a1feb33e2ba0bf6d9f1b7e06ce62d5 files/digest-cyrus-imapd-2.2.12-r4 259
 MD5 7f11e6246a6c05fa75edb1d390b9aab8 files/digest-cyrus-imapd-2.2.12-r5 536
 RMD160 709d6bc114a3bae15efd905a4ccdd94f8acad157 files/digest-cyrus-imapd-2.2.12-r5 536
 SHA256 c91c6ebeb4fc1b8871b1aaedd708ea747f7242c31eadef15b08a3157cf4e236d files/digest-cyrus-imapd-2.2.12-r5 536
-MD5 93d83f89eac20b8472804d5efd683085 files/digest-cyrus-imapd-2.3.1 256
-RMD160 638c120e1b2c594c7da309bf510cd465513a2454 files/digest-cyrus-imapd-2.3.1 256
-SHA256 4d61da839f65dbe4cac1298b447f92a4033ac70d94acd1e1d537af3b67a05253 files/digest-cyrus-imapd-2.3.1 256
-MD5 f68bfe99601e8437274dbab5bcc7d55c files/digest-cyrus-imapd-2.3.6 256
-RMD160 fcb89ab2d650cdaacb62f981405f649a80a8e440 files/digest-cyrus-imapd-2.3.6 256
-SHA256 6678b9c2be20b994c7f75c83a433310a2b522d7399baf7bca4098b5772934f6e files/digest-cyrus-imapd-2.3.6 256
+MD5 557d07d40c036efbbd10ef852a0b6c57 files/digest-cyrus-imapd-2.2.13 259
+RMD160 232835b5f24ede499731cb761b501e47d4c884be files/digest-cyrus-imapd-2.2.13 259
+SHA256 7afc422d893280bcc49f9e7bf45d2292f6560132160d5c7f98d35782a6167291 files/digest-cyrus-imapd-2.2.13 259
+MD5 6f2c8cbfcf2caa95d33c1c8c6c09aacd files/digest-cyrus-imapd-2.3.1 186
+RMD160 a84d702135952e23541552559c2434921bfefede files/digest-cyrus-imapd-2.3.1 186
+SHA256 be4cbbd521f5d517ac49d9186a9d272cd9e5f21a9597e809427f5e7a1dfa016c files/digest-cyrus-imapd-2.3.1 186
+MD5 2432c066e23e34cc86ec3c0dd4ba6970 files/digest-cyrus-imapd-2.3.6 186
+RMD160 7e0f394d5a8d508052e812a00e800602ceee1b8a files/digest-cyrus-imapd-2.3.6 186
+SHA256 52ea7c1d4e09fdb7e294fa2c78f76668a7cb05024073c078148a43c8d3c4a6d3 files/digest-cyrus-imapd-2.3.6 186
 MD5 768436622f94cc5196bbb3cda4805329 files/digest-cyrus-imapd-2.3.7 512
 RMD160 b7165ccf101117cd86d58a293137f04b06400d71 files/digest-cyrus-imapd-2.3.7 512
 SHA256 1c0548867e2394baac1b0eac963fbc6074760defc5895dec4db8776109d9ff31 files/digest-cyrus-imapd-2.3.7 512
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
index 4eb29a2c44b8..17703ef6ca8f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.12 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r4.ebuild,v 1.13 2007/07/22 09:23:51 dertobi123 Exp $
 
-inherit eutils ssl-cert fixheadtails pam
+inherit autotools eutils ssl-cert fixheadtails pam
 
 DESCRIPTION="The Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -149,7 +149,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-parallel.patch
 
 	# db-4.5 fix
-	epatch "${FILESDIR}/${P}-db45.patch"
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
 
 	# Add unsupported patch wrt #18706 and #80630
 	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
@@ -163,7 +163,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
@@ -184,11 +184,8 @@ src_unpack() {
 		man/cyrusmaster.8 || die "sed failed"
 
 	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	WANT_AUTOCONF="2.5"
+	eautoreconf
 
 	# When linking with rpm, you need to link with more libraries.
 	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
index 8c5cd43a9657..b2cc1ee246c9 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.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/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild,v 1.4 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r5.ebuild,v 1.5 2007/07/22 09:23:51 dertobi123 Exp $
 
 inherit eutils ssl-cert fixheadtails pam
 
@@ -161,7 +161,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild
index b95413c0611a..e0a0f208ebec 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12.ebuild,v 1.14 2007/07/14 22:22:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.13.ebuild,v 1.1 2007/07/22 09:23:51 dertobi123 Exp $
 
-inherit eutils ssl-cert fixheadtails pam
+inherit autotools eutils ssl-cert fixheadtails pam
 
 DESCRIPTION="The Cyrus IMAP Server."
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
@@ -10,16 +10,16 @@ SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc hppa ppc64"
-IUSE="afs drac idled kerberos pam snmp ssl tcpd"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
 
 PROVIDE="virtual/imapd"
 RDEPEND=">=sys-libs/db-3.2
 	>=dev-libs/cyrus-sasl-2.1.13
 	afs? ( >=net-fs/openafs-1.2.2 )
 	pam? (
-			>=sys-libs/pam-0.75
-			>=net-mail/mailbase-0.00-r8
+			virtual/pam
+			>=net-mail/mailbase-1
 		)
 	kerberos? ( virtual/krb5 )
 	snmp? ( net-analyzer/net-snmp )
@@ -30,8 +30,7 @@ RDEPEND=">=sys-libs/db-3.2
 DEPEND="$RDEPEND
 	sys-devel/libtool
 	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	>=sys-apps/sed-4"
+	sys-devel/automake"
 
 # "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
 check_useflag() {
@@ -74,6 +73,10 @@ tcpd_flag_check() {
 }
 
 net-snmp_check() {
+	if has_version net-analyzer/ucd-snmp; then
+		tcpd_flag_check net-analyzer/ucd-snmp
+	fi
+
 	if has_version net-analyzer/net-snmp; then
 		tcpd_flag_check net-analyzer/net-snmp
 		# check for minimal USE flag.
@@ -130,6 +133,8 @@ pkg_setup() {
 	if use snmp; then
 		net-snmp_check
 	fi
+
+	enewuser cyrus -1 -1 /usr/cyrus mail
 }
 
 src_unpack() {
@@ -137,6 +142,20 @@ src_unpack() {
 
 	ht_fix_file ${S}/imap/xversion.sh
 
+	# Parallel make fix
+	epatch "${FILESDIR}"/${PN}-parallel.patch
+
+	# db-4.5 fix
+	epatch "${FILESDIR}/${PN}-2.2-db45.patch"
+
+	# Add unsupported patch wrt #18706 and #80630
+	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
+
+	if use afs; then
+		epatch "${FILESDIR}/${P}-afs.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${P}-pts.patch" || die "epatch failed"
+	fi
+
 	# Add drac database support.
 	if use drac ; then
 		# better check for drac. Bug #79442.
@@ -146,7 +165,7 @@ src_unpack() {
 
 	# Add libwrap defines as we don't have a dynamicly linked library.
 	if use tcpd ; then
-		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+		epatch "${FILESDIR}/${PN}-2.2-libwrap.patch" || die "epatch failed"
 	fi
 
 	# DB4 detection and versioned symbols.
@@ -156,25 +175,26 @@ src_unpack() {
 
 	# Fix master(8)->cyrusmaster(8) manpage.
 	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
-		sed -e 's:master\.8:cyrusmaster.8:g' \
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
 			-e 's:master(8):cyrusmaster(8):g' \
-			-i "${i}" || die "sed failed" || die "sed failed"
+			"${i}" || die "sed failed" || die "sed failed"
 	done
 	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
-	sed -e "s:MASTER:CYRUSMASTER:g" \
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
 		-e "s:Master:Cyrusmaster:g" \
 		-e "s:master:cyrusmaster:g" \
-		-i man/cyrusmaster.8 || die "sed failed"
+		man/cyrusmaster.8 || die "sed failed"
 
 	# Recreate configure.
-	export WANT_AUTOCONF="2.5"
-	rm -rf configure config.h.in autom4te.cache || die
-	ebegin "Recreating configure"
-	sh SMakefile &>/dev/null || die "SMakefile failed"
-	eend $?
+	WANT_AUTOCONF="2.5"
+#	rm -rf configure config.h.in autom4te.cache || die
+#	ebegin "Recreating configure"
+#	sh SMakefile &>/dev/null || die "SMakefile failed"
+#	eend $?
+	eautoreconf 
 
 	# When linking with rpm, you need to link with more libraries.
-	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
+	sed -i -e "s:lrpm:lrpm -lrpmio -lrpmdb:" configure || die "sed failed"
 }
 
 src_compile() {
@@ -235,14 +255,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/cyrus.rc6" cyrus
 	newconfd "${FILESDIR}/cyrus.confd" cyrus
-
-	if use pam ; then
-		insinto /etc/pam.d
-	# This is now provided by mailbase-0.00-r8. See #79240
-	# 	newins "${FILESDIR}/imap.pam" imap
-	#	newins "${FILESDIR}/imap.pam" pop3
-		newins "${FILESDIR}/imap.pam" sieve
-	fi
+	newpamd "${FILESDIR}/cyrus.pam-include" sieve
 
 	if use ssl ; then
 		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
@@ -278,6 +291,8 @@ pkg_postinst() {
 	ewarn "/usr/share/doc/${P}/html/install-configure.html."
 	echo
 
+	enewuser cyrus -1 -1 /usr/cyrus mail
+
 	if df -T /var/imap | grep -q ' ext[23] ' ; then
 		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
 		chattr +S /var/imap/{user,quota}{,/*}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
index c92f957953c8..c92f957953c8 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-db45.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-db45.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-libwrap.patch
index 6157c879ae88..6157c879ae88 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.12-libwrap.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2-libwrap.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
new file mode 100644
index 000000000000..96bde0546097
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-afs.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig   2006-03-31 15:09:06.000000000 -0800
++++ configure.in        2006-03-31 15:08:16.000000000 -0800
+@@ -466,8 +466,12 @@
+          AC_DEFINE(AFSPTS_USE_KRB5,[],[Should the AFS PTS plugin use krb5?])])
+
+ if test "x$with_afs" != "xno"; then
+-    if test ! -d $with_afs; then
+-        $with_afs=/usr/local
++    if test "x$with_afs" != "xyes"; then
++        if test ! -d $with_afs; then
++            with_afs=/usr/local
++        fi
++    else
++        with_afs=/usr
+     fi
+     CFLAGS="${CFLAGS} -I${with_afs}/include"
+     AFS_LIBS="${with_afs}/lib/afs/libkauth.a
+${with_afs}/lib/afs/libprot.a  ${with_afs}/lib/afs/libauth.a
+${with_afs}/lib/afs/libsys.a ${with_afs}/lib/librxkad.a
+${with_afs}/lib/librx.a ${with_afs}/lib/afs/libsys.a
+${with_afs}/lib/libubik.a  ${with_afs}/lib/liblwp.a
+${with_afs}/lib/afs/util.a" 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
new file mode 100644
index 000000000000..7279c6618569
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-drac.patch
@@ -0,0 +1,43 @@
+--- contrib/drac_auth.patch.orig	2005-01-25 10:56:05.263875816 -0800
++++ contrib/drac_auth.patch	2005-01-25 10:59:32.395359608 -0800
+@@ -71,7 +71,7 @@
+ diff -u -r1.273 configure.in
+ --- configure.in	15 Dec 2003 20:00:35 -0000	1.273
+ +++ configure.in	19 Dec 2003 19:56:16 -0000
+-@@ -945,6 +945,19 @@
++@@ -945,6 +945,20 @@
+  SNMP_SUBDIRS=""
+  AC_SUBST(SNMP_SUBDIRS)
+  
+@@ -80,12 +80,13 @@
+ +dnl
+ +DRACLIBS=
+ +AC_ARG_WITH(drac, [  --with-drac=DIR         use DRAC library in <DIR> [no] ],
+-+	if test -d "$withval"; then
+-+		LDFLAGS="$LDFLAGS -L${withval}"
+-+		AC_CHECK_LIB(drac, dracauth,
+-+			AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+-+			DRACLIBS="-ldrac")
+-+	fi)
+++       drac="$withval",
+++       drac="no")
+++if test "$drac" != "no"; then
+++       AC_CHECK_LIB(drac, dracauth,
+++               AC_DEFINE(DRAC_AUTH,[],[Build DRAC support?])
+++               DRACLIBS="-ldrac")
+++fi
+ +AC_SUBST(DRACLIBS)
+ +
+  CMU_LIBWRAP
+
+
+--- contrib/drac_auth.patch.orig        2006-03-31 15:12:05.000000000 -0800
++++ contrib/drac_auth.patch     2006-03-31 15:14:20.000000000 -0800
+@@ -373,6 +373,6 @@
+ +{ "drachost", "localhost", STRING }
+ +/* Hostname of the RPC dracd server. */
+ +
+- { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "skiplist")}
++ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
+  /* The cyrusdb backend to use for the duplicate delivery suppression
+     and sieve. */ 
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
new file mode 100644
index 000000000000..31b08569ba91
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.13-pts.patch
@@ -0,0 +1,19 @@
+--- configure.in.old	2007-07-22 10:00:33.652378056 +0200
++++ configure.in	2007-07-22 10:00:51.386672578 +0200
+@@ -544,11 +544,11 @@
+     LDFLAGS=$save_LDFLAGS
+ fi
+ 
+-if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
+-	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
+-	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
+-	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
+-fi
++#if test "x$with_afs" != "xno" -o "x$with_ldap" != "xno"; then
++#	EXTRA_SUBDIRS="${EXTRA_SUBDIRS} ptclient"
++#	EXTRA_OUTPUT="${EXTRA_OUTPUT} ptclient/Makefile"
++#	AC_DEFINE(WITH_PTS,[],[Build in PTS support?])
++#fi
+ 
+ SERVER_SUBDIRS="master imap"
+ AC_ARG_ENABLE(server,
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12
deleted file mode 100644
index 9892eb1bb989..000000000000
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161
-RMD160 ff4a95e519ea066ed9b21b515b18bdacaf0d1852 cyrus-imapd-2.2.12.tar.gz 1961161
-SHA256 3c6f41255ba15d8b2ea78320dd5e0c98e07fe0b5c3c4b84bc20f503427bd1b7b cyrus-imapd-2.2.12.tar.gz 1961161
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13
new file mode 100644
index 000000000000..af50da4aeb5a
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.13
@@ -0,0 +1,3 @@
+MD5 3ff679714836d1d7b1e1df0e026d4844 cyrus-imapd-2.2.13.tar.gz 2109770
+RMD160 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2 cyrus-imapd-2.2.13.tar.gz 2109770
+SHA256 109e85b901bfcdbdd6a76d7cac83af866aa9c37a40919be7f58813319082d09c cyrus-imapd-2.2.13.tar.gz 2109770
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
index 0d886946e1f0..611c431848f3 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.1
@@ -1,3 +1,2 @@
-MD5 cde15876d5c953bba9ad9f7811aff695 cyrus-imapd-2.3.1.tar.gz 2212999
 RMD160 68b40b89f5558afe19886724a8bb8736139254e5 cyrus-imapd-2.3.1.tar.gz 2212999
 SHA256 79f95ed36160056f5ca60fad312fda8c6c95eafeab44f49b360b4a02790f156c cyrus-imapd-2.3.1.tar.gz 2212999
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
index d2b9c507db16..4558e3a68fca 100644
--- a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.3.6
@@ -1,3 +1,2 @@
-MD5 5c1d6250747a7a09c8095972043cec01 cyrus-imapd-2.3.6.tar.gz 2250241
 RMD160 c7a07a2e95ca08d0348ce7de2849d56e21341eb0 cyrus-imapd-2.3.6.tar.gz 2250241
 SHA256 6fc963c7d1f34b3b3368bb14f3604c7309e1f42d157e871bc186f8832e1a9cbd cyrus-imapd-2.3.6.tar.gz 2250241
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 51f94e3fbe0e..0feff246ee31 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+  <email>dertobi123@gentoo.org</email>
+</maintainer>
 <herd>net-mail</herd>
 </pkgmetadata>