Updated to new upstream release (both bug fixes and new stuff). Closes

bug 362457.

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

3 files changed, 199 insertions, 12 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index e5668d273017..74a3709427bf 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # 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.202 2011/03/29 12:45:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.203 2011/04/09 18:09:46 nerdboy Exp $
+
+*doxygen-1.7.4 (09 Apr 2011)
+
+  09 Apr 2011; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.7.4.ebuild:
+  Updated to new upstream release (both bug fixes and new stuff). Closes 
+  bug 362457.  Might want to stable this one soon-ish...
 
   29 Mar 2011; Jeroen Roovers <jer@gentoo.org> doxygen-1.7.3.ebuild:
   Stable for HPPA (bug #356813).
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 7c5d7088b68f..b795947d8b4d 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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 +26,7 @@ DIST doxygen-1.7-tcl_support.patch.bz2 13843 RMD160 0125101bea93087e2100ec97d89d
 DIST doxygen-1.7.1.src.tar.gz 4116363 RMD160 83187765052258078afb0959b80524f703c20cd7 SHA1 fca75d70f48ef0def276fd8db495772f6c43f862 SHA256 4b866f3b194970d7e0768944255d89b0a1aae7bf337f5ae3e4b8358da349da31
 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
 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
@@ -42,12 +40,6 @@ EBUILD doxygen-1.6.3.ebuild 5153 RMD160 96721b42675af763276f72298215d201e2daf072
 EBUILD doxygen-1.7.1.ebuild 5249 RMD160 60f6f651029c9410d4cc5019eac12c78ca3b2a2e SHA1 ac8c7ae7aeb053945fbf40b6522ab214edc35dc3 SHA256 afad9f53aca6de69123d7ab108594d39cc913a151682903850a94c8b10d9c343
 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
-MISC ChangeLog 33702 RMD160 b9b43f8c4ba30312c1d5c76986a147042bffbee9 SHA1 b2e7e9ea4f0f9789d91461ba88ed037ac8975aeb SHA256 53ae92faacb4ecd0173c0e71fd9074eb8d8b958c2fdf737fbf3b976f7a094ac0
+EBUILD doxygen-1.7.4.ebuild 5805 RMD160 174811fdc3ab82ed35269e727fa7b538a711ef2f SHA1 c5f369fdee3372a35a66817e6e81c6f1c43f7a65 SHA256 02de0454de0f687927ee4dab438e7780a7804490df2827196827f0cc247b37c3
+MISC ChangeLog 33940 RMD160 4de1a0c59373562cafab85070a23153773d9aad8 SHA1 ac03554a30ce338e743872ffa3efec99101d7f95 SHA256 76bf2225824c171efe6fa05c009806ede62cd9fd22d08651e41fa8b339ccc659
 MISC metadata.xml 831 RMD160 1a40ce1c3afecb14f2706c413b0d4a4fea3bb55f SHA1 258d06797a0b59edab6716e9ead66bb7df6b0e6e SHA256 802686f997f166ad02f46f8abc382dace5b23bac8db51c5f4a963afa3f75a6e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2R1IwACgkQVWmRsqeSphPe7gCcCnuAgG94y6js39BGrFBZB7HS
-xY0An2I3xwTfJxkgtWWlW36YWZ3cDvWO
-=wVQK
------END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.7.4.ebuild b/app-doc/doxygen/doxygen-1.7.4.ebuild
new file mode 100644
index 000000000000..f82f7c44c789
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.7.4.ebuild
@@ -0,0 +1,189 @@
+# 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.1 2011/04/09 18:09:46 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=""
+	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 "${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
+}