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

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

18 files changed, 43 insertions, 1368 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/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