Updated to latest upstream release, removed external Tcl patch (see bug

Package-Manager: portage-2.1.10.30/cvs/Linux x86_64

4 files changed, 250 insertions, 2 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 43b971c6c017..6e73e4d22b4e 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.205 2011/09/03 02:02:28 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.206 2011/11/05 21:30:54 nerdboy Exp $
+
+*doxygen-1.7.5.1 (05 Nov 2011)
+
+  05 Nov 2011; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.7.5.1.ebuild,
+  +files/doxygen-1.7.5.1-dot-eps.patch:
+  Updated to latest upstream release, removed external Tcl patch (see bug
+  #388863).  Thanks to Philipp for the updated no-dot patch.
 
   03 Sep 2011; Steve Arnold <nerdboy@gentoo.org> doxygen-1.7.4.ebuild:
   Newer (and cleaner) version using more of the qt4-r2 functionality.
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 8675c9ff63bf..75c684f0bc28 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -10,6 +10,7 @@ AUX doxygen-1.5.7.1-substitute.patch 656 RMD160 3730347b9fba4ceef96b6852c164ca4c
 AUX doxygen-1.5.8-kdedocs.patch 854 RMD160 945e07ab7f5f168d63f5a99423a56d9b12477df8 SHA1 5e987c64b95500441a668fd4912db32714de495d SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c
 AUX doxygen-1.6.2-dot-eps.patch 2449 RMD160 f8ca2a81af9dbe4fb709528b1f4146fe53aa338e SHA1 408b5119043a35d31b7d55b7f183a0dbae54d678 SHA256 fd62eda9dba9fad7a17c6afdb637178d28b7be7218c975f252a0a3de204c2b87
 AUX doxygen-1.7.1-dot-eps.patch 1359 RMD160 588347d4145638e6309395b8ad7cb4f441fc61ef SHA1 7b6ef31f3e1bc0835f8f9ffcc28d965cbf2d99aa SHA256 d45f040844707d439ee738f03ad81469df15cf14444f701fadf7eb97898771fd
+AUX doxygen-1.7.5.1-dot-eps.patch 1263 RMD160 ee56be1b40acee4cb6af7420826fc6e14404e5d8 SHA1 cee4cd0d9d475605869c8c86c192f9549c97df72 SHA256 d824ec94f2b5234f2434870c9025f1806adbc45512cae652d5ac234b4f4c61b5
 AUX doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 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
@@ -27,6 +28,7 @@ DIST doxygen-1.7.1.src.tar.gz 4116363 RMD160 83187765052258078afb0959b80524f703c
 DIST doxygen-1.7.2.src.tar.gz 4130092 RMD160 5d7bc593a7add2330610bd0eae5e21b9580c11ce SHA1 48e86c20c3a25ea9ee895e6214e3d54b4a9e689b SHA256 1f6de57f7fe9acc65dc86bbdade21fc84bd013b66daeebc497e16e3a54ad91a1
 DIST doxygen-1.7.3.src.tar.gz 4507887 RMD160 52f0826451535754c77b7984e580f02f1c7d50f3 SHA1 06e1d84b50beecdfe0f91393b83c29e8a3db1011 SHA256 c7857d246f75ea287328023a6af71dec8f45a765932a86fcfcc951920a647766
 DIST doxygen-1.7.4.src.tar.gz 4570255 RMD160 bcdf00be04b4391f72decd008c5ceafcc4cc8c06 SHA1 4f68b655c93265cb15ef1b8c9ca35ebc39698cf0 SHA256 845c994440dcdbbde81afcb2feae16c4f4cafb85e5dd379b238530e4caf5df66
+DIST doxygen-1.7.5.1.src.tar.gz 4689511 RMD160 cd0552ea3e2e810dfb943700af70bb1cf9e0b6ae SHA1 15671defd1eefe255aa564b6f3097e30ab07ff55 SHA256 fdaec929502e3c4490bfcc87b48a916dab29310d3c7ef88d06f2806436e9ccd0
 EBUILD doxygen-1.4.7.ebuild 3704 RMD160 2eb5f033e3c74151a47810ff891da56f6496c540 SHA1 0391691e76518782caeb2cb65da588dc5dc3d5b0 SHA256 ca8f96af859e6edf280819f3f022051688a3606a78fc0fa6e73e7856c7579306
 EBUILD doxygen-1.5.4.ebuild 4529 RMD160 31458ab58660ca639375d1976eafa3fde39db6b6 SHA1 a7aa62f3a45baeb832b6e915f7c2a85f59674b57 SHA256 0778d0f7905e75ad14ce09a88c0af12fd75ae7524b7fb8381a2b345dd35df127
 EBUILD doxygen-1.5.5.ebuild 4499 RMD160 ee0464c5b924f1895bde7b956526d78dd50e86dc SHA1 8e6f528aed0369a6214689916f1497ed01b40456 SHA256 fe0b01e91433a9cc4afb45aad725fbd9a9f4ffaaa3a422b9571409407f43e088
@@ -41,5 +43,6 @@ EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e
 EBUILD doxygen-1.7.2.ebuild 5554 RMD160 4998e8d3fad9060e16a9562564a06c02a434e23b SHA1 138a9ad80e18255e2a49096d247a67c993eaf9b1 SHA256 d7168596217bc6f470c1d684035a352e5f33c3ae341b08f4475abd8158f79fe1
 EBUILD doxygen-1.7.3.ebuild 5790 RMD160 4665316d7adc951b444daa413830953248f8ec43 SHA1 b410891b29c652d731da48787a2fc86da57f23eb SHA256 10d6899dff5678438875ce64f82891c720e2a7f2d4e1d90208d459f6e1132655
 EBUILD doxygen-1.7.4.ebuild 5320 RMD160 91014a6c3d8a32c81528c8488b76624219d50661 SHA1 ccd95ea2fe45d63ba0878a5e6ecc7dc1b34cf115 SHA256 754d9b93cbbfea01ac492e904908c3abcd0a6d4e8d885f83512a6c436ccc52e2
-MISC ChangeLog 34342 RMD160 bda86436165afefdd2a3dfe6031ab1b06efb34ef SHA1 562ff73573df9ac4d993fee8d267a5d03a84443e SHA256 4c15c386740841bd0929c26ac862cafcd05ebe608235e9937089e603251a9f28
+EBUILD doxygen-1.7.5.1.ebuild 5180 RMD160 dfad932d2ca3bc0a29cd59f54a27ba752d028feb SHA1 f41d8bf9c0c3af0ef1f4d97292af0713d54859f2 SHA256 c746d08002b472d41922702e55b3aaac45db5744e9f4fedcb5b3bb1722c5f129
+MISC ChangeLog 34624 RMD160 40d5a3569ec7a62b5a91c9488407fa4f092f63c2 SHA1 f38e3520c6ce92f96222087d43b187d60c699e9e SHA256 055cdcfe133b4067a90604d482eb9099019c5598c8c79cf61cece0d4f0af4f2a
 MISC metadata.xml 831 RMD160 1a40ce1c3afecb14f2706c413b0d4a4fea3bb55f SHA1 258d06797a0b59edab6716e9ead66bb7df6b0e6e SHA256 802686f997f166ad02f46f8abc382dace5b23bac8db51c5f4a963afa3f75a6e2
diff --git a/app-doc/doxygen/doxygen-1.7.5.1.ebuild b/app-doc/doxygen/doxygen-1.7.5.1.ebuild
new file mode 100644
index 000000000000..d5974c53d9b4
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.7.5.1.ebuild
@@ -0,0 +1,182 @@
+# 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.5.1.ebuild,v 1.1 2011/11/05 21:30:54 nerdboy Exp $
+
+RESTRICT="mirror"
+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
+	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 "${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/files/doxygen-1.7.5.1-dot-eps.patch b/app-doc/doxygen/files/doxygen-1.7.5.1-dot-eps.patch
new file mode 100644
index 000000000000..e2125a3fa726
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.7.5.1-dot-eps.patch
@@ -0,0 +1,56 @@
+--- 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);
+     }