clean up

Package-Manager: portage-2.1.4.4

4 files changed, 9 insertions, 247 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index d917a5b25f1f..21a4d8539b29 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.150 2008/09/02 23:32:35 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.151 2008/09/02 23:39:15 opfer Exp $
+
+  02 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
+  -doxygen-1.4.4.ebuild, -doxygen-1.5.2.ebuild:
+  clean up
 
   02 Sep 2008; Christian Faulhammer <opfer@gentoo.org> doxygen-1.4.7.ebuild:
   rename USE=tetex to USE=latex for bug 196745
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 2edcff08b997..93ea8d9f4316 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -13,26 +13,21 @@ AUX doxygen-1.5-qtlibdir.patch 354 RMD160 9c9491d89379f1e68e57722be438ce6af80110
 AUX doxygen-1.5-system-libpng.patch 5332 RMD160 cfa7709a0f867609cf149407d19df2ecf53af750 SHA1 9b0547b64fd9b15406a72b18fe19673f784c50f9 SHA256 5800013e75e3fdb4a6dbc513a25393ec9cef0dfa412032c1c3de562829ddaeab
 AUX doxygen-gcc4.patch 267 RMD160 f96f301331db451247fc1fb061f35e173ec1cff8 SHA1 ac7ed139251d87876e67b3e5ce04652b3ac27795 SHA256 df914a5303499c5293c0fcec3e126260157a15bbdc605040d4161ef9599fa2ce
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
-DIST doxygen-1.4.4.src.tar.gz 2854374 RMD160 7999f196b8deb2137e9d411a1c0ea257db32ff3e SHA1 50e04f40b6b69b1897cad789f993a11df0368eb5 SHA256 53e7f2e450b86f161dd7d01982967005f1f14ae8f21786dda25e8bb889383d78
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 RMD160 8d83de95c416a352caa101277874caa1f68347f1 SHA1 ad1d388686b9cd9f330bc5091f15ccc485c8d614 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069
 DIST doxygen-1.4.7.src.tar.gz 2928354 RMD160 4de02b866cef53a7fd6f54e0ba90111814a9d77a SHA1 42a33d676fbd471165d02f531bfe98f433ecb432 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed
-DIST doxygen-1.5.2.src.tar.gz 3599976 RMD160 d30dff3a4625ceb3f31e0fd8c97e2fe3af747d42 SHA1 92749928d041cc9972b6304f170d29019eb148e5 SHA256 496220360b92de6169458b282a8faa32065f71db26d33fb9dc291178fc75381d
 DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c76fdf SHA1 1a815f7de6b412f7852d57dec9eb50f7c4b03268 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2
 DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b2069b019 SHA1 16b555f5d191cc0f854ae9856c49e4823a51c595 SHA256 b09aebefe212e414282a07301e81316726d5f9b79c0b848474e08bcf346c444a
 DIST doxygen-1.5.6.src.tar.gz 4011956 RMD160 94c0d1fe325fa6c9f4a86e2a68e7516dccc4108b SHA1 a478176b9183aef299418e655d6e38b8f8f4e4a5 SHA256 6f5d9ab77a21c7b0e6ebd1524ffa498cc2738ef9a1d8a2ed355117efb3685588
-DIST doxygen-utf8-ru.patch.gz 14412 RMD160 ea1858024c2f24ecd4d4b6d77631e6bd432b52f6 SHA1 c293412c349feb6bd9b6b0e1b898f5b530b59c09 SHA256 d1366b061b8d1f3fc4809d48556a4b2a6956113416ed2bf263629e85c2774dce
-EBUILD doxygen-1.4.4.ebuild 3350 RMD160 a9a1b8753d7bf8a3bdf798278aa5d42d8aac90ce SHA1 f05c80f2a95bd3a70a61ee6532c0b9884995bb0d SHA256 121ad01801f2b161c281f47b090e10790c53409153f46bee0dc0fd09bfc71d24
 EBUILD doxygen-1.4.7.ebuild 4001 RMD160 096d260e4a9f0b36c595f58a255ac62665a67353 SHA1 c01f468d11345196ed812a51db977aaf411040b6 SHA256 8195dd51cc6dfe6455cbb69fef948408287b918bfe7917cc53037ed74164d4bf
-EBUILD doxygen-1.5.2.ebuild 4024 RMD160 ca69977b83468a68c4f46ad3890bc9b54694d74c SHA1 7d43671ac70a9169813cb434a643a83569fdd6e9 SHA256 e37fca6c685339319b201a24b557a42e45a7582798bd139a7f385e781c185335
 EBUILD doxygen-1.5.4.ebuild 5046 RMD160 fc9ad52f3dce5a66493b59ac61898688655b8839 SHA1 70903c01e592cf7a7cfaae46aba7c052633dac5d SHA256 cd3fc6140ad53b04a0f379251bf7d3e97facec5008b22f56656ff3a2a5a43edf
 EBUILD doxygen-1.5.5.ebuild 5092 RMD160 7ef7aa08f917da7b14312fd1252c9a030f77c807 SHA1 d096d17ee6078892558d09da72b8b6c15496d018 SHA256 61fce6bd095752f33f2c9498cbe130d2f41e09e9fcb155231f6897ca89015e88
 EBUILD doxygen-1.5.6.ebuild 5094 RMD160 4ce65bd48bcca76a3daf5d689bc4040821eb7d85 SHA1 702d6b1354d3c3fb0086ed5806167d5b38e46173 SHA256 c5a5373bd5826f9ce8cd563848ece2bd4bcbeaa23a69e79b43323a8e673c5db8
-MISC ChangeLog 25123 RMD160 07b94575b9d74e0147408710611cf93c1f366e40 SHA1 35d488312af6ffc45be8c34f9598b09bfe8927c1 SHA256 d57c9f21f644b88eda4b46a981f7de3c875b3d4f79c16f90663d60319db9403a
+MISC ChangeLog 25238 RMD160 158a38e863c6a28b6a89209660999d1bd4c1cc43 SHA1 f69ff6835fbe9e8cfba02c786a1e976b7a87d363 SHA256 1fab0fb4be21d5525fd0f8ca26346935767b6f92854eedd1b1e665e826534ecf
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki9zTkACgkQNQqtfCuFnePoyQCgkeD+XkRSEbwWWhIEtR2eFqaD
-DFgAoJ5KVciy++ltV0n/oJSP/OeHQ/aa
-=ZI4I
+iEYEARECAAYFAki9zsgACgkQNQqtfCuFneM4iACdFioMAWYTrsI5baMg2zNBDfdr
+y6EAoIvXesNLowT31lACYNK+tq0RCZ3f
+=WBJp
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.4.4.ebuild b/app-doc/doxygen/doxygen-1.4.4.ebuild
deleted file mode 100644
index 5be4979a18df..000000000000
--- a/app-doc/doxygen/doxygen-1.4.4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.4.ebuild,v 1.26 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-DESCRIPTION="Documentation and analysis tool for C++, C, Java, IDL, PHP and C#"
-HOMEPAGE="http://www.doxygen.org/"
-SRC_URI="ftp://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
-		unicode? ( mirror://gentoo/${PN}-utf8-ru.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc qt3 tetex unicode"
-
-RDEPEND="media-gfx/graphviz
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# use CFLAGS and CXXFLAGS (on linux and macosx)
-	sed -i.orig -e "s:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= ${CFLAGS}:" \
-		-e "s:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= ${CXXFLAGS}:" \
-		tmake/lib/{linux-g++,macosx-c++}/tmake.conf
-
-	epatch "${FILESDIR}"/doxygen-1.4.3-cp1251.patch
-	epatch "${FILESDIR}"/${P}-darwin.patch
-
-	if use unicode; then
-		epatch "${WORKDIR}"/${PN}-utf8-ru.patch || die "utf8-ru patch failed"
-	fi
-
-	if [ $(gcc-major-version) -eq 4 ] ; then
-		epatch "${FILESDIR}"/${PN}-gcc4.patch || die "gcc4 patch failed"
-	fi
-}
-
-src_compile() {
-	# set ./configure options (prefix, Qt based wizard, docdir)
-	local my_conf="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) || die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and 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 tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make 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.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README VERSION
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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
-}
diff --git a/app-doc/doxygen/doxygen-1.5.2.ebuild b/app-doc/doxygen/doxygen-1.5.2.ebuild
deleted file mode 100644
index 3c714525a422..000000000000
--- a/app-doc/doxygen/doxygen-1.5.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.2.ebuild,v 1.13 2008/07/29 08:43:12 carlo Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs qt3
-
-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="doc qt3 tetex"
-
-RDEPEND=">=media-gfx/graphviz-2.6
-	qt3? ( x11-libs/qt:3 )
-	tetex? ( virtual/tetex )
-	virtual/ghostscript"
-DEPEND=">=sys-apps/sed-4
-	${RDEPEND}"
-
-EPATCH_SUFFIX="patch"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# use CFLAGS, CXXFLAGS, LDFLAGS
-	sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
-		-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
-		-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
-		tmake/lib/{{linux,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++}/tmake.conf
-
-	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
-	# qtools stuff, and patches for bugs 129142, 121770, and 129560.
-	epatch "${FILESDIR}/${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="--prefix ${D}usr"
-	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
-		|| die 'configure failed'
-	else
-	    ./configure ${my_conf} || die 'configure failed'
-	fi
-
-	# and compile
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
-
-	# generate html and pdf (if tetex in use) documents.
-	# errors here are not considered fatal, hence the ewarn message
-	# TeX's font caching in /var/cache/fonts causes sandbox warnings,
-	# so we allow it.
-	if use doc; then
-		if use tetex; then
-			addwrite /var/cache/fonts
-			addwrite /usr/share/texmf/fonts/pk
-			addwrite /usr/share/texmf/ls-R
-			make pdf || ewarn '"make pdf docs" failed.'
-		else
-			cp doc/Doxyfile doc/Doxyfile.orig
-			cp doc/Makefile doc/Makefile.orig
-			sed -i.orig -e "s/GENERATE_LATEX    = YES/GENERATE_LATEX    = NO/" doc/Doxyfile
-			sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-				-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-				-e "s/@sed/# @sed/" doc/Makefile
-			make docs || ewarn '"make html docs" failed.'
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" MAN1DIR=share/man/man1 \
-		install || die '"make install" failed.'
-
-	dodoc INSTALL LANGUAGE.HOWTO README
-
-	# pdf and html manuals
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		if use tetex; then
-			doins latex/doxygen_manual.pdf
-		fi
-		dohtml -r html/*
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "The USE flags qt3, doc, and tetex 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 "See the Doxygen homepage for additional language support tools."
-	elog
-}