Version bump: EAPI4, reorder vars, initial support for LINGUAS, use 'dot' instead of 'nodot', add missing dependencies on perl and bison (fixes bug #399349 by bay), respect CC and CXX, call eqmake4 for doxywizard, always use emake, simplify latex+doc logic. Add myself as a maintainer

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 266 insertions, 4 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 6e73e4d22b4e..98743a5ab78f 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,15 @@
 # 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.206 2011/11/05 21:30:54 nerdboy Exp $
+# 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 $
+
+*doxygen-1.7.6.1 (14 Feb 2012)
+
+  14 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +doxygen-1.7.6.1.ebuild,
+  metadata.xml:
+  Version bump: EAPI4, reorder vars, initial support for LINGUAS, use 'dot'
+  instead of 'nodot', add missing dependencies on perl and bison (fixes bug
+  #399349 by bay), respect CC and CXX, call eqmake4 for doxywizard, always use
+  emake, simplify latex+doc logic. Add myself as maintainer.
 
 *doxygen-1.7.5.1 (05 Nov 2011)
 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 75c684f0bc28..c713f47e0f42 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 1.4.7/01_all_cp1251.patch 683 RMD160 732924265c1ae02cb1d66ad8857e5969f2285751 SHA1 9dbaffced9b125258529fd8290c1aa33ad76f99f SHA256 782c207692ff691936d010f5c8e25858722e29a9a23ee940305aeb38f2b23e8e
 AUX 1.4.7/05_all_system-libpng.patch 5329 RMD160 b02366ba5a19688a0fc68a76ebb8fc8593a22ab8 SHA1 68daa798034b9b813e5548319c0d91cc60ebffec SHA256 53caccaa6f3934abc57e8cf06d7828bfe94f6faf1be1cac0db4a729f9cd76dc9
 AUX 1.4.7/06_all_qtools.patch 1230 RMD160 fa564bb88910b8eb4e0a2b38afdac6b44312e4f2 SHA1 4a0ed54a4eaee1786c9179c8a7011a31de3c96cf SHA256 1f2f25cada1c000f74f5b23a90358353462deeaf5a060f9d3923fab4497b72b2
@@ -29,6 +32,7 @@ DIST doxygen-1.7.2.src.tar.gz 4130092 RMD160 5d7bc593a7add2330610bd0eae5e21b9580
 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
+DIST doxygen-1.7.6.1.src.tar.gz 4791654 RMD160 bd31ec5e62786683f0350f3e59f8d0835b4d88e3 SHA1 6203d4423d12315f1094b56a4d7393347104bc4a SHA256 0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd
 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
@@ -44,5 +48,23 @@ EBUILD doxygen-1.7.2.ebuild 5554 RMD160 4998e8d3fad9060e16a9562564a06c02a434e23b
 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
 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
+EBUILD doxygen-1.7.6.1.ebuild 6153 RMD160 ca422acd24ef2403d405a397f72c51d1f1906edd SHA1 8f0f1e2ef8cf4a510b57ac767b6acdfca50d8928 SHA256 36fa595c9164dced8701c301c4d1e3f09697c1b12960fcb49a13a4fe48ea4ee0
+MISC ChangeLog 35047 RMD160 91c5ba4fc0d2d0df6bde4d159a0a1823e411fd2f SHA1 cceeec55b36747677192355ec52c8100dc95ba69 SHA256 4a4aabf105f7eb8bd15ffcaa966f54623ec9ad8bb83c74e661a1385c248d25a9
+MISC metadata.xml 1019 RMD160 b1d14f64119ee8cb68eeee22aa6178614438db9b SHA1 f2c94632397b23f9ebb778bd3814d939333ba32c SHA256 2f5b46f26e8aebd41be7ff37d05a0cb1de1e9b409a19e60bc26218306766384f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJPOmO/AAoJEF0huFKJUZL5bXMP/jfbLUrCv5hULQJRVjUU6EKf
+Y2vVS8pnmhxbdRgCvwnOK11lKQ4n2gKFDpHyjRd1NRQaTViWBEo2cXpzJpy16x9B
+tRl2HxfWZ+MPJHsrfZMRCa+D/7VsZIxyPhOcyezHb9Le0kAmqFRM2UHN9siHsW1w
+jsYUs7ckw69FCD2hWU/QUw3qdL4lTPtoS6jnPKE8Qy3Li9MgDVRjbYihK83sI/bv
+7uZFZio2RsEUQFUIOqFxU14kzIS8eJT8WLKTfR7OWN7EEwmvEBODZ+Bczt+hdDa+
+z2Fqr2hNzwmLk8HHrzrRrUDq6WP8AmoYmXwwx520mWqh0lYYLHSv/D+4IQfEZjru
+aEQ4yCtee1Ibm2UDO5e6Cw8foigSSorELii3x542f4NFxT+EUNOkBcx2cdsTD0oH
+n/LpHvG6Qest6foCzOwRTOjvpaFILaJfYiXm1IwoKgMwXPtXJufDooVflR7lAfv0
+SN6YF/iN+2s60lEF6Mb1hZj3Md1dV7Uw3YQq02heNbbj+DQpHfNbKCnMQ1cc6QRg
+kR+A3VLCXzwa2VsB6b6kgm0GZFHU1NykesyRUbQ/3HeWQUMWBXCWjwlTk1hgPg/G
+oOugT1IM6vKJf/HaF3r1NkCOop1It8CK3FBtmoLkz7E9mNUCJRuSwqPb9y4B9tBU
+XC9a9AzM+2s1Qb1/p+GM
+=yzlL
+-----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.7.6.1.ebuild b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
new file mode 100644
index 000000000000..256f5c1f4dcd
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.7.6.1.ebuild
@@ -0,0 +1,226 @@
+# 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 $
+
+EAPI=4
+
+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"
+
+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 dot qt4 latex elibc_FreeBSD"
+
+#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/python
+	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
+	${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
+}
+
+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"
+
+	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 "${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/*
+		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/metadata.xml b/app-doc/doxygen/metadata.xml
index 6098d4692695..313f6613d0b7 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -6,6 +6,10 @@
     <email>nerdboy@gentoo.org</email>
     <name>Steve Arnold</name>
 </maintainer>
+<maintainer>
+    <email>xarthisius@gentoo.org</email>
+    <name>Kacper Kowalik</name>
+</maintainer>
 <longdescription>Doxygen is a tool for analyzing, documenting, and reverse-engineering 
     source code of various languages using a variety of output formats 
     (try it and see).  Doxygen supports C++, C, Java, Objective-C, Python, 
@@ -14,6 +18,7 @@
 </longdescription>
 <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>