Update to latest version with qt4 support (closes bug #252978).

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 197 insertions, 3 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 6e6c7a250392..51e05c6fdccb 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.155 2008/12/24 02:18:09 nerdboy Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.156 2009/02/03 04:45:40 nerdboy Exp $
+
+*doxygen-1.5.8 (03 Feb 2009)
+
+  03 Feb 2009; Steve Arnold <nerdboy@gentoo.org> +doxygen-1.5.8.ebuild:
+  Update to latest version with qt4 support (closes bug #252978).
 
   24 Dec 2008; Steve Arnold <nerdboy@gentoo.org>
   +files/doxygen-1.5.7.1-substitute.patch, doxygen-1.5.7.1.ebuild:
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 8be869c601ba..f8a195b4c861 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -17,10 +17,12 @@ DIST doxygen-1.5.4.src.tar.gz 3762535 RMD160 263e2287da4fbe91a429dc53fe3569b150c
 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-1.5.7.1.src.tar.gz 4096168 RMD160 f9614bb076d6531334a212a95dfbb862a7502c69 SHA1 aecb0c453f76e900eb2aa8132ad063215005fca3 SHA256 7ce9cf96731121aa22365d2aef3dde841a3c4622d4d70282398438275ad26d29
+DIST doxygen-1.5.8.src.tar.gz 4125837 RMD160 e392cd00960c4036661c8cda3ec6bc6ee3fe300c SHA1 a55b1c41417be8acb3ac5e1553a711ffa437cba2 SHA256 01540aaf7e929e7784e3392331f2c915480acb174a16e8652855d90965f44ff8
 EBUILD doxygen-1.4.7.ebuild 4161 RMD160 01bb1a92077fd72ce6cb687aa97990f9164172b6 SHA1 e392d41f3d2f9ddadbaedf6336edcafac182fc15 SHA256 9fa8ea5aa663a87a3f0c493c846075b18a6b7397bb91aa0bba5629ffaa7bf046
 EBUILD doxygen-1.5.4.ebuild 5206 RMD160 fc46e07ed6b9fdd4d987df48a1a9cc86c9774f43 SHA1 de238baf5fbcc2131aec5001a1ec56d489f99d7a SHA256 268d07fe89f7e6dc7a034ffb682a1ec3084383c6e40f9c869b06a16852a0c3e2
 EBUILD doxygen-1.5.5.ebuild 5252 RMD160 0f0cb0e87142722e62143fc3baa75665afaedbcb SHA1 f283652f15a7cfaa1d14125dcc7ada0752a8dfcf SHA256 694ccc2a1386c7b9aa2e4831428ddfb6640b25be2e439730d4c7c982da4b63a8
 EBUILD doxygen-1.5.6.ebuild 5252 RMD160 1a245f30d3cf2d0fc74776eb01d649f96f8222d0 SHA1 8cf3db42b337085f9c2cff9d3478b87b3a1a5c61 SHA256 22d7978852553f6ea86f02b0e951cb436446207c2a77bf1e96acfcd37ad85023
 EBUILD doxygen-1.5.7.1.ebuild 5360 RMD160 746ee8a1006f6c1a4e32d52ea4ef78b921d16ad7 SHA1 ad53ae134b2f16455d157cecfd502e258bf3f8d2 SHA256 d9354d550d0842c14a61aeca7ecfdd2985cf72a73436d9f511db6d2a9c94676d
-MISC ChangeLog 26227 RMD160 7649e49ed4d9b31d5ef5e484af449c9808f51c2d SHA1 3983f8d080718815f42aca4a81cf924ff96949c1 SHA256 8c1365a1b10585b00527caf4a7ef6055212539d40e7d255fba5134b5119aa8d6
+EBUILD doxygen-1.5.8.ebuild 5439 RMD160 53b436fccce7765faa62a09580f22f490f28ee3a SHA1 fa578b99ccdc4a17aeac322de0cc1281597b3fe8 SHA256 84bd94c012f6646cab7e964ae939302de2e88825373f24a64852320ce611e28e
+MISC ChangeLog 26396 RMD160 de43ea2f8cd17a6095b0abcc87eab6a024ef5d3a SHA1 b2fa3db53800954553dd88debde6cc027e5e397c SHA256 e0f65424d85e455bed566ebaef4bdcf08f66e82a013d24dd7c4859f505d597b3
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
diff --git a/app-doc/doxygen/doxygen-1.5.8.ebuild b/app-doc/doxygen/doxygen-1.5.8.ebuild
new file mode 100644
index 000000000000..54cc6c97e5ee
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.5.8.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.1 2009/02/03 04:45:40 nerdboy Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic toolchain-funcs qt4 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
+
+RDEPEND="qt4? ( x11-libs/qt:4 )
+	latex? ( || (
+		( app-text/texlive-core
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexrecommended
+		dev-texlive/texlive-latexextra )
+		( app-text/tetex ) )
+		)
+	dev-lang/python
+	virtual/libiconv
+	media-libs/libpng
+	virtual/ghostscript
+	!nodot? ( >=media-gfx/graphviz-2.6
+		media-libs/freetype )"
+DEPEND=">=sys-apps/sed-4
+	sys-devel/flex
+	${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 \
+		|| die "sed 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
+
+	# 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"
+	#epatch "${FILESDIR}/${P}-substitute.patch"
+
+	# 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
+
+	# fix final DESTDIR issue
+	sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
+		addon/doxywizard/Makefile.in || die "sed failed"
+
+	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=""
+	if use debug; then
+		my_conf="--prefix /usr --debug"
+	else
+		my_conf="--prefix /usr"
+	fi
+
+	export CC="${QMAKE_CC}"
+	export CXX="${QMAKE_CXX}"
+	export LINK="${QMAKE_LINK}"
+	export LINK_SHLIB="${QMAKE_CXX}" 
+
+	if use qt4; then
+		export QTDIR="/usr"
+		einfo "using QTDIR: '$QTDIR'."
+		export LIBRARY_PATH="${QTDIR}/$(get_libdir):${LIBRARY_PATH}"
+		export LD_LIBRARY_PATH="${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}"
+		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+		./configure ${my_conf} $(use_with qt4 doxywizard) \
+		|| die 'configure with qt4 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 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}" \
+			"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
+}