version bump for bug 137283, need arch testing

Package-Manager: portage-2.1.1_pre1-r5

7 files changed, 355 insertions, 21 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 8f32949ce0e0..5c4c6bff7944 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.100 2006/06/24 01:44:20 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.101 2006/07/03 01:26:31 nerdboy Exp $
+
+*doxygen-1.4.7 (03 Jul 2006)
+
+  03 Jul 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/1.4.7/01_all_cp1251.patch, +files/1.4.7/05_all_system-libpng.patch,
+  +files/1.4.7/06_all_qtools.patch, +doxygen-1.4.7.ebuild:
+  Version bump for bug #137283, need arch testing and graphviz answers (see
+  bug #134575) before package cleanup can occur.  Filed bug #138937 on the
+  doxygen stablization issue.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> doxygen-1.4.2.ebuild,
   doxygen-1.4.3-r1.ebuild, doxygen-1.4.4.ebuild, doxygen-1.4.5.ebuild,
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 74ed851262ca..b632364c361f 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.6/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 MD5 3eae39cd24982cc69c7ca5a767b1157c files/1.4.6/01_all_cp1251.patch 683
 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/1.4.6/01_all_cp1251.patch 683
@@ -21,6 +18,18 @@ AUX 1.4.6/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4
 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 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
+MD5 3eae39cd24982cc69c7ca5a767b1157c files/1.4.7/01_all_cp1251.patch 683
+RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 files/1.4.7/01_all_cp1251.patch 683
+SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e files/1.4.7/01_all_cp1251.patch 683
+AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
+MD5 71370c721f1433caffd8c3a18667abac files/1.4.7/05_all_system-libpng.patch 5329
+RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 files/1.4.7/05_all_system-libpng.patch 5329
+SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9 files/1.4.7/05_all_system-libpng.patch 5329
+AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
+MD5 87818d755adae0f2bd5ad785bfcdb3bf files/1.4.7/06_all_qtools.patch 1230
+RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 files/1.4.7/06_all_qtools.patch 1230
+SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2 files/1.4.7/06_all_qtools.patch 1230
 AUX bsd-configure.patch 504 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 SHA1 df68c4be15c41b02c822364b5f54214ce65b3fc0 SHA256 8aa47622750701cd492b35e8037b3b8a5ed1c13e564d0a0081a09877717b9cf1
 MD5 0c3111e09b7ea538f06a0655e7898e38 files/bsd-configure.patch 504
 RMD160 4d3321c677bbfcae2c25c7937ef015ff41812594 files/bsd-configure.patch 504
@@ -41,12 +50,13 @@ AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1
 MD5 9b79bcfbb78c577a9cf1e433cedf043d files/doxygen-gcc4.patch 267
 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 files/doxygen-gcc4.patch 267
 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce files/doxygen-gcc4.patch 267
-DIST doxygen-1.4.2.src.tar.gz 2856998 RMD160 7cb3102b886a75b67591c56e2610b6755d680195 SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122
-DIST doxygen-1.4.3.src.tar.gz 2767795 RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f
-DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78
-DIST doxygen-1.4.5.src.tar.gz 2884510 RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d
-DIST doxygen-1.4.6.src.tar.gz 2889072 RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c
-DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
+DIST doxygen-1.4.2.src.tar.gz 2856998 RMD160 7cb3102b886a75b67591c56e2610b6755d680195 SHA1 3a95a1bc825e34144ecfa6cebd395a69d49fb8c6 SHA256 af9ec7c2441abae4f9c85f9b6de5c53c3ec8b04d62a19d75e8c917fc34a56122
+DIST doxygen-1.4.3.src.tar.gz 2767795 RMD160 538eb3a9265e99d92e190c13450b6663ef212ae2 SHA1 96802c63a72c009cb3fbba049dc22bf42fcdb739 SHA256 1fa21c5739d25aff8151114b7f0718a36a87b44d6956019d29d4d5bcd27cb03f
+DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA1 50e04f40b6b69b1897cad789f993a11df0368eb5 SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78
+DIST doxygen-1.4.5.src.tar.gz 2884510 RMD160 9fcc6820b2036e54ecee91650f2470d179d86e2e SHA1 cbd01c0f1369cdd078c7bee4646559f805bfb237 SHA256 9dca2f306c8ca3dbc576bacf7365dfc5b1e71c0353a6f113351790bae6f35b3d
+DIST doxygen-1.4.6.src.tar.gz 2889072 RMD160 00f09e7a6bd2d6e6ed3030a81a41b366b5999c1f SHA1 b40fb369b38cf82ec06826dc65574953c3ad8a3c SHA256 48ad46bbe03e904fffe0d5012c4f703ad7926951c76e5a2dcb1b447458b2f68c
+DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
+DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
 EBUILD doxygen-1.4.2.ebuild 3446 RMD160 110c0dcd4b4345c2f3d336ef98f2e9ed05a40034 SHA1 2fd87e7c8413dd76486f8f79f95224f7fdadc172 SHA256 c818ad59c34c0eddb2c20564bb0f9484895bc36a0a7467bf14cf65349d9f9347
 MD5 74f472603865fdebb480ef4c85c052b9 doxygen-1.4.2.ebuild 3446
 RMD160 110c0dcd4b4345c2f3d336ef98f2e9ed05a40034 doxygen-1.4.2.ebuild 3446
@@ -67,10 +77,14 @@ EBUILD doxygen-1.4.6.ebuild 3864 RMD160 07d7da1a51e5281b2a5c89101d394a41125db17e
 MD5 ef56be9d8a1ca04ccc10f269729a70f0 doxygen-1.4.6.ebuild 3864
 RMD160 07d7da1a51e5281b2a5c89101d394a41125db17e doxygen-1.4.6.ebuild 3864
 SHA256 bb4d3ccddc749dd701ca125632d516b17394b27f34811cab6569737c07a0f384 doxygen-1.4.6.ebuild 3864
-MISC ChangeLog 16828 RMD160 fc5536c5e5cce24f88aa5b75782b5bd3601525ac SHA1 afaa44dda5ecc35d96ccf7f64300e1549d0f37eb SHA256 f233f68c0f70414131b7338e9e194bd3cbe33922d2a8096ba130572ecfa1dead
-MD5 e3878b4a14c2e14e96812b7ddb339dec ChangeLog 16828
-RMD160 fc5536c5e5cce24f88aa5b75782b5bd3601525ac ChangeLog 16828
-SHA256 f233f68c0f70414131b7338e9e194bd3cbe33922d2a8096ba130572ecfa1dead ChangeLog 16828
+EBUILD doxygen-1.4.7.ebuild 3630 RMD160 6e0b18197caef338bce3a35fb086113b7bdef946 SHA1 e96d370a7d3788c51e618aa687759a49eae5e340 SHA256 12099f9b5d58a9b3d43e8e2deffdccc41617b5b13144d67e48a46c5c92e10afc
+MD5 e23006c704d90f465e65f7e9b91f64eb doxygen-1.4.7.ebuild 3630
+RMD160 6e0b18197caef338bce3a35fb086113b7bdef946 doxygen-1.4.7.ebuild 3630
+SHA256 12099f9b5d58a9b3d43e8e2deffdccc41617b5b13144d67e48a46c5c92e10afc doxygen-1.4.7.ebuild 3630
+MISC ChangeLog 17226 RMD160 bd5211b152b069131c51d8f6197e66b8af63eb52 SHA1 e8afc9cdab1af8dcee41bd29889fe8c0a86f6cc2 SHA256 c735f5f287abe7304ba75f880ac7e6ffe4310ae9b41376cee9987a1ed1c2badb
+MD5 a451b77deac4590cce366cee8a0a9bb0 ChangeLog 17226
+RMD160 bd5211b152b069131c51d8f6197e66b8af63eb52 ChangeLog 17226
+SHA256 c735f5f287abe7304ba75f880ac7e6ffe4310ae9b41376cee9987a1ed1c2badb ChangeLog 17226
 MISC metadata.xml 649 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d SHA1 bfc826f792595110c799a2658d07293b4ab3e0fd SHA256 57a845bfcc6988eabb61ab1da130aeb637be936c93d47e20e53a67676f57c26b
 MD5 b8f1156ac2d88a9982011ecd8ff2275b metadata.xml 649
 RMD160 2c8cc604548cc64104c075ff64d33190efdce45d metadata.xml 649
@@ -90,10 +104,6 @@ SHA256 721021f490d620ee09462a1e705efe662f56fe09f8c42d0f9aa9b533ea699fe3 files/di
 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEnJkBoeSe8B0zEfwRAvL3AJ9WuhaeF8TheiVui6u9kqWfoWguywCfS743
-DSQNbgdm7nXe37Hh8uzA0mo=
-=O2m/
------END PGP SIGNATURE-----
+MD5 dd760d1b23e69682a20ed48883dd4204 files/digest-doxygen-1.4.7 256
+RMD160 50d904036a5ccbd95ea4dae13d627db5a5ab34bf files/digest-doxygen-1.4.7 256
+SHA256 db31a00fa3917c06ce3c6d294371cd36ae9ead0c9c0d4bf0c7e9c0079f36610a files/digest-doxygen-1.4.7 256
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
new file mode 100644
index 000000000000..14bcf4814a4c
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2006 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.1 2006/07/03 01:26:31 nerdboy Exp $
+
+inherit eutils toolchain-funcs qt3
+
+DESCRIPTION="Doxygen is a documentation system for C++, C, Java, Objective-C,
+	Python, IDL , and other C-like languages."
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+#		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc qt3 tetex"
+
+RDEPEND=">=media-gfx/graphviz-2.6
+	qt? ( $(qt_min_version 3.3) )
+	tetex? ( virtual/tetex )
+	virtual/ghostscript"
+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
+
+	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
+	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
+	epatch ${FILESDIR}/${PV}
+}
+
+src_compile() {
+	export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
+	# set ./configure options (prefix, Qt based wizard, docdir)
+	local my_conf="--prefix ${D}usr"
+	if use qt; then
+	    einfo "using QTDIR: '$QTDIR'."
+	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
+	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
+	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+	    ./configure ${my_conf} $(use_with qt doxywizard) || die 'configure failed'
+	else
+	    ./configure ${my_conf} || die 'configure failed'
+	fi
+
+	# 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 tetex; then
+			addwrite /var/cache/fonts
+			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 tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
+		dohtml -r html/*
+	fi
+}
+
+pkg_postinst() {
+
+	ewarn
+	einfo "The USE flags qt, doc, and tetex will enable doxywizard, or"
+	einfo "the html and pdf documentation, respectively.  For examples"
+	einfo "and other goodies, see the source tarball.  For some example"
+	einfo "output, run doxygen on the doxygen source using the Doxyfile"
+	einfo "provided in the top-level source dir."
+	einfo ""
+	einfo "See the Doxygen homepage for additional language support tools."
+	ewarn
+}
diff --git a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch
new file mode 100644
index 000000000000..0ffed14733e1
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.7/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/1.4.7/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch
new file mode 100644
index 000000000000..491e3a22a801
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.7/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.7/06_all_qtools.patch b/app-doc/doxygen/files/1.4.7/06_all_qtools.patch
new file mode 100644
index 000000000000..38a4fcbf000e
--- /dev/null
+++ b/app-doc/doxygen/files/1.4.7/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; }
++ 
diff --git a/app-doc/doxygen/files/digest-doxygen-1.4.7 b/app-doc/doxygen/files/digest-doxygen-1.4.7
new file mode 100644
index 000000000000..c62d1675acad
--- /dev/null
+++ b/app-doc/doxygen/files/digest-doxygen-1.4.7
@@ -0,0 +1,3 @@
+MD5 11db63a72bd3b510fd2fa7ae48086979 doxygen-1.4.7.src.tar.gz 2928354
+RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a doxygen-1.4.7.src.tar.gz 2928354
+SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed doxygen-1.4.7.src.tar.gz 2928354