Drop old

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

12 files changed, 9 insertions, 1395 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 3862276406dd..16f88972bf9a 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,14 @@
 # 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.228 2012/08/11 09:30:03 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.229 2012/08/11 09:41:01 xarthisius Exp $
+
+  11 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org> -doxygen-1.6.3.ebuild,
+  -doxygen-1.7.2.ebuild, -doxygen-1.7.3.ebuild, -doxygen-1.7.5.1.ebuild,
+  -doxygen-1.8.0.ebuild, -doxygen-1.8.1.ebuild,
+  -files/doxygen-1.5.7.1-substitute.patch, -files/doxygen-1.6.2-dot-eps.patch,
+  -files/doxygen-1.7.1-dot-eps.patch, -files/doxygen-1.7.5.1-dot-eps.patch,
+  metadata.xml:
+  Drop old
 
   11 Aug 2012; Kacper Kowalik <xarthisius@gentoo.org> doxygen-1.7.6.1.ebuild,
   doxygen-1.8.1.2.ebuild:
diff --git a/app-doc/doxygen/doxygen-1.6.3.ebuild b/app-doc/doxygen/doxygen-1.6.3.ebuild
deleted file mode 100644
index 25e7bdc54a14..000000000000
--- a/app-doc/doxygen/doxygen-1.6.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.6 2012/05/31 03:38:35 zmedico Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic multilib 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="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-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}/${PN}-1.6.2-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 "${DISTDIR}/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
deleted file mode 100644
index c93a27a94820..000000000000
--- a/app-doc/doxygen/doxygen-1.7.2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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.15 2012/05/31 03:38:35 zmedico Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic multilib 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="http://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"
-
-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,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.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=""
-	use debug && my_conf="--debug"
-	use ppc64 && my_conf="${my_conf} --english-only" #263641
-
-	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() {
-	CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
-		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 "${DISTDIR}/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.3.ebuild b/app-doc/doxygen/doxygen-1.7.3.ebuild
deleted file mode 100644
index 01b51b4e597b..000000000000
--- a/app-doc/doxygen/doxygen-1.7.3.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# 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.10 2012/05/31 03:38:35 zmedico Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic multilib 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="http://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=""
-	use debug && my_conf="--debug"
-	use ppc64 && my_conf="${my_conf} --english-only" #263641
-
-	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() {
-	CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" LFLAGS+="${ELDFLAGS}" \
-		emake all || die 'emake failed'
-
-	# force stupid qmake to use LDFLAGS - yes, it's a big kluge...
-	if use qt4 ; then
-		rm -f bin/doxywizard
-		sed -i -e "s|\-Wl,\-O1 |\-Wl,\-O1 ${ELDFLAGS} |" \
-			addon/doxywizard/Makefile.doxywizard
-		make -C addon/doxywizard
-	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 "${DISTDIR}/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
deleted file mode 100644
index 6d4e359bb1b8..000000000000
--- a/app-doc/doxygen/doxygen-1.7.5.1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# 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.5 2012/05/08 10:27:47 xarthisius 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="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-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"
-RESTRICT="mirror"
-
-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}"/${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() {
-	# 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 docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	if use qt4; then
-		doicon "${DISTDIR}/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.8.0.ebuild b/app-doc/doxygen/doxygen-1.8.0.ebuild
deleted file mode 100644
index a35fceb0743f..000000000000
--- a/app-doc/doxygen/doxygen-1.8.0.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# 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.8.0.ebuild,v 1.4 2012/05/08 10:27:47 xarthisius Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU"
-
-#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
-
-LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
-nl nb pl pt ro ru sl sk sr sv tr uk vi af)
-for X in "${LANGS[@]}" ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( app-text/texlive[extra] )
-	dev-lang/perl
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)"
-
-DEPEND="sys-apps/sed
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( =dev-lang/python-2* )
-	${RDEPEND}"
-
-RESTRICT="mirror"
-EPATCH_SUFFIX="patch"
-
-get_langs() {
-	# using only user set linguas also fixes #263641
-	my_linguas=()
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} "${LANGS[@]}"; then
-			case ${lingua} in
-				hy) lingua=am ;;
-			    pt_BR) lingua=br ;;
-				zh*) lingua=cn ;;
-				cs) lingua=cz ;;
-				da) lingua=dk ;;
-				el*) lingua=gr ;;
-				ja*) lingua=jp ;;
-				ko) lingua=kr ;;
-				nb) lingua=no ;;
-				sl) lingua=si ;;
-			    tr*) lingua=tr ;;
-			    uk) lingua=ua ;;
-			    af) lingua=za ;;
-			esac
-			has ${lingua} "${my_linguas[@]}" ||
-				my_linguas+=(${lingua})
-		fi
-	done
-	f_langs="${my_linguas[@]}"
-	echo ${f_langs// /,}
-}
-
-pkg_setup() {
-	tc-export CC CXX
-	if use doc; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-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):' \
-		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCC):" \
-		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
-		|| die
-
-	# 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
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# 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" \
-		-e "s/all: Makefile.doxywizard/all:/g" \
-		addon/doxywizard/Makefile.in || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	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 --enable-langs $(get_langs)"
-
-	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"
-
-	# On non GNU userland (e.g. BSD), configure script picks up make and bails
-	# out because it is not GNU make, so we force the right value.
-	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
-
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4 ; then
-		pushd addon/doxywizard &> /dev/null
-		eqmake4 doxywizard.pro -o Makefile.doxywizard
-		popd &> /dev/null
-	fi
-
-	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
-			|| die
-}
-
-src_compile() {
-
-	emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
-		LFLAGS+="${ELDFLAGS}" all
-
-	# 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 dot; 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 docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
-
-	if use qt4; then
-		doicon "${DISTDIR}/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/*
-		use latex && dodoc latex/doxygen_manual.pdf
-	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 "Disabling the dot 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.8.1.ebuild b/app-doc/doxygen/doxygen-1.8.1.ebuild
deleted file mode 100644
index 082a6ce47f6d..000000000000
--- a/app-doc/doxygen/doxygen-1.8.1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# 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.8.1.ebuild,v 1.1 2012/05/29 20:17:08 xarthisius Exp $
-
-EAPI=4
-
-inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
-
-DESCRIPTION="Documentation system for most programming languages"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU"
-
-#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
-
-LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
-nl nb pl pt ro ru sl sk sr sv tr uk vi af)
-for X in "${LANGS[@]}" ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( app-text/texlive[extra] )
-	dev-lang/perl
-	virtual/libiconv
-	media-libs/libpng
-	app-text/ghostscript-gpl
-	dot? (
-		media-gfx/graphviz
-		media-libs/freetype
-	)"
-
-DEPEND="sys-apps/sed
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( =dev-lang/python-2* )
-	${RDEPEND}"
-
-RESTRICT="mirror"
-EPATCH_SUFFIX="patch"
-
-get_langs() {
-	# using only user set linguas also fixes #263641
-	my_linguas=()
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} "${LANGS[@]}"; then
-			case ${lingua} in
-				hy) lingua=am ;;
-			    pt_BR) lingua=br ;;
-				zh*) lingua=cn ;;
-				cs) lingua=cz ;;
-				da) lingua=dk ;;
-				el*) lingua=gr ;;
-				ja*) lingua=jp ;;
-				ko) lingua=kr ;;
-				nb) lingua=no ;;
-				sl) lingua=si ;;
-			    tr*) lingua=tr ;;
-			    uk) lingua=ua ;;
-			    af) lingua=za ;;
-			esac
-			has ${lingua} "${my_linguas[@]}" ||
-				my_linguas+=(${lingua})
-		fi
-	done
-	f_langs="${my_linguas[@]}"
-	echo ${f_langs// /,}
-}
-
-pkg_setup() {
-	tc-export CC CXX
-	if use doc; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-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):' \
-		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
-		-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCC):" \
-		tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
-		|| die
-
-	# 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
-	sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
-
-	# prefix search tools patch, plus OSX fixes
-	epatch "${FILESDIR}"/${P}-prefix-misc-alt.patch
-
-	# fix final DESTDIR issue
-	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
-		-e "s/all: Makefile.doxywizard/all:/g" \
-		addon/doxywizard/Makefile.in || die
-
-	# fix pdf doc
-	sed -i.orig -e "s:g_kowal:g kowal:" \
-		doc/maintainers.txt || die
-
-	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 --enable-langs $(get_langs)"
-
-	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"
-
-	# On non GNU userland (e.g. BSD), configure script picks up make and bails
-	# out because it is not GNU make, so we force the right value.
-	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
-
-	export LINK="${QMAKE_LINK}"
-	export LINK_SHLIB="${QMAKE_CXX}"
-
-	if use qt4 ; then
-		pushd addon/doxywizard &> /dev/null
-		eqmake4 doxywizard.pro -o Makefile.doxywizard
-		popd &> /dev/null
-	fi
-
-	./configure --prefix "${EPREFIX}/usr" ${my_conf} \
-			|| die
-}
-
-src_compile() {
-
-	emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
-		LFLAGS+="${ELDFLAGS}" all
-
-	# 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 dot; 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 docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
-
-	if use qt4; then
-		doicon "${DISTDIR}/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/*
-		use latex && dodoc latex/doxygen_manual.pdf
-	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 "Disabling the dot 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/files/doxygen-1.5.7.1-substitute.patch b/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch
deleted file mode 100644
index 7d87d4a880d2..000000000000
--- a/app-doc/doxygen/files/doxygen-1.5.7.1-substitute.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- doxygen-1.5.7.1-orig/src/util.cpp	2008-10-04 14:28:00.000000000 +0200
-+++ doxygen-1.5.7.1/src/util.cpp	2008-12-18 20:55:15.000000000 +0100
-@@ -4447,10 +4447,10 @@
- 
- QCString substitute(const char *s,const char *src,const char *dst)
- {
--  if (s==0 || src==0 || dst==0) return s;
-+  if (s==0 || src==0) return s;
-   const char *p, *q;
-   int srcLen = strlen(src);
--  int dstLen = strlen(dst);
-+  int dstLen = dst ? strlen(dst) : 0;
-   int resLen;
-   if (srcLen!=dstLen)
-   {
-@@ -4469,7 +4469,7 @@
-     int l = (int)(q-p);
-     memcpy(r,p,l);
-     r+=l;
--    memcpy(r,dst,dstLen);
-+    if (dst) memcpy(r,dst,dstLen);
-     r+=dstLen;
-   }
-   strcpy(r,p);
diff --git a/app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch
deleted file mode 100644
index 9ceeb9fde902..000000000000
--- a/app-doc/doxygen/files/doxygen-1.6.2-dot-eps.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Pass -Teps instead of -Tps to graphviz dot.
-Supposed to work with graphviz version 2.20.0 and later.
-
-2009-08-20 Martin von Gagern
-
-References:
-http://bugs.gentoo.org/282150
-http://bugzilla.gnome.org/show_bug.cgi?id=592516
-
-Index: doxygen-1.6.2/src/dot.cpp
-===================================================================
---- doxygen-1.6.2.orig/src/dot.cpp	2010-01-21 03:05:09.000000000 +0100
-+++ doxygen-1.6.2/src/dot.cpp	2010-01-21 03:06:35.000000000 +0100
-@@ -1932,7 +1932,7 @@ QCString DotClassGraph::writeGraph(QText
-     else if (format==EPS) // run dot to create a .eps image
-     {
-       DotRunner dotRun(absBaseName+".dot");
--      dotRun.addJob("ps",absBaseName+".eps");
-+      dotRun.addJob("eps",absBaseName+".eps");
- 
-       if (Config_getBool("USE_PDFLATEX"))
-       {
-@@ -2261,7 +2261,7 @@ QCString DotInclDepGraph::writeGraph(QTe
-     {
-       // run dot to create a .eps image
-       DotRunner dotRun(absBaseName+".dot");
--      dotRun.addJob("ps",absBaseName+".eps");
-+      dotRun.addJob("eps",absBaseName+".eps");
-       if (Config_getBool("USE_PDFLATEX"))
-       {
-         QCString epstopdfArgs(maxCmdLine);
-@@ -2547,7 +2547,7 @@ QCString DotCallGraph::writeGraph(QTextS
-     {
-       // run dot to create a .eps image
-       DotRunner dotRun(absBaseName+".dot");
--      dotRun.addJob("ps",absBaseName+".eps");
-+      dotRun.addJob("eps",absBaseName+".eps");
-       if (Config_getBool("USE_PDFLATEX"))
-       {
-         QCString epstopdfArgs(maxCmdLine);
-@@ -2682,7 +2682,7 @@ QCString DotDirDeps::writeGraph(QTextStr
-     {
-       // run dot to create a .eps image
-       DotRunner dotRun(absBaseName+".dot");
--      dotRun.addJob("ps",absBaseName+".eps");
-+      dotRun.addJob("eps",absBaseName+".eps");
-       if (Config_getBool("USE_PDFLATEX"))
-       {
-         QCString epstopdfArgs(maxCmdLine);
-@@ -2832,7 +2832,7 @@ void writeDotGraphFromFile(const char *i
-   if (format==BITMAP)
-     dotRun.addJob(imgExt,absImgName);
-   else // format==EPS
--    dotRun.addJob("ps",absOutFile+".eps");
-+    dotRun.addJob("eps",absOutFile+".eps");
- 
-   if ( (format==EPS) && (Config_getBool("USE_PDFLATEX")) )
-   {
-@@ -3186,7 +3186,7 @@ QCString DotGroupCollaboration::writeGra
-   else if (format==EPS)
-   {
-     DotRunner dotRun(absBaseName+".dot");
--    dotRun.addJob("ps",absBaseName+".eps");
-+    dotRun.addJob("eps",absBaseName+".eps");
-     if (Config_getBool("USE_PDFLATEX"))
-     {
-       QCString epstopdfArgs(maxCmdLine);
diff --git a/app-doc/doxygen/files/doxygen-1.7.1-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.7.1-dot-eps.patch
deleted file mode 100644
index 7342943bc08f..000000000000
--- a/app-doc/doxygen/files/doxygen-1.7.1-dot-eps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ruN doxygen-1.7.0.orig/src/dot.cpp doxygen-1.7.0/src/dot.cpp
---- doxygen-1.7.0.orig/src/dot.cpp	2010-06-22 16:00:16.043394153 +0800
-+++ doxygen-1.7.0/src/dot.cpp	2010-06-22 16:00:52.509648230 +0800
-@@ -2366,7 +2366,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
-@@ -2662,7 +2662,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-             
-@@ -2935,7 +2935,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
- 
-@@ -3063,7 +3063,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
-@@ -3193,7 +3193,7 @@
-     }
-     else
-     {
--      dotRun.addJob("ps",absOutFile+".eps");
-+      dotRun.addJob("eps",absOutFile+".eps");
-     }
-   }
- 
-@@ -3552,7 +3552,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
diff --git a/app-doc/doxygen/files/doxygen-1.7.5.1-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.7.5.1-dot-eps.patch
deleted file mode 100644
index e2125a3fa726..000000000000
--- a/app-doc/doxygen/files/doxygen-1.7.5.1-dot-eps.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- src/dot.cpp.old	2011-10-29 17:52:54.000000000 +0200
-+++ src/dot.cpp	2011-10-29 17:53:15.000000000 +0200
-@@ -2894,7 +2894,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
-@@ -3212,7 +3212,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-             
-@@ -3503,7 +3503,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
- 
-@@ -3649,7 +3649,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
-@@ -3810,7 +3810,7 @@
-     }
-     else
-     {
--      dotRun.addJob("ps",absOutFile+".eps");
-+      dotRun.addJob("eps",absOutFile+".eps");
-     }
-   }
- 
-@@ -4190,7 +4190,7 @@
-       }
-       else
-       {
--        dotRun->addJob("ps",absEpsName);
-+        dotRun->addJob("eps",absEpsName);
-       }
-       DotManager::instance()->addRun(dotRun);
-     }
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index 313f6613d0b7..7b1e248e96bb 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -19,6 +19,5 @@
 <use>
 	<flag name='nodot'>removes graphviz dependency, along with dot graphs</flag>
 	<flag name='dot'>allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag>
-	<flag name='tcl'>adds experimental support for parsing/documenting Tcl source code</flag>
 </use>
 </pkgmetadata>