Drop old, move binary files to external mirrors wrt #370913

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

19 files changed, 66 insertions, 1407 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 98743a5ab78f..ea5fc8fee787 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.207 2012/02/14 13:37:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.208 2012/02/14 13:56:17 xarthisius Exp $
+
+  14 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> -doxygen-1.5.5.ebuild,
+  -doxygen-1.5.6.ebuild, -doxygen-1.5.7.1.ebuild, -doxygen-1.5.9.ebuild,
+  -doxygen-1.6.1.ebuild, -doxygen-1.6.2.ebuild, -doxygen-1.7.1.ebuild,
+  -doxygen-1.7.4.ebuild, -files/doxywizard.png, doxygen-1.4.7.ebuild,
+  doxygen-1.5.4.ebuild, doxygen-1.5.8-r1.ebuild, doxygen-1.6.3.ebuild,
+  doxygen-1.7.2.ebuild, doxygen-1.7.3.ebuild, doxygen-1.7.5.1.ebuild,
+  doxygen-1.7.6.1.ebuild:
+  Drop old, move binary files to external mirrors wrt #370913
 
 *doxygen-1.7.6.1 (14 Feb 2012)
 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index c713f47e0f42..eece0b0e0017 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -14,57 +14,41 @@ AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477
 AUX doxygen-1.6.2-dot-eps.patch 2449 RMD160 f8ca2a81af9dbe4fb709528b1f4146fe53aa338e SHA1 408b5119043a35d31b7d55b7f183a0dbae54d678 SHA256 fd62eda9dba9fad7a17c6afdb637178d28b7be7218c975f252a0a3de204c2b87
 AUX doxygen-1.7.1-dot-eps.patch 1359 RMD160 588347d4145638e6309395b8ad7cb4f441fc61ef SHA1 7b6ef31f3e1bc0835f8f9ffcc28d965cbf2d99aa SHA256 d45f040844707d439ee738f03ad81469df15cf14444f701fadf7eb97898771fd
 AUX doxygen-1.7.5.1-dot-eps.patch 1263 RMD160 ee56be1b40acee4cb6af7420826fc6e14404e5d8 SHA1 cee4cd0d9d475605869c8c86c192f9549c97df72 SHA256 d824ec94f2b5234f2434870c9025f1806adbc45512cae652d5ac234b4f4c61b5
-AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
 DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
 DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf SHA1 1a815f7de6b412f7852d57dec9eb50f7c4b03268 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2
-DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b2069b019 SHA1 16b555f5d191cc0f854ae9856c49e4823a51c595 SHA256 b09aebefe212e414282a07301e81316726d5f9b79c0b848474e08bcf346c444a
-DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b SHA1 a478176b9183aef299418e655d6e38b8f8f4e4a5 SHA256 6f5d9ab77a21c7b0e6ebd1524ffa498cc2738ef9a1d8a2ed355117efb3685588
-DIST doxygen-1.5.7.1.src.tar.gz 4096168 RMD160 f9614bb076d6531334a212a95dfbb862a7502c69 SHA1 aecb0c453f76e900eb2aa8132ad063215005fca3 SHA256 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29
 DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
-DIST doxygen-1.5.9.src.tar.gz 4141375 RMD160 51d79c0f8846f47e9aa8c37cd0eb9db630491885 SHA1 6211b850bdaa2198e35546e4299a27774c957ece SHA256 89c3d1102e9e5c63ff735dee88b595bc986fbb2b5944b28ba5f91d31adf8958e
-DIST doxygen-1.6.1.src.tar.gz 3902407 RMD160 0a9c5962dbd076bac418b85b72a4874576c9da4d SHA1 31f861841eba1ebdded1b4bf70bdecb42441dafd SHA256 4c5aedf052a14a0f7fe8c126140ff1c5c50887c74814a4804181c61625d539d3
-DIST doxygen-1.6.2.src.tar.gz 3985401 RMD160 13129dc6c4c156fd939e592c6fa4f86784566d27 SHA1 7e0281a78455c43ff6ed058191ba4a9aac361f4f SHA256 3b2e1ca98552da0e44c640123eb79f5b38f50759d7dbe2e56852218a78bc1e5f
 DIST doxygen-1.6.3.src.tar.gz 3986440 RMD160 3c205185316675a78dba390ef83942d5abda0815 SHA1 36e4f479a136a439307456e539a4bd6c2fefa8b7 SHA256 a3a6524b5fc1da084fd0e081507c99240abaffff85f76ef7b15c9fb3ae248492
 DIST doxygen-1.7-tcl_support.patch.bz2 13843 RMD160 0125101bea93087e2100ec97d89d276607fd1d36 SHA1 cc7c687dba6b0d4e6f6c9ce37229fe9e8ce38a20 SHA256 67578895902c3afa59560000b78a5cdce735d03a7b80fdb240a6880d74ee507c
-DIST doxygen-1.7.1.src.tar.gz 4116363 RMD160 83187765052258078afb0959b80524f703c20cd7 SHA1 fca75d70f48ef0def276fd8db495772f6c43f862 SHA256 4b866f3b194970d7e0768944255d89b0a1aae7bf337f5ae3e4b8358da349da31
 DIST doxygen-1.7.2.src.tar.gz 4130092 RMD160 5d7bc593a7add2330610bd0eae5e21b9580c11ce SHA1 48e86c20c3a25ea9ee895e6214e3d54b4a9e689b SHA256 1f6de57f7fe9acc65dc86bbdade21fc84bd013b66daeebc497e16e3a54ad91a1
 DIST doxygen-1.7.3.src.tar.gz 4507887 RMD160 52f0826451535754c77b7984e580f02f1c7d50f3 SHA1 06e1d84b50beecdfe0f91393b83c29e8a3db1011 SHA256 c7857d246f75ea287328023a6af71dec8f45a765932a86fcfcc951920a647766
-DIST doxygen-1.7.4.src.tar.gz 4570255 RMD160 bcdf00be04b4391f72decd008c5ceafcc4cc8c06 SHA1 4f68b655c93265cb15ef1b8c9ca35ebc39698cf0 SHA256 845c994440dcdbbde81afcb2feae16c4f4cafb85e5dd379b238530e4caf5df66
 DIST doxygen-1.7.5.1.src.tar.gz 4689511 RMD160 cd0552ea3e2e810dfb943700af70bb1cf9e0b6ae SHA1 15671defd1eefe255aa564b6f3097e30ab07ff55 SHA256 fdaec929502e3c4490bfcc87b48a916dab29310d3c7ef88d06f2806436e9ccd0
 DIST doxygen-1.7.6.1.src.tar.gz 4791654 RMD160 bd31ec5e62786683f0350f3e59f8d0835b4d88e3 SHA1 6203d4423d12315f1094b56a4d7393347104bc4a SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd
-EBUILD doxygen-1.4.7.ebuild 3704 RMD160 2eb5f033e3c74151a47810ff891da56f6496c540 SHA1 0391691e76518782caeb2cb65da588dc5dc3d5b0 SHA256 ca8f96af859e6edf280819f3f022051688a3606a78fc0fa6e73e7856c7579306
-EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6 SHA1 a7aa62f3a45baeb832b6e915f7c2a85f59674b57 SHA256 0778d0f7905e75ad14ce09a88c0af12fd75ae7524b7fb8381a2b345dd35df127
-EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc SHA1 8e6f528aed0369a6214689916f1497ed01b40456 SHA256 fe0b01e91433a9cc4afb45aad725fbd9a9f4ffaaa3a422b9571409407f43e088
-EBUILD doxygen-1.5.6.ebuild 4499 RMD160 470b6034a63d4bdebd48443b063e6565ba926b01 SHA1 943482558e93d3dd6de145532c95f2e203eca6e3 SHA256 01028754cf1a7be1e012e3df8ba3d433e48d63aa7e54b5323764fd0aa090ec21
-EBUILD doxygen-1.5.7.1.ebuild 4726 RMD160 bdd542705abb6c260fd29f6c02f0664979d1c8af SHA1 97513e9b35b7fd410754b587c418a1b5102cf86e SHA256 d8f68d435453a9a34cdfd29044ba999cfdd2f09dee293d9d05f7676a56506850
-EBUILD doxygen-1.5.8-r1.ebuild 5429 RMD160 5225f7083f5b4ead905b6b2c7fad8a3c85867199 SHA1 990bc64d91cee5c5d07a7fd68c763a0aaf56929e SHA256 89300f0eb2f71c69b64b0396d1716dfa1f0bd8fd007f17939566e40c2aad371a
-EBUILD doxygen-1.5.9.ebuild 5144 RMD160 d244e60be9c36417a3e769c67b194176b5dee9dd SHA1 4e12937fd29dda8d660cf9bef4dd3791828f77bd SHA256 bdfe3f87de8d0024022fe0d89384bd3eee1f7aea3a53d384e7c439c6a535f883
-EBUILD doxygen-1.6.1.ebuild 5327 RMD160 5cae97bf462e0ca2bb58ad9cabf6893a688be2c0 SHA1 71d307fce65e0d39ac8d728513ab3e60944b4c8d SHA256 bfc366a15795bafbf70b25385eeb8fa96039bfcbe4adf6f8716b0ce04961bcc0
-EBUILD doxygen-1.6.2.ebuild 5146 RMD160 30e58447ad9b12b69893eec1c2a31e6cafb01719 SHA1 57f17659d5d902a005f647d991206084ebcd4c1f SHA256 af0c0b5216a59ce9aaa0978bfc11a900e84b401839c619f3222c81397978f610
-EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072 SHA1 635cb35dfd0c4211d7ae9baab8ccba6247915535 SHA256 c4371ceabf44d69fccb34066f662a5e6a3723d3e4efbf25820709d7ffbd577ec
-EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343
-EBUILD doxygen-1.7.2.ebuild 5554 RMD160 4998e8d3fad9060e16a9562564a06c02a434e23b SHA1 138a9ad80e18255e2a49096d247a67c993eaf9b1 SHA256 d7168596217bc6f470c1d684035a352e5f33c3ae341b08f4475abd8158f79fe1
-EBUILD doxygen-1.7.3.ebuild 5790 RMD160 4665316d7adc951b444daa413830953248f8ec43 SHA1 b410891b29c652d731da48787a2fc86da57f23eb SHA256 10d6899dff5678438875ce64f82891c720e2a7f2d4e1d90208d459f6e1132655
-EBUILD doxygen-1.7.4.ebuild 5320 RMD160 91014a6c3d8a32c81528c8488b76624219d50661 SHA1 ccd95ea2fe45d63ba0878a5e6ecc7dc1b34cf115 SHA256 754d9b93cbbfea01ac492e904908c3abcd0a6d4e8d885f83512a6c436ccc52e2
-EBUILD doxygen-1.7.5.1.ebuild 5180 RMD160 dfad932d2ca3bc0a29cd59f54a27ba752d028feb SHA1 f41d8bf9c0c3af0ef1f4d97292af0713d54859f2 SHA256 c746d08002b472d41922702e55b3aaac45db5744e9f4fedcb5b3bb1722c5f129
-EBUILD doxygen-1.7.6.1.ebuild 6153 RMD160 ca422acd24ef2403d405a397f72c51d1f1906edd SHA1 8f0f1e2ef8cf4a510b57ac767b6acdfca50d8928 SHA256 36fa595c9164dced8701c301c4d1e3f09697c1b12960fcb49a13a4fe48ea4ee0
-MISC ChangeLog 35047 RMD160 91c5ba4fc0d2d0df6bde4d159a0a1823e411fd2f SHA1 cceeec55b36747677192355ec52c8100dc95ba69 SHA256 4a4aabf105f7eb8bd15ffcaa966f54623ec9ad8bb83c74e661a1385c248d25a9
+DIST doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
+EBUILD doxygen-1.4.7.ebuild 3768 RMD160 a4459fb90b52fd71b045d34b9c6a6201285c386b SHA1 dc71695d09b853d24ef19c164ad8d02769955219 SHA256 76c18e38920b213fe8f4762d6f193172094ebd4d39212dae5233cb00bb52dc24
+EBUILD doxygen-1.5.4.ebuild 4596 RMD160 79d9941fd43c14b91bccf52690e977ec524f1aac SHA1 0b7fe56d92ff3aed8243edcd81e5c63181c2bd4c SHA256 b893d2c88646276e3b777515fc4e756cfe359ed2a5da9f562bb244424a7bb58d
+EBUILD doxygen-1.5.8-r1.ebuild 5496 RMD160 a81ec8e4ae55f47ab780e39de525a42957f03f27 SHA1 6be185a49ee397af21ba914c9a3cc0dd8e75c7d3 SHA256 dac299b3ade9c22d78aec62dc7ef49a28d80bc609968b8f0e2b3a3eab542567e
+EBUILD doxygen-1.6.3.ebuild 5221 RMD160 10e4a862627ed2f7b6dc9adf90dda3fa38714e01 SHA1 52475fe2d29c69174342f4c7c21d6dd15831453f SHA256 43d23dcc6a26d0ac5ae8a61d703a9734653d121e824fdf386efe1dd5848dc62c
+EBUILD doxygen-1.7.2.ebuild 5613 RMD160 b76a306f15b3eca9dcec1ce21af0ce35a2ce2abe SHA1 0c8e3c30489863a29333c29bdcbddfbc0895da8c SHA256 d2c717514f01616b17fe12fb66f2a442120a48e4e9fa8fd64b377476b22ff05a
+EBUILD doxygen-1.7.3.ebuild 5796 RMD160 4547798c837597c70a767ec9628cda2511c0adc3 SHA1 339c951729eba8453b5beaf0f0cbbc61a11e9cc1 SHA256 f0cf6896e429869897fb452b7a04dbb50d9ede3d58936644e1edc8be6ca786d8
+EBUILD doxygen-1.7.5.1.ebuild 5245 RMD160 1404ee0fb171ed3b6859c48a2cbe23b81d5ea95b SHA1 b47e1cca85ae301c627b7af79a17987bd554027f SHA256 6c4f3204880fb0810ae59e07c09931102c83b6e7bcaa6b0043c2cdbff989af30
+EBUILD doxygen-1.7.6.1.ebuild 6214 RMD160 a0974c1e870a08a927d97ba4364672d6254fb0c6 SHA1 04226dabd4621af2cceb04889dc4a81ec223013b SHA256 196221870e0bbf7b3e35610822fb960064519386fba9bc8d26dd79264cbe97b1
+MISC ChangeLog 35568 RMD160 ee0bd78daf7e6798cdd1018b44d3e2761ef2c31f SHA1 804ede9c9c66758a995da25100db2da94a1bdc7e SHA256 d92a5591be1e35db1cbf73f8f4a612b21b66a2b88438c70ac9cd77a7deda59f0
 MISC metadata.xml 1019 RMD160 b1d14f64119ee8cb68eeee22aa6178614438db9b SHA1 f2c94632397b23f9ebb778bd3814d939333ba32c SHA256 2f5b46f26e8aebd41be7ff37d05a0cb1de1e9b409a19e60bc26218306766384f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPOmO/AAoJEF0huFKJUZL5bXMP/jfbLUrCv5hULQJRVjUU6EKf
-Y2vVS8pnmhxbdRgCvwnOK11lKQ4n2gKFDpHyjRd1NRQaTViWBEo2cXpzJpy16x9B
-tRl2HxfWZ+MPJHsrfZMRCa+D/7VsZIxyPhOcyezHb9Le0kAmqFRM2UHN9siHsW1w
-jsYUs7ckw69FCD2hWU/QUw3qdL4lTPtoS6jnPKE8Qy3Li9MgDVRjbYihK83sI/bv
-7uZFZio2RsEUQFUIOqFxU14kzIS8eJT8WLKTfR7OWN7EEwmvEBODZ+Bczt+hdDa+
-z2Fqr2hNzwmLk8HHrzrRrUDq6WP8AmoYmXwwx520mWqh0lYYLHSv/D+4IQfEZjru
-aEQ4yCtee1Ibm2UDO5e6Cw8foigSSorELii3x542f4NFxT+EUNOkBcx2cdsTD0oH
-n/LpHvG6Qest6foCzOwRTOjvpaFILaJfYiXm1IwoKgMwXPtXJufDooVflR7lAfv0
-SN6YF/iN+2s60lEF6Mb1hZj3Md1dV7Uw3YQq02heNbbj+DQpHfNbKCnMQ1cc6QRg
-kR+A3VLCXzwa2VsB6b6kgm0GZFHU1NykesyRUbQ/3HeWQUMWBXCWjwlTk1hgPg/G
-oOugT1IM6vKJf/HaF3r1NkCOop1It8CK3FBtmoLkz7E9mNUCJRuSwqPb9y4B9tBU
-XC9a9AzM+2s1Qb1/p+GM
-=yzlL
+iQIcBAEBCAAGBQJPOmgpAAoJEF0huFKJUZL5u1kP/1AVkLB1mpJ8y1mwplhfEVc5
+3goIVOXPbZBbe/qKWPFw+UVNOSiX0x3HF+W2TGj/wURlCKBJ7b/RD+fgBHCLebgP
+n3l9TjKFvriDubcZvhfdI8Cz1OxsGzAPa4+wLBg1rRmMzxs2/UHpNR2J5mSo5j6A
+TrIoqDyEWl/UGRhtQwsMePU0T8objemvlGuk3xnKbogkBB9RPgDH3ef+xY8b91MV
+HRD8R4bpiBUPl60n0fl6Yj0mqZTESIb2REHeSMCMR2Y8Qb45EPMDxqMU3ChrMS8U
+CcGeEb/DMWl/kMRwZs6tbhg3Eq3CSj4N0/eefVpf8f8EtKH8JYfSxxf04ueQgGER
+UmKbWl/9mDoQLpz3biLSfLx/xIt+rnp3lAHKw9N9dy0iFR0c6XCCrkh3nRpSBCIi
+lcG1+r/5CiSzKx+/YX9y5u5WaX9mvp39OSStsbsIDeNb50E7FrNM6FN4mTIyHXad
+xJxi+KuWAIiE0FsJ/Z6kKRPLdAH/li/1nD7np6wS17WKsK/wbp78NAyl/sbbebpC
+c3OoLTKOc9GIqum084QQRyPpB5bO+A/uAUBhmTSTs9vtccm06+ZIuCD3BPh3sPvj
+AXqLT/eMBLdU3P81+xQXpX085DVoHzTHK6HOn6iZOT4YHKYhRDBb9uALgxaXDWgt
+tYdeOUSz5iKERnhpLg2e
+=OU4Z
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
index 3387907786e1..51cb8baeae5c 100644
--- a/app-doc/doxygen/doxygen-1.4.7.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.29 2010/01/02 22:22:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.30 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=1
 
@@ -9,6 +9,7 @@ inherit eutils flag-o-matic toolchain-funcs
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
 SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 	unicode? ( mirror://gentoo/${P}-utf8-ru.patch.gz )"
 
 LICENSE="GPL-2"
diff --git a/app-doc/doxygen/doxygen-1.5.4.ebuild b/app-doc/doxygen/doxygen-1.5.4.ebuild
index cf1fd1f5e196..8cb1fcd285ff 100644
--- a/app-doc/doxygen/doxygen-1.5.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.20 2010/01/02 22:22:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.21 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=1
 
@@ -8,7 +8,8 @@ inherit eutils flag-o-matic toolchain-funcs fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+    http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-doc/doxygen/doxygen-1.5.5.ebuild b/app-doc/doxygen/doxygen-1.5.5.ebuild
deleted file mode 100644
index 03e685a6943b..000000000000
--- a/app-doc/doxygen/doxygen-1.5.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v 1.9 2010/01/02 22:22:09 yngwin Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot latex elibc_FreeBSD"
-
-RDEPEND="latex? ( app-text/texlive-core
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-fontsrecommended )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.6
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-
-	# remove internal libpng - see bug #210237
-	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
-
-	if [ $(get_libdir) == "lib64" ] ; then
-		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
-	fi
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		epause 6
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	if use debug; then
-		my_conf="--prefix ${D}usr --debug"
-	else
-		my_conf="--prefix ${D}usr"
-	fi
-
-	./configure ${my_conf} || die 'configure failed'
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-		LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-			{Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
-		fi
-		if use latex; then
-		addwrite /var/cache/fonts
-		addwrite /var/cache/fontconfig
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make pdf docs" failed.'
-		else
-		cp doc/Doxyfile doc/Doxyfile.orig
-		cp doc/Makefile doc/Makefile.orig
-		sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-			doc/Doxyfile
-		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-			-e "s/@sed/# @sed/" doc/Makefile
-		make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/"${PF}"
-		if use latex; then
-		doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags doc, and latex will enable "
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.5.6.ebuild b/app-doc/doxygen/doxygen-1.5.6.ebuild
deleted file mode 100644
index 4ed1bfcf3653..000000000000
--- a/app-doc/doxygen/doxygen-1.5.6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.5 2010/01/02 22:22:09 yngwin Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot latex elibc_FreeBSD"
-
-RDEPEND="latex? ( app-text/texlive-core
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-fontsrecommended )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.6
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-
-	# remove internal libpng - see bug #210237
-	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
-
-	if [ $(get_libdir) == "lib64" ] ; then
-		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
-	fi
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		epause 6
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	if use debug; then
-		my_conf="--prefix ${D}usr --debug"
-	else
-		my_conf="--prefix ${D}usr"
-	fi
-
-	./configure ${my_conf} || die 'configure failed'
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-		LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-			{Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
-		fi
-		if use latex; then
-		addwrite /var/cache/fonts
-		addwrite /var/cache/fontconfig
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make pdf docs" failed.'
-		else
-		cp doc/Doxyfile doc/Doxyfile.orig
-		cp doc/Makefile doc/Makefile.orig
-		sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-			doc/Doxyfile
-		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-			-e "s/@sed/# @sed/" doc/Makefile
-		make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/"${PF}"
-		if use latex; then
-		doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags doc, and latex will enable "
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.5.7.1.ebuild b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
deleted file mode 100644
index e0cb88516f90..000000000000
--- a/app-doc/doxygen/doxygen-1.5.7.1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.6 2010/01/02 22:22:09 yngwin Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot latex elibc_FreeBSD"
-
-RDEPEND="latex? ( app-text/texlive-core
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-latexextra )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.6
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${PN}-1.5-legacy-patches.diff"
-	epatch "${FILESDIR}/${P}-substitute.patch"
-
-	# remove internal libpng - see bug #210237
-	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
-
-	if [ $(get_libdir) == "lib64" ] ; then
-		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
-	fi
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed failed"
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		epause 6
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_compile() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	if use debug; then
-		my_conf="--prefix /usr --debug"
-	else
-		my_conf="--prefix /usr"
-	fi
-
-	./configure ${my_conf} || die 'configure failed'
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-		LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-		sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-			{Doxyfile,doc/Doxyfile} || ewarn "disabling dot failed"
-		fi
-		if use latex; then
-		addwrite /var/cache/fonts
-		addwrite /var/cache/fontconfig
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make pdf docs" failed.'
-		else
-		cp doc/Doxyfile doc/Doxyfile.orig
-		cp doc/Makefile doc/Makefile.orig
-		sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-			doc/Doxyfile
-		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-			-e "s/@sed/# @sed/" doc/Makefile
-		make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/"${PF}"
-		if use latex; then
-		doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags doc, and latex will enable"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
index 038da13be091..a2d8742e0513 100644
--- a/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.10 2010/10/07 23:08:03 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8-r1.ebuild,v 1.11 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=2
 
@@ -8,7 +8,8 @@ inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+    http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -145,7 +146,7 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"doxywizard" "Application;Development"
 	fi
diff --git a/app-doc/doxygen/doxygen-1.5.9.ebuild b/app-doc/doxygen/doxygen-1.5.9.ebuild
deleted file mode 100644
index 56ac8f3af629..000000000000
--- a/app-doc/doxygen/doxygen-1.5.9.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.9.ebuild,v 1.4 2010/01/17 16:31:11 ayoy Exp $
-
-EAPI=2
-
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( app-text/texlive-core
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.20.0
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch"
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed failed"
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		epause 6
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	if use debug; then
-		my_conf="--prefix /usr --debug"
-	else
-		my_conf="--prefix /usr"
-	fi
-
-	export CC="${QMAKE_CC}"
-	export CXX="${QMAKE_CXX}"
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4; then
-		export QTDIR="/usr"
-		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-		./configure ${my_conf} $(use_with qt4 doxywizard) \
-		|| die 'configure with qt4 failed'
-	else
-		./configure ${my_conf} || die 'configure failed'
-	fi
-}
-
-src_compile() {
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| ewarn "disabling dot failed"
-		fi
-		if use latex; then
-			addwrite /var/cache/fonts
-			addwrite /var/cache/fontconfig
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-				doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"doxywizard.png" "Application;Development"
-	fi
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		dohtml -r html/*
-		if use latex; then
-			insinto /usr/share/doc/"${PF}"
-			doins latex/doxygen_manual.pdf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.6.1.ebuild b/app-doc/doxygen/doxygen-1.6.1.ebuild
deleted file mode 100644
index aed9eeeefe50..000000000000
--- a/app-doc/doxygen/doxygen-1.6.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.1.ebuild,v 1.5 2010/05/22 09:00:44 jlec Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( app-text/texlive-core
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexrecommended
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.20.0
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed 1 failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}/${PN}-1.5-dot-eps.patch"
-
-	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed 2 failed"
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	use debug && my_conf="--debug"
-
-	export CC="${QMAKE_CC}"
-	export CXX="${QMAKE_CXX}"
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4; then
-		export QTDIR="${EPREFIX}/usr"
-		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
-		|| die 'configure with qt4 failed'
-	else
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
-	fi
-}
-
-src_compile() {
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| ewarn "disabling dot failed"
-		fi
-		if use latex; then
-			addwrite /var/cache/fonts
-			addwrite /var/cache/fontconfig
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-				doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"doxywizard.png" "Application;Development"
-	fi
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		dohtml -r html/*
-		if use latex; then
-			insinto /usr/share/doc/"${PF}"
-			doins latex/doxygen_manual.pdf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.6.2.ebuild b/app-doc/doxygen/doxygen-1.6.2.ebuild
deleted file mode 100644
index 4db5f052f1fe..000000000000
--- a/app-doc/doxygen/doxygen-1.6.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.2.ebuild,v 1.2 2010/05/22 09:00:44 jlec Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( >=app-text/texlive-2008[extra] )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.20.0
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed 1 failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}/${P}-dot-eps.patch"
-
-	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed 2 failed"
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	use debug && my_conf="--debug"
-
-	export CC="${QMAKE_CC}"
-	export CXX="${QMAKE_CXX}"
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4; then
-		export QTDIR="${EPREFIX}/usr"
-		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
-		|| die 'configure with qt4 failed'
-	else
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
-	fi
-}
-
-src_compile() {
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| ewarn "disabling dot failed"
-		fi
-		if use latex; then
-			addwrite /var/cache/fonts
-			addwrite /var/cache/fontconfig
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-				doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"doxywizard.png" "Application;Development"
-	fi
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		dohtml -r html/*
-		if use latex; then
-			insinto /usr/share/doc/"${PF}"
-			doins latex/doxygen_manual.pdf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.6.3.ebuild b/app-doc/doxygen/doxygen-1.6.3.ebuild
index 141000842a7e..77da48e33c40 100644
--- a/app-doc/doxygen/doxygen-1.6.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.6.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.3.ebuild,v 1.2 2010/05/22 09:00:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.6.3.ebuild,v 1.3 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=3
 
@@ -8,7 +8,8 @@ inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+    http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -128,7 +129,7 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"doxywizard.png" "Application;Development"
 	fi
diff --git a/app-doc/doxygen/doxygen-1.7.1.ebuild b/app-doc/doxygen/doxygen-1.7.1.ebuild
deleted file mode 100644
index 7727d2fdabbf..000000000000
--- a/app-doc/doxygen/doxygen-1.7.1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.1.ebuild,v 1.2 2010/09/29 02:34:43 nerdboy Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( >=app-text/texlive-2008[extra] )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.20.0
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf \
-		|| die "sed 1 failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}/${P}-dot-eps.patch"
-
-	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed 2 failed"
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die "sed 3 failed"
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf=""
-	use debug && my_conf="--debug"
-
-	export CC="${QMAKE_CC}"
-	export CXX="${QMAKE_CXX}"
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4; then
-		export QTDIR="${EPREFIX}/usr"
-		einfo "using QTDIR: '$QTDIR'."
-		export LIBRARY_PATH="${QTDIR}/$(get_libdir)${LIBRARY_PATH:+:}${LIBRARY_PATH}"
-		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir)${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
-		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} $(use_with qt4 doxywizard) \
-		|| die 'configure with qt4 failed'
-	else
-		./configure --prefix "${EPREFIX}/usr" ${my_conf} || die 'configure failed'
-	fi
-}
-
-src_compile() {
-	emake all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| ewarn "disabling dot failed"
-		fi
-		if use latex; then
-			addwrite /var/cache/fonts
-			addwrite /var/cache/fontconfig
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-				doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"doxywizard.png" "Application;Development"
-	fi
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		dohtml -r html/*
-		if use latex; then
-			insinto /usr/share/doc/"${PF}"
-			doins latex/doxygen_manual.pdf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.7.2.ebuild b/app-doc/doxygen/doxygen-1.7.2.ebuild
index 3d875444f58c..c645aa286719 100644
--- a/app-doc/doxygen/doxygen-1.7.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.2.ebuild,v 1.12 2011/01/18 14:07:38 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.2.ebuild,v 1.13 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=3
 
@@ -9,6 +9,7 @@ inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
 SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png
 	tcl? ( mirror://gentoo/${PN}-1.7-tcl_support.patch.bz2 )"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
@@ -141,7 +142,7 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"/usr/share/pixmaps/doxywizard.png" \
 			"Application;Development"
diff --git a/app-doc/doxygen/doxygen-1.7.3.ebuild b/app-doc/doxygen/doxygen-1.7.3.ebuild
index e271749fdd17..5c1df291405b 100644
--- a/app-doc/doxygen/doxygen-1.7.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.3.ebuild,v 1.7 2011/03/29 12:45:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.3.ebuild,v 1.8 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=3
 
@@ -149,7 +149,7 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"/usr/share/pixmaps/doxywizard.png" \
 			"Application;Development"
diff --git a/app-doc/doxygen/doxygen-1.7.4.ebuild b/app-doc/doxygen/doxygen-1.7.4.ebuild
deleted file mode 100644
index 08691774e54c..000000000000
--- a/app-doc/doxygen/doxygen-1.7.4.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.4.ebuild,v 1.3 2011/09/03 02:02:28 nerdboy Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
-
-DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	tcl? ( mirror://gentoo/${PN}-1.7-tcl_support.patch.bz2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="debug doc nodot qt4 latex tcl elibc_FreeBSD"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( >=app-text/texlive-2008[extra] )
-	dev-lang/python
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	!nodot? ( >=media-gfx/graphviz-2.20.0
-		media-libs/freetype )"
-DEPEND=">=sys-apps/sed-4
-	sys-devel/flex
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_prepare() {
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
-
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
-		|| die "sed 1 failed"
-
-	# Ensure we link to -liconv
-	if use elibc_FreeBSD; then
-		for pro in */*.pro.in */*/*.pro.in; do
-		echo "unix:LIBS += -liconv" >> "${pro}"
-		done
-	fi
-
-	# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
-	epatch "${FILESDIR}"/${PN}-1.7.1-dot-eps.patch
-
-	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${PN}-1.5.6-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		addon/doxywizard/Makefile.in || die "sed 2 failed"
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die "sed 3 failed"
-
-	# add native TCL support
-	use tcl && epatch "${WORKDIR}"/${PN}-1.7-tcl_support.patch
-
-	if is-flagq "-O3" ; then
-		echo
-		ewarn "Compiling with -O3 is known to produce incorrectly"
-		ewarn "optimized code which breaks doxygen."
-		echo
-		elog "Continuing with -O2 instead ..."
-		echo
-		replace-flags "-O3" "-O2"
-	fi
-}
-
-src_configure() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-
-	local my_conf="--shared"
-
-	if use debug ; then
-		my_conf="${my_conf} --debug"
-	else
-		my_conf="${my_conf} --release "
-	fi
-
-	use ppc64 && my_conf="${my_conf} --english-only" #263641
-
-	use qt4 && my_conf="${my_conf} --with-doxywizard"
-
-	export CC="${QMAKE_CC}"
-	export CXX="${QMAKE_CXX}"
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
-			|| die 'configure failed'
-}
-
-src_compile() {
-
-	# force stupid qmake to behave - if it works...
-	if use qt4 ; then
-		qt4-r2_src_compile
-	else
-		CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
-			emake all || die 'emake failed'
-	fi
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use nodot; then
-			sed -i -e "s/HAVE_DOT               = YES/HAVE_DOT    = NO/" \
-				{Doxyfile,doc/Doxyfile} \
-				|| ewarn "disabling dot failed"
-		fi
-		if use latex; then
-			addwrite /var/cache/fonts
-			addwrite /var/cache/fontconfig
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" \
-				doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
-		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
-			"/usr/share/pixmaps/doxywizard.png" \
-			"Application;Development"
-	fi
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		dohtml -r html/*
-		if use latex; then
-			insinto /usr/share/doc/"${PF}"
-			doins latex/doxygen_manual.pdf
-		fi
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	elog
-	elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
-	elog "the html and pdf documentation, respectively.  For examples"
-	elog "and other goodies, see the source tarball.  For some example"
-	elog "output, run doxygen on the doxygen source using the Doxyfile"
-	elog "provided in the top-level source dir."
-	elog
-	elog "Enabling the nodot USE flag will remove the GraphViz dependency,"
-	elog "along with Doxygen's ability to generate diagrams in the docs."
-	elog "See the Doxygen homepage for additional helper tools to parse"
-	elog "more languages."
-	elog
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/app-doc/doxygen/doxygen-1.7.5.1.ebuild b/app-doc/doxygen/doxygen-1.7.5.1.ebuild
index d5974c53d9b4..d24104bfe79d 100644
--- a/app-doc/doxygen/doxygen-1.7.5.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.5.1.ebuild,v 1.1 2011/11/05 21:30:54 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.5.1.ebuild,v 1.2 2012/02/14 13:56:17 xarthisius Exp $
 
 RESTRICT="mirror"
 EAPI=3
@@ -9,7 +9,8 @@ inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="documentation system for C++, C, Java, Objective-C, Python, IDL, and other languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+    http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
@@ -142,7 +143,7 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"/usr/share/pixmaps/doxywizard.png" \
 			"Application;Development"
diff --git a/app-doc/doxygen/doxygen-1.7.6.1.ebuild b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
index 256f5c1f4dcd..9d8cf06d72bf 100644
--- a/app-doc/doxygen/doxygen-1.7.6.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.6.1.ebuild,v 1.1 2012/02/14 13:37:27 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.7.6.1.ebuild,v 1.2 2012/02/14 13:56:17 xarthisius Exp $
 
 EAPI=4
 
@@ -8,7 +8,8 @@ inherit eutils flag-o-matic toolchain-funcs qt4-r2 fdo-mime
 
 DESCRIPTION="Documentation system for most programming languages"
 HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
+   http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -189,7 +190,7 @@ src_install() {
 	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
 
 	if use qt4; then
-		doicon "${FILESDIR}/doxywizard.png"
+		doicon "${DISTDIR}/doxywizard.png"
 		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 			"/usr/share/pixmaps/doxywizard.png" \
 			"Application;Development"
diff --git a/app-doc/doxygen/files/doxywizard.png b/app-doc/doxygen/files/doxywizard.png
deleted file mode 100644
index c648231e7ea2..000000000000
--- a/app-doc/doxygen/files/doxywizard.png
+++ /dev/null