added patches for bugs 129142, 121770, and 129560

(Portage version: 2.1_pre10-r2)
 (Unsigned Manifest commit)

7 files changed, 300 insertions, 36 deletions

diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 5599492820a3..40b101a61805 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,54 +1,93 @@
-MD5 fe2ab71cb8ebd9c00c5e5f356f02546a ChangeLog 15947
-RMD160 0fd18f1ffd8c7c583d1913ac141ec516af1a50ee ChangeLog 15947
-SHA256 3670d7d6c7cb62a270914abe79463d6850790584d21af7ac9a8de127f2637378 ChangeLog 15947
-MD5 9e4f09c75bce2e0c15ac325f29868585 doxygen-1.4.2.ebuild 3442
-RMD160 513999de90f09e383fd27cacbd03da3261fc86ab doxygen-1.4.2.ebuild 3442
-SHA256 a0d636e2df12ef41b98137ff61d0b34505b31ea5c3b233c6671836016ccbe44f doxygen-1.4.2.ebuild 3442
-MD5 85da3650b541d64e985cdeeaa2fb20f0 doxygen-1.4.3-r1.ebuild 3531
-RMD160 e5d01ebcc84cd6a4c1f4e05640f64bff6d8e3eb3 doxygen-1.4.3-r1.ebuild 3531
-SHA256 75465ccb66f218bedba25e86dea8025dd865ae7222f608672dcfff0557ff6148 doxygen-1.4.3-r1.ebuild 3531
-MD5 c2de8c267dcef04b44f4dd072f76efdb doxygen-1.4.4.ebuild 3368
-RMD160 f185f1bd290bddae73bab43e9f660045f5eb07cd doxygen-1.4.4.ebuild 3368
-SHA256 943bd5f561ad7f48e62000e88c9d014707f6e8306b7c9245f0c7722e28e93ee8 doxygen-1.4.4.ebuild 3368
-MD5 c7de7b65f2c8fcd7c565d6d2ed240773 doxygen-1.4.5.ebuild 3393
-RMD160 f73e981d965ba429e06edc818b245358050086b7 doxygen-1.4.5.ebuild 3393
-SHA256 6d1600fc068af517a0820ad99ecf04235ead00a2aa6f115411334255744fcbfc doxygen-1.4.5.ebuild 3393
-MD5 94b6e650a3725fb838eae6e6a519b6ec doxygen-1.4.6.ebuild 3810
-RMD160 81767fa393d79d119574909525f487349f74b194 doxygen-1.4.6.ebuild 3810
-SHA256 ed786af538dc037d80d5049c8e84ad444e430003b89b26fb4b17191d32e78f99 doxygen-1.4.6.ebuild 3810
+AUX 1.4.6/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e size 683
+MD5 3eae39cd24982cc69c7ca5a767b1157c files/1.4.6/01_all_cp1251.patch 683
+RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/1.4.6/01_all_cp1251.patch 683
+SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e files/1.4.6/01_all_cp1251.patch 683
+AUX 1.4.6/02_all_freebsd.patch 405 RMD160 7856281a3ec84c0f2a6815fbadf781365c93f91e SHA1 20422d9fb4eccf53c885a6c1671588d4d624adf2 SHA256 893e64e08358865d0da55a6b3a3678d38e1dffc8fb0a3498d206488d2e490b18 size 405
+MD5 f11a93e23bfb89433c3eb7ac72885c01 files/1.4.6/02_all_freebsd.patch 405
+RMD160 7856281a3ec84c0f2a6815fbadf781365c93f91e files/1.4.6/02_all_freebsd.patch 405
+SHA256 893e64e08358865d0da55a6b3a3678d38e1dffc8fb0a3498d206488d2e490b18 files/1.4.6/02_all_freebsd.patch 405
+AUX 1.4.6/03_all_segfault.patch 494 RMD160 559ecbf45ae967d45d0b062ea5571c7a40a99640 SHA1 540f5e91c86ea7129e6891323d9a6f43c4006b5d SHA256 dc81ce072850deabc53e8b39a77f5834dc8cfff43f48fffc32df44ba0b8414fc size 494
+MD5 8a437f8fe664ad11a21eaf2e3a4e85a3 files/1.4.6/03_all_segfault.patch 494
+RMD160 559ecbf45ae967d45d0b062ea5571c7a40a99640 files/1.4.6/03_all_segfault.patch 494
+SHA256 dc81ce072850deabc53e8b39a77f5834dc8cfff43f48fffc32df44ba0b8414fc files/1.4.6/03_all_segfault.patch 494
+AUX 1.4.6/04_amd64_qtools.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce size 267
+MD5 9b79bcfbb78c577a9cf1e433cedf043d files/1.4.6/04_amd64_qtools.patch 267
+RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 files/1.4.6/04_amd64_qtools.patch 267
+SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce files/1.4.6/04_amd64_qtools.patch 267
+AUX 1.4.6/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 size 5329
+MD5 71370c721f1433caffd8c3a18667abac files/1.4.6/05_all_system-libpng.patch 5329
+RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 files/1.4.6/05_all_system-libpng.patch 5329
+SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 files/1.4.6/05_all_system-libpng.patch 5329
+AUX 1.4.6/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2 size 1230
+MD5 87818d755adae0f2bd5ad785bfcdb3bf files/1.4.6/06_all_qtools.patch 1230
+RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 files/1.4.6/06_all_qtools.patch 1230
+SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2 files/1.4.6/06_all_qtools.patch 1230
+AUX bsd-configure.patch 504 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 SHA1 df68c4be15c41b02c822364b5f54214ce65b3fc0 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1 size 504
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 files/bsd-configure.patch 504
 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1 files/bsd-configure.patch 504
-MD5 2b19924774233119f6900b663192824f files/digest-doxygen-1.4.2 138
-RMD160 d7c46d9d2e8bc837d58e2a56476ae52bcee98b28 files/digest-doxygen-1.4.2 138
-SHA256 b4d6798dd4438b67046d8d937aabc1c7cbac6af1d3efcf560210b8b8054ee903 files/digest-doxygen-1.4.2 138
-MD5 7160e022b517f737e2efb6db0ee0aaf4 files/digest-doxygen-1.4.3-r1 138
-RMD160 42b76d42fe4c42027f4610604bd708a0696ddace files/digest-doxygen-1.4.3-r1 138
-SHA256 e2024f6b57611365b4c864d245fcd426b53cb4c233761bb504c8db70fdfd6347 files/digest-doxygen-1.4.3-r1 138
-MD5 361cc7af33bff0eeb9da4c320c16df0a files/digest-doxygen-1.4.4 138
-RMD160 5079ff84bb6d1f54e94a6a0ea282848b988a4cc9 files/digest-doxygen-1.4.4 138
-SHA256 82f454b17347e98402d82e020def3530c8c8eef196eebf661cb4b46919d65bb6 files/digest-doxygen-1.4.4 138
-MD5 0c890088afd129ac9eadf2cd86c9ad2b files/digest-doxygen-1.4.5 138
-RMD160 cdd5bcdf28d0362665440e3e46040d23c30b3b46 files/digest-doxygen-1.4.5 138
-SHA256 fd907d3b6a9f5d01800e659fb0a636e987d5dca126dd30906e6a0f9bb86ba213 files/digest-doxygen-1.4.5 138
-MD5 465d4f1d6b2711df698673528b640b59 files/digest-doxygen-1.4.6 138
-RMD160 d505471ef235225f0fcb73b0902686f40212e508 files/digest-doxygen-1.4.6 138
-SHA256 0df763c289eed3510850ad9cf21d76d3580da0475784f3398847e45a01d98f23 files/digest-doxygen-1.4.6 138
+AUX doxygen-1.4.3-cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e size 683
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/doxygen-1.4.3-cp1251.patch 683
 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/doxygen-1.4.3-cp1251.patch 683
 SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e files/doxygen-1.4.3-cp1251.patch 683
+AUX doxygen-1.4.3-nls.patch 1019 RMD160 e8899cc8c20ee501c57106c065926624c28669a1 SHA1 086b81341bd81e6b589356896ed9379663226496 SHA256 44a603217bb38844bdb7ed13396fd3bfd96e36763952354c10e706dab788e5c7 size 1019
 MD5 1473b90cf51c0df70eed324ededc8624 files/doxygen-1.4.3-nls.patch 1019
 RMD160 e8899cc8c20ee501c57106c065926624c28669a1 files/doxygen-1.4.3-nls.patch 1019
 SHA256 44a603217bb38844bdb7ed13396fd3bfd96e36763952354c10e706dab788e5c7 files/doxygen-1.4.3-nls.patch 1019
+AUX doxygen-1.4.4-darwin.patch 536 RMD160 367a923f0ddda5f52487896d86301aaef7328ddb SHA1 230823cec84a2ea7bc0986f1f22f52856a522848 SHA256 a7a0ff21dbff292e389d7c5a6ce26b7059ea8bf3aebc2187a78b88afc3f49b41 size 536
 MD5 461d2d8b233682be4ea9191058708a77 files/doxygen-1.4.4-darwin.patch 536
 RMD160 367a923f0ddda5f52487896d86301aaef7328ddb files/doxygen-1.4.4-darwin.patch 536
 SHA256 a7a0ff21dbff292e389d7c5a6ce26b7059ea8bf3aebc2187a78b88afc3f49b41 files/doxygen-1.4.4-darwin.patch 536
-MD5 f11a93e23bfb89433c3eb7ac72885c01 files/doxygen-1.4.6-freebsd.patch 405
-RMD160 7856281a3ec84c0f2a6815fbadf781365c93f91e files/doxygen-1.4.6-freebsd.patch 405
-SHA256 893e64e08358865d0da55a6b3a3678d38e1dffc8fb0a3498d206488d2e490b18 files/doxygen-1.4.6-freebsd.patch 405
+AUX doxygen-gcc4.patch 478 RMD160 822611c007e0c51b751d25c0f9aa423a5ac85253 SHA1 388bab968cca4aee63888ce3b1856039ccbe0795 SHA256 b8edbeb3fe97523d4b84c1df17dfd162bdd0e2f82cd2a58fbd6b9b5b16f9ef66 size 478
 MD5 e143e9d3e25a559233f4f2d77a58290d files/doxygen-gcc4.patch 478
 RMD160 822611c007e0c51b751d25c0f9aa423a5ac85253 files/doxygen-gcc4.patch 478
 SHA256 b8edbeb3fe97523d4b84c1df17dfd162bdd0e2f82cd2a58fbd6b9b5b16f9ef66 files/doxygen-gcc4.patch 478
+DIST doxygen-1.4.2.src.tar.gz 2856998 RMD160 7cb3102b886a75b67591c56e2610b6755d680195 SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122 size 2856998
+DIST doxygen-1.4.3.src.tar.gz 2767795 RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f size 2767795
+DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78 size 2854374
+DIST doxygen-1.4.5.src.tar.gz 2884510 RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d size 2884510
+DIST doxygen-1.4.6.src.tar.gz 2889072 RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c size 2889072
+DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce size 14412
+EBUILD doxygen-1.4.2.ebuild 3442 RMD160 513999de90f09e383fd27cacbd03da3261fc86ab SHA1 b7960c2e8c4259a4641a15d38a4b9fd170259120 SHA256 a0d636e2df12ef41b98137ff61d0b34505b31ea5c3b233c6671836016ccbe44f size 3442
+MD5 9e4f09c75bce2e0c15ac325f29868585 doxygen-1.4.2.ebuild 3442
+RMD160 513999de90f09e383fd27cacbd03da3261fc86ab doxygen-1.4.2.ebuild 3442
+SHA256 a0d636e2df12ef41b98137ff61d0b34505b31ea5c3b233c6671836016ccbe44f doxygen-1.4.2.ebuild 3442
+EBUILD doxygen-1.4.3-r1.ebuild 3531 RMD160 e5d01ebcc84cd6a4c1f4e05640f64bff6d8e3eb3 SHA1 4cffd4a34a6dbc219e01d00f6956fb0a4ded8cac SHA256 75465ccb66f218bedba25e86dea8025dd865ae7222f608672dcfff0557ff6148 size 3531
+MD5 85da3650b541d64e985cdeeaa2fb20f0 doxygen-1.4.3-r1.ebuild 3531
+RMD160 e5d01ebcc84cd6a4c1f4e05640f64bff6d8e3eb3 doxygen-1.4.3-r1.ebuild 3531
+SHA256 75465ccb66f218bedba25e86dea8025dd865ae7222f608672dcfff0557ff6148 doxygen-1.4.3-r1.ebuild 3531
+EBUILD doxygen-1.4.4.ebuild 3368 RMD160 f185f1bd290bddae73bab43e9f660045f5eb07cd SHA1 e8a0458e7ceea90498e23465bcfa0148206891cc SHA256 943bd5f561ad7f48e62000e88c9d014707f6e8306b7c9245f0c7722e28e93ee8 size 3368
+MD5 c2de8c267dcef04b44f4dd072f76efdb doxygen-1.4.4.ebuild 3368
+RMD160 f185f1bd290bddae73bab43e9f660045f5eb07cd doxygen-1.4.4.ebuild 3368
+SHA256 943bd5f561ad7f48e62000e88c9d014707f6e8306b7c9245f0c7722e28e93ee8 doxygen-1.4.4.ebuild 3368
+EBUILD doxygen-1.4.5.ebuild 3393 RMD160 f73e981d965ba429e06edc818b245358050086b7 SHA1 03bbc9623e6caf7848f1d841ceca6ea7054a9d78 SHA256 6d1600fc068af517a0820ad99ecf04235ead00a2aa6f115411334255744fcbfc size 3393
+MD5 c7de7b65f2c8fcd7c565d6d2ed240773 doxygen-1.4.5.ebuild 3393
+RMD160 f73e981d965ba429e06edc818b245358050086b7 doxygen-1.4.5.ebuild 3393
+SHA256 6d1600fc068af517a0820ad99ecf04235ead00a2aa6f115411334255744fcbfc doxygen-1.4.5.ebuild 3393
+EBUILD doxygen-1.4.6.ebuild 3860 RMD160 da2adb3d24a01bd9090203009052f3a1308c67c2 SHA1 a56b7dd2191c8f4239da11a8a8f40475b899114e SHA256 02b10ecd4c530c32fb4549fb293732f94f35e40d8368b1cf9dc98498fb04689f size 3860
+MD5 d88ef083b17294d9493ee5aabcca5790 doxygen-1.4.6.ebuild 3860
+RMD160 da2adb3d24a01bd9090203009052f3a1308c67c2 doxygen-1.4.6.ebuild 3860
+SHA256 02b10ecd4c530c32fb4549fb293732f94f35e40d8368b1cf9dc98498fb04689f doxygen-1.4.6.ebuild 3860
+MISC ChangeLog 16378 RMD160 c6f8898654ac13bcb29f52e466b361e11042d187 SHA1 2be87f93aef7362f4834790996d9e1f72cc409d9 SHA256 a43983c67125f6e5a477c0665820b04bbf18977a25396a23263eb9dc20cff7e2 size 16378
+MD5 013dfc889737b512479095821c3e64c2 ChangeLog 16378
+RMD160 c6f8898654ac13bcb29f52e466b361e11042d187 ChangeLog 16378
+SHA256 a43983c67125f6e5a477c0665820b04bbf18977a25396a23263eb9dc20cff7e2 ChangeLog 16378
+MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b size 649
 MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
 SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b metadata.xml 649
+MD5 13a38d2e56156572a598e5e5e4b3f477 files/digest-doxygen-1.4.2 506
+RMD160 e6e380d5b703fbcdda0d4ca8ce773b0cc9946cea files/digest-doxygen-1.4.2 506
+SHA256 48ad80897cf80c3c83ffe850a84de6b0d6745eb5562ec3012a3a6addde6a24f0 files/digest-doxygen-1.4.2 506
+MD5 54f196e89de2f19595fe7c2b3ec9e7e7 files/digest-doxygen-1.4.3-r1 506
+RMD160 01e5fcdf4c26f51a628cc6980955e018658647a4 files/digest-doxygen-1.4.3-r1 506
+SHA256 163874965ec50e11edfbcb779ea169b59acc587a0f18ee8e046c7537a4ab6ef0 files/digest-doxygen-1.4.3-r1 506
+MD5 b3755f521918596fc668cf86b0155820 files/digest-doxygen-1.4.4 506
+RMD160 94396cfa3bcb7ee27ab54bc65cdc510ead147386 files/digest-doxygen-1.4.4 506
+SHA256 ee0a2810bd85a4cec6988e8264b41b1cf83cec0ce11c07240678499ada672c3e files/digest-doxygen-1.4.4 506
+MD5 973071da74d3db6cf0426cb724e78ab9 files/digest-doxygen-1.4.5 506
+RMD160 ac0caa2effd4ac9467aa8a20bee9beeeee401bdd files/digest-doxygen-1.4.5 506
+SHA256 721021f490d620ee09462a1e705efe662f56fe09f8c42d0f9aa9b533ea699fe3 files/digest-doxygen-1.4.5 506
+MD5 3747e92e7a8ee02c58e01de3df522e9d files/digest-doxygen-1.4.6 506
+RMD160 189e7d224840b4fc9b9c4284393718c102299290 files/digest-doxygen-1.4.6 506
+SHA256 9b9431d5b0d53d6f852c40914f9911c15d172b7f2aaa04429bac430b0193b347 files/digest-doxygen-1.4.6 506
diff --git a/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
new file mode 100644
index 000000000000..0ffed14733e1
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.6/01_all_cp1251.patch
@@ -0,0 +1,35 @@
+--- qtools/qtextcodec.cpp.orig	2003-12-14 14:00:57.000000000 -0800
++++ qtools/qtextcodec.cpp	2005-05-29 19:13:17.000000000 -0700
+@@ -1321,7 +1321,7 @@
+ 
+ 
+ 
+-#ifndef QT_NO_CODECS
++// #ifndef QT_NO_CODECS
+ 
+ class QSimpleTextCodec: public QTextCodec
+ {
+@@ -1948,7 +1948,7 @@
+ }
+ 
+ 
+-#endif // QT_NO_CODECS
++// #endif // QT_NO_CODECS
+ 
+ class QLatin1Codec: public QTextCodec
+ {
+@@ -2048,12 +2048,13 @@
+ {
+     (void)new QLatin1Codec;
+ 
+-#ifndef QT_NO_CODECS
++
+     int i = 0;
+     do {
+         (void)new QSimpleTextCodec( i );
+     } while( unicodevalues[i++].mib != LAST_MIB );
+ 
++#ifndef QT_NO_CODECS
+     (void)new QEucJpCodec;
+     (void)new QSjisCodec;
+     (void)new QJisCodec;
diff --git a/app-doc/doxygen/files/doxygen-1.4.6-freebsd.patch b/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
index 16a827dd5384..16a827dd5384 100644
--- a/app-doc/doxygen/files/doxygen-1.4.6-freebsd.patch
+++ b/app-doc/doxygen/files/1.4.6/02_all_freebsd.patch
diff --git a/app-doc/doxygen/files/1.4.6/03_all_segfault.patch b/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
new file mode 100644
index 000000000000..5b62c475cff5
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.6/03_all_segfault.patch
@@ -0,0 +1,11 @@
+--- doxygen-1.4.6.orig/src/doxygen.cpp
++++ doxygen-1.4.6/src/doxygen.cpp
+@@ -1912,7 +1912,7 @@
+         // variable already in the scope
+       {
+         if (! // not a php array
+-            (getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
++            (md->getFileDef() && getLanguageFromFileName(md->getFileDef()->name())==SrcLangExt_PHP) &&
+             (md->argsString()!=root->args && root->args.find('[')!=-1)
+            ) 
+           // not a php array variable
diff --git a/app-doc/doxygen/files/1.4.6/04_amd64_qtools.patch b/app-doc/doxygen/files/1.4.6/04_amd64_qtools.patch
new file mode 100644
index 000000000000..ea81015cfe2d
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.6/04_amd64_qtools.patch
@@ -0,0 +1,11 @@
+--- qtools/qvaluestack.h.orig
++++ qtools/qvaluestack.h
+@@ -54,7 +54,7 @@
+     {
+ 	T elem( this->last() );
+ 	if ( !this->isEmpty() )
+-	    remove( this->fromLast() );
++	    this->remove( this->fromLast() );
+ 	return elem;
+     }
+     T& top() { return this->last(); }
diff --git a/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
new file mode 100644
index 000000000000..491e3a22a801
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.6/05_all_system-libpng.patch
@@ -0,0 +1,124 @@
+--- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch
++++ doxygen-1.4.6/debian/patches/system-libpng.dpatch
+@@ -0,0 +1,121 @@
++#! /bin/sh -e
++
++# DP: Use the system libpng library
++
++dir=
++if [ $# -eq 3 -a "$2" = '-d' ]; then
++    pdir="-d $3"
++    dir="$3/"
++elif [ $# -ne 1 ]; then
++    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
++    exit 1
++fi
++case "$1" in
++    -patch)
++        patch $pdir -f --no-backup-if-mismatch -p1 < $0
++        ;;
++    -unpatch)
++        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
++        ;;
++    *)
++	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
++        exit 1
++esac
++exit 0
++
++diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp
++--- ./src/pngenc.cpp.orig	2004-01-06 04:40:25.000000000 +0100
+++++ ./src/pngenc.cpp	2004-09-21 09:04:40.000000000 +0200
++@@ -25,7 +25,7 @@
++ #endif
++ 
++ #define ALL_STATIC
++-#include <../libpng/png.h>
+++#include <png.h>
++ #include <stdio.h>
++ #include <stdlib.h>
++ #include <string.h>
++diff -u ./Makefile.in.orig ./Makefile.in
++--- ./Makefile.in.orig	2003-11-13 04:40:21.000000000 +0100
+++++ ./Makefile.in	2004-09-21 09:04:40.000000000 +0200
++@@ -7,7 +7,6 @@
++ 	cd doc ; $(MAKE) clean
++ 	cd qtools ; $(MAKE) clean
++ 	cd src ; $(MAKE) clean
++-	cd libpng ; $(MAKE) clean
++ 	cd libmd5 ; $(MAKE) clean
++ 	cd addon/doxywizard ; $(MAKE) clean
++ 	cd addon/doxmlparser/src ; $(MAKE) clean
++@@ -18,7 +17,6 @@
++ 
++ distclean: clean
++ 	cd src ; $(MAKE) distclean
++-	cd libpng ; $(MAKE) distclean
++ 	cd libmd5 ; $(MAKE) distclean
++ 	cd addon/doxywizard ; $(MAKE) distclean
++ 	cd addon/doxmlparser/src ; $(MAKE) distclean
++@@ -31,11 +29,10 @@
++ 	-rm -f objects/*.o
++ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
++ 	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
++-	-rm -f libpng/Makefile.libpng
++ 	-rm -f libmd5/Makefile.libmd5
++ 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
++ 	-rm -f .makeconfig .tmakeconfig
++-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
+++	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
++ 	-rm -f src/version.cpp
++ 	-rm -r addon/doxywizard/Makefile
++ 	-rm -f addon/doxywizard/Makefile.doxywizard
++diff -u ./configure.orig ./configure
++--- ./configure.orig	2004-09-14 04:40:12.000000000 +0200
+++++ ./configure	2004-09-21 09:09:06.000000000 +0200
++@@ -457,7 +457,7 @@
++ EOF
++ fi
++ 
++-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in"
+++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in"
++ 
++ for i in $f_inmakefiles ; do
++      SRC=$i
++@@ -474,7 +474,6 @@
++        echo "" >> $DST
++        echo "all: src/version.cpp " >> $DST
++        echo "	\$(MAKE) -C qtools" >> $DST
++-       echo "	\$(MAKE) -C libpng" >> $DST
++        echo "	\$(MAKE) -C libmd5" >> $DST
++        echo "	\$(MAKE) -C src" >> $DST
++        if test $f_wizard = YES; then
++@@ -491,7 +490,7 @@
++      echo "  Created $DST from $SRC..."
++ done
++ 
++-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" 
+++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" 
++ 
++ for i in $f_inprofiles ; do
++      SRC=$i
++diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in
++--- ./src/doxygen.pro.in.orig	2004-05-18 04:40:13.000000000 +0200
+++++ ./src/doxygen.pro.in	2004-09-21 09:58:06.000000000 +0200
++@@ -28,7 +28,7 @@
++ win32:TMAKE_CXXFLAGS       += -DQT_NODLL
++ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5
++ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
++-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
+++INCLUDEPATH                += ../qtools ../libmd5 .
++ #win32-g++:INCLUDEPATH      -= ../libpng
++ DESTDIR                    =  ../bin
++ TARGET                     =  doxygen
++diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in
++--- ./src/libdoxygen.pro.in.orig	2004-08-25 04:40:18.000000000 +0200
+++++ ./src/libdoxygen.pro.in	2004-09-21 09:58:55.000000000 +0200
++@@ -189,7 +189,6 @@
++ win32-msvc:TMAKE_CXXFLAGS  += -Zm200
++ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
++ INCLUDEPATH                += ../qtools
++-INCLUDEPATH                += ../libpng
++ INCLUDEPATH                += ../libmd5
++ win32:INCLUDEPATH          += .
++ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
diff --git a/app-doc/doxygen/files/1.4.6/06_all_qtools.patch b/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
new file mode 100644
index 000000000000..38a4fcbf000e
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.6/06_all_qtools.patch
@@ -0,0 +1,44 @@
+--- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch
++++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch
+@@ -0,0 +1,41 @@
++#! /bin/sh -e
++
++# DP: Remove unused code that does not build with gcc 4.0 (#338099).
++
++dir=
++if [ $# -eq 3 -a "$2" = '-d' ]; then
++    pdir="-d $3"
++    dir="$3/"
++elif [ $# -ne 1 ]; then
++    echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
++    exit 1
++fi
++case "$1" in
++    -patch)
++        patch $pdir -f --no-backup-if-mismatch -p0 < $0
++        ;;
++    -unpatch)
++        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
++        ;;
++    *)
++	echo >&2 "usage: `basename $0`: -patch|-unpatch [-d <srcdir>]"
++        exit 1
++esac
++exit 0
++
++--- qtools/qstring.h.orig	2004-12-01 19:26:16.000000000 +0000
+++++ qtools/qstring.h	2005-12-04 20:09:01.000000000 +0000
++@@ -163,8 +163,13 @@
++     bool isLetterOrNumber() const;
++     bool isDigit() const;
++ 
+++    // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM,
+++    // so they have been removed; the methods are not needed for doxygen
+++#if 0
++     uchar& cell() { return cl; }
++     uchar& row() { return rw; }
+++#endif
+++
++     uchar cell() const { return cl; }
++     uchar row() const { return rw; }
++