Version bumps. Remove old/unmaintained versions. Fixes bug 314381 and bug 365545. Fix licenses. Add init.d/conf.d script for jobqueue.pl. Do tests.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

30 files changed, 181 insertions, 719 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 82f86fdc467f..e08245ebe03a 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.198 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.199 2011/06/17 10:38:41 idl0r Exp $
+
+*bugzilla-4.0.1 (17 Jun 2011)
+*bugzilla-3.6.5 (17 Jun 2011)
+*bugzilla-3.4.11 (17 Jun 2011)
+
+  17 Jun 2011; Christian Ruppert <idl0r@gentoo.org> -bugzilla-2.20.6.ebuild,
+  -bugzilla-2.22.7.ebuild, -bugzilla-3.0.11.ebuild, -bugzilla-3.2.9.ebuild,
+  -bugzilla-3.2.10.ebuild, -bugzilla-3.4.9.ebuild, -bugzilla-3.4.10.ebuild,
+  +bugzilla-3.4.11.ebuild, -bugzilla-3.6.3.ebuild, bugzilla-3.6.4.ebuild,
+  -bugzilla-3.6.4-r1.ebuild, +bugzilla-3.6.5.ebuild, +bugzilla-4.0.1.ebuild,
+  -files/2.20/apache.htaccess, -files/2.20/bugzilla.cron.daily,
+  -files/2.20/bugzilla.cron.tab, -files/2.20/postinstall-en.txt,
+  -files/2.20/reconfig, -files/2.22/apache.htaccess,
+  -files/2.22/bugzilla.cron.daily, -files/2.22/bugzilla.cron.tab,
+  -files/2.22/postinstall-en.txt, -files/2.22/reconfig,
+  -files/3.0/bugzilla.cron.daily, -files/3.0/bugzilla.cron.tab,
+  -files/3.0/postinstall-en.txt, -files/3.0/reconfig,
+  +files/4.0/bugzilla.cron.daily, +files/4.0/bugzilla.cron.tab,
+  +files/4.0/bugzilla-queue.confd, +files/4.0/bugzilla-queue.initd,
+  +files/4.0/postinstall-en.txt, +files/4.0/reconfig, metadata.xml:
+  Version bumps. Remove old/unmaintained versions. Fixes bug 314381 and bug
+  365545. Fix licenses. Add init.d/conf.d script for jobqueue.pl. Do tests.
 
   13 Feb 2011; Raúl Porcel <armin76@gentoo.org> bugzilla-2.20.6.ebuild,
   bugzilla-2.22.7.ebuild, bugzilla-3.0.11.ebuild, bugzilla-3.2.9.ebuild,
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 764ae91a0a51..eb895ef79380 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,17 +1,6 @@
-AUX 2.20/apache.htaccess 94 RMD160 7492341edfe6ff1396908ceb6fbeccfadc8822df SHA1 a65742dcb5802ec889e3550dac545323128d0d7d SHA256 c20815b7f9b92a6971d0372e34e4c24b700c5e7228e8903bc7715aa3e6e22709
-AUX 2.20/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
-AUX 2.20/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
-AUX 2.20/postinstall-en.txt 574 RMD160 ee6c94fc19df35a5217656b5517c6d17c5a151f0 SHA1 fabd53cce15ba49efc594aecc04edfaceb649e28 SHA256 5dc9b2bcf2746662bb2a4f1e465e2734dc021962a89c948473acc867ef834ac8
-AUX 2.20/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
-AUX 2.22/apache.htaccess 94 RMD160 7492341edfe6ff1396908ceb6fbeccfadc8822df SHA1 a65742dcb5802ec889e3550dac545323128d0d7d SHA256 c20815b7f9b92a6971d0372e34e4c24b700c5e7228e8903bc7715aa3e6e22709
-AUX 2.22/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
-AUX 2.22/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
-AUX 2.22/postinstall-en.txt 756 RMD160 869d099361407b8a4e21e38410db8e1c469a9979 SHA1 a1e7e41f6a1735642edb3e31dfe2e95bd41c5761 SHA256 1e2bbe254bae359f75c778f7e45255d12bd5633621cad215a6e8c1dc8e4ec73c
-AUX 2.22/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
-AUX 3.0/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
-AUX 3.0/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
-AUX 3.0/postinstall-en.txt 579 RMD160 7c79aa393b64c20ab01e3f2f55087cc8bd474fb1 SHA1 dd98a46b0a36d1df28926a74bb726e2ec95b51ff SHA256 81cc4d6f2e2725c46db30a3fac40d65cf073005d19b5a5a09f1f2ee1bf0dc14f
-AUX 3.0/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.4/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
 AUX 3.4/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
 AUX 3.4/postinstall-en.txt 579 RMD160 c2f5b399dc9804b97d9507e4b34ef99e372acb07 SHA1 cee9f8a6636d55a8086d5851dcc74026302b501a SHA256 c73178e29071fbdfe97b70b94e45c27923dc265f58c911d53d12bcbd6964ac17
@@ -20,24 +9,30 @@ AUX 3.6/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e
 AUX 3.6/bugzilla.cron.tab 54 RMD160 199919c125f0b214e17d6eadf909f7172b025137 SHA1 cbfc9f2051c3ce7f2f968f65a683c0fe7c8884df SHA256 ccbc9369bf52e6afd91e31ba2a89fa9a0bbbdae080e0fa7eb26d06fa21ef1eab
 AUX 3.6/postinstall-en.txt 582 RMD160 c2edcf761e4d9ca71988bd3efdd3c602d00070cb SHA1 a801703ef024ff010149ea98f26a1c75e267197b SHA256 72f84d541e702d6fa8a9dac2aa7f97691ab70a6db8bb46c09997426496dcbc27
 AUX 3.6/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
-DIST bugzilla-2.20.6.tar.gz 2079216 RMD160 93e2db0b3acc250bb274d28fe2cdb6db9b63c962 SHA1 7fcbae15b0d61d9dd05d1fec373fd17f6d15dca7 SHA256 93afe87f6a30e27ce5f9976e3df5138ff71393869c78c5ccbe5fe2a5e3605354
-DIST bugzilla-2.22.7.tar.gz 2113576 RMD160 cb1657fb4dbff8b73f834b3fc671ff4eebc7c5bd SHA1 93af1543565585dbbae1d791459b762b1399d7c4 SHA256 efb2fc9cfc16b64d1c050b6f0b2a8248f36d86cff5213f9c97891146f4ee68d9
-DIST bugzilla-3.0.11.tar.gz 2424830 RMD160 a6eea0e8f7437d3c2904f2994842d736b2911ec1 SHA1 8aa5365a9b681bb89cabc2f096fb2de763517918 SHA256 fd099ade3c66ee42d7e955e8ae6be9ed41d12e3653cb5cbd44ab6b42e4638c28
-DIST bugzilla-3.2.10.tar.gz 2384965 RMD160 607e8217fc13a03a2cb79267d9b2e16276e6711b SHA1 d86d372eaeae780e0858ffae02b0a4cf56ab85f4 SHA256 1c462acd24d07745d0013b928263e651f611a1cf899d4ba1540799e4bb34f1a4
-DIST bugzilla-3.2.9.tar.gz 2383664 RMD160 815cd007206a3c4264650ad526ccffdd77a2c4b8 SHA1 afb5bb64ef782083e4be242124db7678a5593215 SHA256 4119c78be42742035d5f74a0b7fdef92a5c7923a9a7bc47d6c86201c29343648
-DIST bugzilla-3.4.10.tar.gz 2461113 RMD160 02f26f919551542163ce4183e2e660a21f973c91 SHA1 a86a5968a49cd4c42c0cc3b065e61619618a4986 SHA256 77debbf85178f9cbda4a920e68ecf644d34c1b3f27f2b32e5fc79a2ab8a0a743
-DIST bugzilla-3.4.9.tar.gz 2459049 RMD160 8005256ae838469c1eb0377aa76cab1d32e812b7 SHA1 dd494f1879102a58d90a97e1ab3007765a3d7f98 SHA256 4a4d205fcacef117c480f404704175dedca26f48209dada063c9e4438bfcddef
-DIST bugzilla-3.6.3.tar.gz 2625624 RMD160 be0cf995e172bcf05a6f2d107b59a7dce6133e4c SHA1 6710100af5201c6c56b5d44b532c66977fe925b5 SHA256 bcb434338cbb1274b56b7ce11630e747cc87ab621b15d2333caa840705a8c7d6
+AUX 4.0/bugzilla-queue.confd 94 RMD160 e2316c7c739acfc3bff36c26d195e1b2e1f68b0e SHA1 9e6feaa7d69617384c4ffe7f6307ac3834daa90e SHA256 59e1835f1039035c7eadcbf61224d38eae5c25a98c463c9dfb617fa2a148b603
+AUX 4.0/bugzilla-queue.initd 1374 RMD160 ed68e4f0bf1b026831b43cedcec36edb16d4aad9 SHA1 bffeb00cf1bf8d2d6764b8a2570e47b6ee0c05cb SHA256 cd884540e93eded644e7fc002a83f5695c0fcc5aad341ce826a5cb8ae59bc510
+AUX 4.0/bugzilla.cron.daily 115 RMD160 248700f6e811dd958fc3774b63c07d5e85ae477e SHA1 f7811fd35ce2abc6f8358abfdb5afd5b903d6cf4 SHA256 004cf631625c9a6f2b0aeccf2a2ead815008f59029326c13b28658586023b241
+AUX 4.0/bugzilla.cron.tab 49 RMD160 4bf0074418ec9f98a3eb392172ae9b303211943f SHA1 a875518b367006641d90045ce137ea4762968c1c SHA256 bb66591cd659ae93b10b2b01bcf698a8b06b0d1c45fc4b996cce3759ae483c50
+AUX 4.0/postinstall-en.txt 669 RMD160 9c8ffa9f5171921f100790060548f1b04fb0d87e SHA1 626524ab45110298901c3753c24d9ebc91abe39b SHA256 8785744b482dfbc4f7e7b5620e3a79dc9742ff67ab43f49923e0c9a982cbf409
+AUX 4.0/reconfig 349 RMD160 e5658372e9a1b67a39a0090e1a638261e05cf10a SHA1 93651b403924a270f1c693491c3c564999528b03 SHA256 8301aeda585234ed30cc8ffa8fc6e72138ed8e9d50c695dd2455dcc7d175aa50
+DIST bugzilla-3.4.11.tar.gz 2461088 RMD160 a478c553bf3b99db3a4ab08cdff4d38923b4c53b SHA1 36b83e363ba411502e2d43b5dd6888b6e1273f8e SHA256 48068c7a67eee9fc7c43e407996ce697308c2c2907dcf5036798d90045f54c54
 DIST bugzilla-3.6.4.tar.gz 2629854 RMD160 84629dd654ea9f9b0838445519f4f5db76ff5985 SHA1 2cb9f8e34c6479d3455b989eb4ecfa310aa05d82 SHA256 056092923b849f59e275107f3131dd95a58ec622033eecffa9f1327b7133dcef
-EBUILD bugzilla-2.20.6.ebuild 1789 RMD160 1f72db4c871f278149ec3b322031bcf6aa5e078f SHA1 8255a12c8dc1ce8d3bafbf38f7fbbe0df20c80a6 SHA256 3305eec34d366b00507efda8fc4e03f8086627703cd5f67c84654b7676923599
-EBUILD bugzilla-2.22.7.ebuild 1863 RMD160 bf61296a2545839f0d03a9fd59efa3f10b7b15b7 SHA1 5b3bb0cda6d0e462517b50fb452de996c6e261e0 SHA256 864cf68844dd9b3d55c95417b95ca22216e7434a0ed3823b7fd32f6bdf5304fb
-EBUILD bugzilla-3.0.11.ebuild 2132 RMD160 5e85319754cd3b64f3c8cc3476cc4ffe00ce59cd SHA1 486314b0867352cedbb80fec9be1677ff4e1bc1e SHA256 e0588e268ef36e37f4fef529766a8814f722cad892d3f67fe2dccc7af5f598f6
-EBUILD bugzilla-3.2.10.ebuild 2101 RMD160 308337c29d0aee02d0cbccff1db3486eb1fc2573 SHA1 c15b00514b9d30c96a7ad40cfb66a54d79ff98c7 SHA256 a582268960e1316a4b26208131b5d6c0036db5d2d8be367e0c1961b25de4462c
-EBUILD bugzilla-3.2.9.ebuild 2100 RMD160 ac62b9043ba13c53ec030a6c68b091ba35eba4ce SHA1 8b1beca2b9641d472a2d6d8dcf4c27878c3fe0d5 SHA256 00d5054ea10cd15421ca9388b075a5c6872d16ea93735b3810cc0d425e95ab73
-EBUILD bugzilla-3.4.10.ebuild 2424 RMD160 74dc221ca30c6633f1689d1a3fe957fbf0eb28d5 SHA1 0819567369feeafcac940659996d5801f0df6e3b SHA256 e44539ec6b19f906176974452fe5bd5d4b783f117b595eb7cc7ad27aaed0a62d
-EBUILD bugzilla-3.4.9.ebuild 2423 RMD160 015873b961fdea6b98075925a633e917a122232a SHA1 a42a1701c77df05af77074fa44c6ba333280aa48 SHA256 4edd467e5d5c303b7769ab27a6942fb3dcab2fbb27d3fa81c188b4967691443c
-EBUILD bugzilla-3.6.3.ebuild 2470 RMD160 a48df2d9ada8f088e663263133c4d4d1cd676147 SHA1 03b9d4f62ae883f47eec2127584e2ff8dccf52a5 SHA256 26c91e6056a113b2e89c4864988ee25be29625e6cbf6cf0c4e1ceec5276968d6
-EBUILD bugzilla-3.6.4-r1.ebuild 2491 RMD160 564c186b9d442cf1e28f55b325a6b4d1a70fd4bb SHA1 5ba6b5d054812f30a373929d5ba27a2e43f661f7 SHA256 1c1e2af506dcef433971f4be9e24ecbc6f99ceef92e41cd23243b614965c9008
-EBUILD bugzilla-3.6.4.ebuild 2526 RMD160 86d2809d2f8493fdebac7d2eafb90d26664685ce SHA1 64992f0f257d927a12e61c91e3ec98483b723403 SHA256 4236f87c6fedd2a1b739ff35af898c4b5a2307cdce4edc1064d83aa440da6f59
-MISC ChangeLog 32786 RMD160 c4b656abf863848f550eb9d03c08bd054f28cb70 SHA1 31553b001f345e6a43c9366857133a266b4a4599 SHA256 150bffdade5fca5ca98747610245ef1115945cb75431101d719a01333175c2cb
-MISC metadata.xml 299 RMD160 f7465f32665923c1477e57d29804c6bcbdb5332f SHA1 c67523f618c37d3e5e576dc2a5dcdd895b71e008 SHA256 258613f9f7391942eb3b8d252a06c5ec47cea080621b408ae1cda78bd2c67f7e
+DIST bugzilla-3.6.5.tar.gz 2633125 RMD160 d24f3c22c582a53915a3aad04eacb30219982f99 SHA1 9200d4c176a297592d45a866a02457a99eb73322 SHA256 5f4cd43462110d5deef18454cfa52377c7123eabcca477a747982a52447da5f3
+DIST bugzilla-4.0.1.tar.gz 2985506 RMD160 6a6aaa309d8dcf20cef96cb08e738b93bd2ebdaf SHA1 bc259422593c1c0cbcdd30ff3aa2e91010b011c4 SHA256 7be2f05bb187c4e15caef2a98497e12c87a69ad5aeaf654b2197ae5b48e93209
+EBUILD bugzilla-3.4.11.ebuild 2471 RMD160 6287567f62c0fc76565803b2aa134b4d6a4f958b SHA1 545b506495ff069f20022baec0ad4339baa45b58 SHA256 53b4723fba4056325750fc33f6fe0c912154b781801fa714b2012591a1189bed
+EBUILD bugzilla-3.6.4.ebuild 2566 RMD160 f883577bc82518da089c408fdb892a0abeb5cc1c SHA1 0493e1f9f53781c4b0fb96a256ba687b4a12f0ec SHA256 cb09ad4f2cebaa490b2f0e4a23cb737f879143c1e3de57d63b4608c359c588b1
+EBUILD bugzilla-3.6.5.ebuild 2538 RMD160 3dac10d3f8caf3f8d6c4810f101b448c1fc0c44a SHA1 5ad2f622158848f157ec19b3adc61c63db5c19d0 SHA256 274b5dc7abe01242ffa9ad7bd4e5df48025ba3749973568b9c59b7db1e6c0a9d
+EBUILD bugzilla-4.0.1.ebuild 2913 RMD160 7212735ff9dfcb307ed580b08f680a972f459c14 SHA1 c8283044b8187b208ea9baa3672f130526768c54 SHA256 7f8125333eb765552ef2cf6cb774b2b31bb98284f1088b521f1b21349db4972b
+MISC ChangeLog 34031 RMD160 bb8b723bd7e54712bd5dc53899cf3072421c6c37 SHA1 525374741622e554251d82303b9cd03877d77072 SHA256 f8603153ad43ceb216081f3a5229e8860739d753c09af538742ffb6c81ffeb16
+MISC metadata.xml 304 RMD160 b5fdc620a69ac920cf242384882b38e9dcd04694 SHA1 f88703f6a8fec95666732939aba680eb635e0978 SHA256 90bc0a03cdc3329de7601f0b8035105a09edd165f5de74e92a46bb695c9072d0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJN+y63AAoJEMOx0zmdw4Z1FKwIAKwDmTLiEB9NbPXLmBA31W0j
+BitQYCHiSIQzQ9ipxNFMsZfbg8wSl00DCe21BLRll9/Rz3lZAyAGzOYTWdGyx2Ai
+Yas/MTUbtqbkHNA6hgi9Vj/ifruSAF2/uwAeiLIrlgWdIWy4Tr5sL0j3eGWhQW85
+5t0vyU0mdJ+Cnx+fCc08qO1OjcSg6+CYSJLX3lkViEr2ayju1z3fcwGy/3dqnDQQ
+aBkXFVEzCYoqB3kN3okyxe+UW64Zv+ACupQra4tZf2oLmWlZQzWHOQvT1wv2lRBb
+IG66uQ99KE8F0XpNLthxybszKohc6vmqzjIe7wQndBDghiTAY9JaaInsOVDz1JI=
+=E0ZR
+-----END PGP SIGNATURE-----
diff --git a/www-apps/bugzilla/bugzilla-2.20.6.ebuild b/www-apps/bugzilla/bugzilla-2.20.6.ebuild
deleted file mode 100644
index 90a43449eb3b..000000000000
--- a/www-apps/bugzilla/bugzilla-2.20.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.6.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	virtual/mta
-	>=dev-lang/perl-5.6.1
-
-	>=dev-perl/AppConfig-1.52
-	>=dev-perl/Chart-2.3
-	>=dev-perl/DBI-1.38
-	>=dev-perl/GD-1.20
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	>=dev-perl/MailTools-1.67
-	dev-perl/MIME-tools
-	>=dev-perl/PatchReader-0.9.4
-	dev-perl/perl-ldap
-	>=dev-perl/Template-Toolkit-2.08
-	>=virtual/perl-Text-Tabs+Wrap-2001.0131
-	>=dev-perl/TimeDate-1.16
-	dev-perl/XML-Parser
-	>=virtual/perl-CGI-2.93
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
-	virtual/perl-Storable
-
-	graphviz? ( media-gfx/graphviz )
-	mysql? ( <=dev-perl/DBD-mysql-3.0002 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins "${FILESDIR}"/${MY_PB}/apache.htaccess .htaccess
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	for f in $(find -type d -printf "%p/* "); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/bugzilla/bugzilla-2.22.7.ebuild b/www-apps/bugzilla/bugzilla-2.22.7.ebuild
deleted file mode 100644
index 5e20dd4d6e02..000000000000
--- a/www-apps/bugzilla/bugzilla-2.22.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.7.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.6.1
-
-	>=dev-perl/AppConfig-1.52
-	>=dev-perl/DBI-1.38
-	>=dev-perl/MailTools-1.67
-	dev-perl/MIME-tools
-	>=dev-perl/Template-Toolkit-2.13
-	>=virtual/perl-Text-Tabs+Wrap-2001.0131
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-2.93
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
-	>=virtual/perl-MIME-Base64-3.01
-	virtual/perl-Storable
-
-	extras? (
-		>=dev-perl/Chart-2.3
-		>=dev-perl/GD-1.20
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		dev-perl/HTML-Scrubber
-		>=dev-perl/PatchReader-0.9.4
-		dev-perl/perl-ldap
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		dev-util/patchutils
-	)
-
-	graphviz? ( media-gfx/graphviz )
-	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
-	postgres? ( >=dev-perl/DBD-Pg-1.45 )
-"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins "${FILESDIR}"/${MY_PB}/apache.htaccess .htaccess
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-}
diff --git a/www-apps/bugzilla/bugzilla-3.0.11.ebuild b/www-apps/bugzilla/bugzilla-3.0.11.ebuild
deleted file mode 100644
index 32c7e802ad0e..000000000000
--- a/www-apps/bugzilla/bugzilla-3.0.11.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.0.11.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.2.10.ebuild b/www-apps/bugzilla/bugzilla-3.2.10.ebuild
deleted file mode 100644
index 6608f0736417..000000000000
--- a/www-apps/bugzilla/bugzilla-3.2.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.2.10.ebuild,v 1.7 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=3.0
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.2.9.ebuild b/www-apps/bugzilla/bugzilla-3.2.9.ebuild
deleted file mode 100644
index 8449d79a3281..000000000000
--- a/www-apps/bugzilla/bugzilla-3.2.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.2.9.ebuild,v 1.7 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=3.0
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.4.10.ebuild b/www-apps/bugzilla/bugzilla-3.4.10.ebuild
deleted file mode 100644
index 87cd08cbf612..000000000000
--- a/www-apps/bugzilla/bugzilla-3.4.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.10.ebuild,v 1.2 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-# KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/DateTime-0.50
-	>=dev-perl/DateTime-Locale-0.43
-	>=dev-perl/DateTime-TimeZone-0.71
-	>=dev-perl/URI-1.38
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-Digest-SHA-5.46
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-		dev-perl/TheSchwartz
-		dev-perl/Daemon-Generic
-	)
-"
-# from extras we miss:
-# (nothing)
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.4.9.ebuild b/www-apps/bugzilla/bugzilla-3.4.11.ebuild
index 4b07bfd526d2..12d2cc56a0e5 100644
--- a/www-apps/bugzilla/bugzilla-3.4.9.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.4.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.9.ebuild,v 1.2 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.11.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 # KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="~amd64 ~ppc ~x86"
 
@@ -63,7 +63,7 @@ RDEPEND="
 		dev-perl/SOAP-Lite
 		dev-perl/Template-GD
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 	)
@@ -86,7 +86,7 @@ src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
+	doins -r . || die
 	for f in bugzilla.cron.daily bugzilla.cron.tab; do
 		doins "${FILESDIR}"/${MY_PB}/${f} || die
 	done
diff --git a/www-apps/bugzilla/bugzilla-3.6.4.ebuild b/www-apps/bugzilla/bugzilla-3.6.4.ebuild
index 27a32678b562..e39dbf2bd871 100644
--- a/www-apps/bugzilla/bugzilla-3.6.4.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4.ebuild,v 1.6 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4.ebuild,v 1.7 2011/06/17 10:38:41 idl0r Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 # KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="amd64 ppc ppc64 x86"
 
@@ -65,7 +65,7 @@ RDEPEND="
 		dev-perl/Template-GD
 		dev-perl/Test-Taint
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 	)
diff --git a/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild b/www-apps/bugzilla/bugzilla-3.6.5.ebuild
index 968471a4da22..b25361e82b35 100644
--- a/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.6.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild,v 1.1 2011/02/08 08:14:01 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.5.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="modperl extras graphviz mysql postgres"
@@ -64,7 +64,7 @@ RDEPEND="
 		dev-perl/Template-GD
 		dev-perl/Test-Taint
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 		dev-perl/Math-Random-Secure
@@ -90,7 +90,7 @@ src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
+	doins -r . || die
 	for f in bugzilla.cron.daily bugzilla.cron.tab; do
 		doins "${FILESDIR}"/${MY_PB}/${f} || die
 	done
diff --git a/www-apps/bugzilla/bugzilla-3.6.3.ebuild b/www-apps/bugzilla/bugzilla-4.0.1.ebuild
index f22e2a18237b..b89c47d637f5 100644
--- a/www-apps/bugzilla/bugzilla-3.6.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.3.ebuild,v 1.5 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.1.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,66 +12,74 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
-# KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="modperl extras graphviz mysql postgres"
 
+DEPEND="test? ( >=dev-lang/perl-5.8.8 )"
 RDEPEND="
 	virtual/httpd-cgi
 	>=dev-lang/perl-5.8.8
 
-	>=dev-perl/DBI-1.601
+	>=virtual/perl-CGI-3.510
+	virtual/perl-Digest-SHA
+	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
-	>=dev-perl/DateTime-Locale-0.43
 	>=dev-perl/DateTime-TimeZone-0.71
-	>=dev-perl/URI-1.38
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
+	>=dev-perl/DBI-1.601
 	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.33
-	>=virtual/perl-Digest-SHA-5.46
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
+	>=dev-perl/Email-Send-2.190
+	>=dev-perl/Email-MIME-1.904
+	dev-perl/URI
+	>=dev-perl/List-MoreUtils-0.22
 
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
 	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
+	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
 
 	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
 		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
 		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/JSON-RPC
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427
 		dev-perl/libwww-perl
 		>=dev-perl/PatchReader-0.9.5
 		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0
 		dev-perl/Test-Taint
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		>=dev-perl/HTML-Parser-3.60
+		dev-perl/HTML-Scrubber
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
+		>=dev-perl/Math-Random-Secure-0.50
+
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+		dev-perl/MIME-tools
 	)
+
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.93
+	)
+
+	virtual/perl-File-Path
+	virtual/perl-Scalar-List-Utils
+
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-MIME-Base64-3.07
+
+	graphviz? ( media-gfx/graphviz )
 "
-# from extras we miss:
-# (nothing)
+
+# RadiusPerl for extras? bug 252128
 
 want_apache modperl
 
@@ -81,22 +89,34 @@ pkg_setup() {
 }
 
 src_prepare() {
-	ecvs_clean
+	# Get a rid of the bzr files
+	rm -rf .bzr*
+
+	# Remove bundled perl modules
+	rm -rf lib/
+}
+
+src_test() {
+	# Shall we remove runtests.pl and t/,xt/ on install?
+	perl runtests.pl || die
 }
 
 src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
+	doins -r . || die
+	doins "${FILESDIR}"/${MY_PB}/bugzilla.cron.{daily,tab} || die
 
 	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
 	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
 	webapp_src_install
 
+	if use extras; then
+		newconfd "${FILESDIR}"/${MY_PB}/bugzilla-queue.confd bugzilla-queue || die
+		newinitd "${FILESDIR}"/${MY_PB}/bugzilla-queue.initd bugzilla-queue || die
+	fi
+
 	# bug #124282
 	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
 	# configuration must be executable
diff --git a/www-apps/bugzilla/files/2.20/apache.htaccess b/www-apps/bugzilla/files/2.20/apache.htaccess
deleted file mode 100644
index eb747223ccec..000000000000
--- a/www-apps/bugzilla/files/2.20/apache.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AddHandler cgi-script .cgi
-Options +Indexes +ExecCGI +FollowSymLinks
-DirectoryIndex index.cgi
diff --git a/www-apps/bugzilla/files/2.20/bugzilla.cron.tab b/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.22/apache.htaccess b/www-apps/bugzilla/files/2.22/apache.htaccess
deleted file mode 100644
index eb747223ccec..000000000000
--- a/www-apps/bugzilla/files/2.22/apache.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AddHandler cgi-script .cgi
-Options +Indexes +ExecCGI +FollowSymLinks
-DirectoryIndex index.cgi
diff --git a/www-apps/bugzilla/files/2.22/bugzilla.cron.daily b/www-apps/bugzilla/files/2.22/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/2.22/bugzilla.cron.daily
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /var/www/bugzilla/
-./collectstats.pl
-./whineatnews.pl
-echo "*** Bugzilla nighlty flush has done! ***"
diff --git a/www-apps/bugzilla/files/2.22/bugzilla.cron.tab b/www-apps/bugzilla/files/2.22/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/2.22/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.22/postinstall-en.txt b/www-apps/bugzilla/files/2.22/postinstall-en.txt
deleted file mode 100644
index 9e7a6225d186..000000000000
--- a/www-apps/bugzilla/files/2.22/postinstall-en.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/2.22/html/installation.html
-   You will need to run ${MY_INSTALLDIR}/checksetup.pl
-
-   IMPORTANT: If you have customized the values in your Status/Resolution
-   field, you must edit checksetup.pl BEFORE YOU RUN IT. Please see the
-   Release Notes for more details.
-
-2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/2.22/release-notes.html
-
-3. Please note that Apache2 sets AllowOverride None by default. You may have
-   to edit it to process the .htaccess file provided by Bugzilla. Please see
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
diff --git a/www-apps/bugzilla/files/2.22/reconfig b/www-apps/bugzilla/files/2.22/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/2.22/reconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-FILE="bugzilla.cron.daily bugzilla.cron.tab"
-
-function die ()
-{
-	echo
-	echo "***"
-	echo "*** Fatal error: $*"
-	echo "***"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
-else
-	echo "done."
-fi
diff --git a/www-apps/bugzilla/files/3.0/bugzilla.cron.daily b/www-apps/bugzilla/files/3.0/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/3.0/bugzilla.cron.daily
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /var/www/bugzilla/
-./collectstats.pl
-./whineatnews.pl
-echo "*** Bugzilla nighlty flush has done! ***"
diff --git a/www-apps/bugzilla/files/3.0/bugzilla.cron.tab b/www-apps/bugzilla/files/3.0/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/3.0/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/3.0/postinstall-en.txt b/www-apps/bugzilla/files/3.0/postinstall-en.txt
deleted file mode 100644
index 2f1c1a34c5b9..000000000000
--- a/www-apps/bugzilla/files/3.0/postinstall-en.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/3.0/html/installing-bugzilla.html
-   You will need to run ${MY_INSTALLDIR}/checksetup.pl
-
-2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/3.0/release-notes.html
-
-3. Please note that Apache2 sets AllowOverride None by default. You may have
-   to edit it to process the .htaccess file provided by Bugzilla. Please see
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
diff --git a/www-apps/bugzilla/files/3.0/reconfig b/www-apps/bugzilla/files/3.0/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/3.0/reconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-FILE="bugzilla.cron.daily bugzilla.cron.tab"
-
-function die ()
-{
-	echo
-	echo "***"
-	echo "*** Fatal error: $*"
-	echo "***"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
-else
-	echo "done."
-fi
diff --git a/www-apps/bugzilla/files/4.0/bugzilla-queue.confd b/www-apps/bugzilla/files/4.0/bugzilla-queue.confd
new file mode 100644
index 000000000000..2eec355a0986
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla-queue.confd
@@ -0,0 +1,4 @@
+#JOBQUEUE_USER=bugzilla
+#JOBQUEUE_GROUP=bugzilla
+
+JOBQUEUE_PATH=/var/www/bugzilla/jobqueue.pl
diff --git a/www-apps/bugzilla/files/4.0/bugzilla-queue.initd b/www-apps/bugzilla/files/4.0/bugzilla-queue.initd
new file mode 100644
index 000000000000..118f738b8073
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla-queue.initd
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/files/4.0/bugzilla-queue.initd,v 1.1 2011/06/17 10:38:41 idl0r Exp $
+
+PIDFILE="/var/run/bugzilla/${SVCNAME}.pid"
+JOBQUEUE_USER=${JOBQUEUE_USER:-root}
+JOBQUEUE_GROUP=${JOBQUEUE_GROUP:-root}
+
+checkconfig() {
+	[[ -z "${JOBQUEUE_USER}" || -z "$(getent passwd ${JOBQUEUE_USER})" ]] && { eerror "JOBQUEUE_USER not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_GROUP}" || -z "$(getent group ${JOBQUEUE_GROUP})" ]] && { eerror "JOBQUEUE_GROUP not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_PATH}" && ! -x "${JOBQUEUE_PATH}" ]] && { eerror "JOBQUEUE_PATH not set or not executable"; return 1; }
+	return 0
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	checkconfig || return 1
+
+	piddir="${PIDFILE%/*}"
+	if [ ! -d "${piddir}" ]; then
+		checkpath -q -d -o $JOBQUEUE_USER:$JOBQUEUE_GROUP -m 0770 "${piddir}" || {
+			eend 1
+			return 1
+		}
+	fi
+
+	start-stop-daemon --start --pidfile $PIDFILE --user $JOBQUEUE_USER --group $JOBQUEUE_GROUP \
+		--exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME start 1>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	checkconfig || return 1
+	start-stop-daemon --pidfile $PIDFILE --stop --exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME stop
+	eend $?
+}
diff --git a/www-apps/bugzilla/files/2.20/bugzilla.cron.daily b/www-apps/bugzilla/files/4.0/bugzilla.cron.daily
index e3e86589891d..e3e86589891d 100644
--- a/www-apps/bugzilla/files/2.20/bugzilla.cron.daily
+++ b/www-apps/bugzilla/files/4.0/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/4.0/bugzilla.cron.tab b/www-apps/bugzilla/files/4.0/bugzilla.cron.tab
new file mode 100644
index 000000000000..3cf2d4a66240
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla.cron.tab
@@ -0,0 +1 @@
+0 0  * * * /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.20/postinstall-en.txt b/www-apps/bugzilla/files/4.0/postinstall-en.txt
index 3eeb24d5a89b..2d18de0b810f 100644
--- a/www-apps/bugzilla/files/2.20/postinstall-en.txt
+++ b/www-apps/bugzilla/files/4.0/postinstall-en.txt
@@ -1,12 +1,13 @@
 0. Bugzilla has been installed into ${MY_INSTALLDIR}
 
 1. To finish the installation, please read
-   http://www.bugzilla.org/docs/2.20/html/installation.html
+   http://www.bugzilla.org/docs/${MY_PB}/en/html/installing-bugzilla.html
    You will need to run ${MY_INSTALLDIR}/checksetup.pl
 
 2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/2.20/release-notes.html
+   http://www.bugzilla.org/releases/${MY_PB}/release-notes.html
 
 3. Please note that Apache2 sets AllowOverride None by default. You may have
    to edit it to process the .htaccess file provided by Bugzilla. Please see
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
+   http://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
+   http://www.bugzilla.org/docs/${MY_PB}/en/html/configuration.html#http for more info.
diff --git a/www-apps/bugzilla/files/2.20/reconfig b/www-apps/bugzilla/files/4.0/reconfig
index 71b0acea2585..71b0acea2585 100644
--- a/www-apps/bugzilla/files/2.20/reconfig
+++ b/www-apps/bugzilla/files/4.0/reconfig
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index f0d123704687..f3f65a1e4fe3 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<use>
-	<flag name='extras'>Optional Perl modules</flag>
-	<flag name='modperl'>Enable <pkg>www-apache/mod_perl</pkg> support</flag>
-</use>
+	<herd>web-apps</herd>
+	<use>
+		<flag name="extras">Optional Perl modules</flag>
+		<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
+	</use>
 </pkgmetadata>