Version bump wrt bug 406229 by <supercilious.dude@gmail.com>

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

3 files changed, 253 insertions, 15 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index c0d82d6d8ce1..7ff7c0cc7a66 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.210 2012/02/15 11:29:59 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.211 2012/02/29 09:12:35 xarthisius Exp $
+
+*doxygen-1.8.0 (29 Feb 2012)
+
+  29 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +doxygen-1.8.0.ebuild:
+  Version bump wrt bug 406229 by <supercilious.dude@gmail.com>
 
   15 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> doxygen-1.7.6.1.ebuild:
   Don't RDEPEND on python, thanks to Arfrever Frehtes Taifersar Arahesis
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index b14308580d53..0d23cdf14569 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -24,6 +24,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.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
+DIST doxygen-1.8.0.src.tar.gz 5636443 RMD160 b93293f6bbea725382e5ee10f40fd5a84f7df0ec SHA1 7f4348418dc3efefd357b32a2b5c8010211ab284 SHA256 70fa9034bbe964654e95bdeffcefeb28cd4bf2f73dea8b951143f3cbd19cd533
 DIST doxywizard.png 4231 RMD160 b194049b42aad3466a5ef9c69ff3504536223dae SHA1 0902260c7169e60a504b29feec419b3a4183081f SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209
 EBUILD doxygen-1.4.7.ebuild 3768 RMD160 a4459fb90b52fd71b045d34b9c6a6201285c386b SHA1 dc71695d09b853d24ef19c164ad8d02769955219 SHA256 76c18e38920b213fe8f4762d6f193172094ebd4d39212dae5233cb00bb52dc24
 EBUILD doxygen-1.5.4.ebuild 4593 RMD160 0cbd943a9f6e0ba2667157303093483871cc0bf3 SHA1 7d13d64ab39d9e0d2ce7115a9eaa87ada1af2d5c SHA256 cdccdea4f48f3dd0875306adbe53c87808fb113fdcc2a9dfe84c5c4c321121fd
@@ -33,22 +34,23 @@ EBUILD doxygen-1.7.2.ebuild 5613 RMD160 b76a306f15b3eca9dcec1ce21af0ce35a2ce2abe
 EBUILD doxygen-1.7.3.ebuild 5796 RMD160 4547798c837597c70a767ec9628cda2511c0adc3 SHA1 339c951729eba8453b5beaf0f0cbbc61a11e9cc1 SHA256 f0cf6896e429869897fb452b7a04dbb50d9ede3d58936644e1edc8be6ca786d8
 EBUILD doxygen-1.7.5.1.ebuild 5242 RMD160 bfcad734e8faa95d15e228124c34a42f2bb0d1b1 SHA1 9a7ce2f899e5997dd41592e91b54da5500b1a17f SHA256 c7f5b274c0dd7ba922c85acb3b8aa6c0cb554f5afe1c7e7a1a87e265c5c04720
 EBUILD doxygen-1.7.6.1.ebuild 6303 RMD160 898e4871ea0e728d7e083d7d69699408d15b79c5 SHA1 b42642364ddb4f6613473ee748a63fbcb912f0c3 SHA256 4e4d252f97e35a3c563a955922df4c2b1b4fdf48a7baab3feb89153fcc71ffe3
-MISC ChangeLog 35968 RMD160 a661729621467b3d9f5b245ca30ca971251057b1 SHA1 bdd3a33881eefcbffaefef56384a4b3c773a2091 SHA256 82857c4b3c97d13edfb80e0be9914ce72e143bd0bc87927f8841a2d5d73e4bd8
+EBUILD doxygen-1.8.0.ebuild 6301 RMD160 dc8d9b09c0c960e90637f3ba2361dad0a1476d77 SHA1 f55ef09a868efaddad449062cede5a2648f7086e SHA256 31a5a524da1290a944188992bfd05023a7403424265c459a1c06036fc558641f
+MISC ChangeLog 36139 RMD160 4b9dd03d7f1c7c4503857c147b76bfa651e406ca SHA1 282705c595e7e420139123806d4d47c4e1cfd5e5 SHA256 356e09c64128d75fa01d7898ebf78f2bd679878780879bbd883a93b84cb7df64
 MISC metadata.xml 1019 RMD160 b1d14f64119ee8cb68eeee22aa6178614438db9b SHA1 f2c94632397b23f9ebb778bd3814d939333ba32c SHA256 2f5b46f26e8aebd41be7ff37d05a0cb1de1e9b409a19e60bc26218306766384f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPO5dBAAoJEF0huFKJUZL5AgQQAKJTM2yR4KJMAZluqLVSlw6/
-LKeBE8+GEZmEwOscvCS+nZq6ZEzKDlIJbn6tezYQC0dT06Kl2GKQWsP8ROACkVgg
-CJqR0odnJh/DqTBe4PxLZQGnq88DQRyWXDeYSK/e3kAUDOKzLFvejZ1MQVYRWFw1
-8nAv/ND5v8IAlXqODJxHk485+v4Ep+53B48vLalf/4gO9YLwHzmzr4ilk+NO0Ujd
-i3W/9bk37yTfM0I/tUJE0OKNUVbzk2lVVjZgGN9srd6EFQnbl8L2chhFpSuIumVS
-Wbe+InVZiO8e7vjS5cFp4hPXy/xwL1cOXoWGYwjlyaJMAtcikxk6LNmjmCJ+V13x
-WE/mO6OFqKS8OXWm1YjoILY+IlNB462uBMTYz4rdjL9VZFbv9xAteCc1rxWyFg25
-oqx8illjmp8N8dvLBV/OLg1lkEHYOkpA2+LMCd3CbKa/ve5HhAADJS8uIDfcfjcD
-M6/uUrr/+NdZZ9+zR1YxllLkpiZohfwrfIvwSzMKEMlyEI+89lq7qL1QofjVrXVK
-AtBtH86ewQqlw8c79CZxiL0kd7n2QF430nvl29nDKsZ3aS14H4Pj4UTsqKJ2Syjp
-grCbiz2b0UsT6MAWxBOcsxcFt9iUn9H1RAE03M+b07EcIfyPluMaN4ixGIdC6qOE
-3+8HdEVekbiR++kp7CX0
-=U5IL
+iQIcBAEBCAAGBQJPTewNAAoJEF0huFKJUZL5PxoP/15N41Jwmu48c87vh8VZZPtR
+A3skdDc7iyDJMOImfvCzYCrTle7TjtwESMOaRHvw/918kJgmCHSoJbeT2fyl9YEf
++K/759R89l3lJNSMVz67VmOEPX1+7dK0U9E+tYciL0cUKXJdzLfGgtBmMB3OrNLr
+cngJ6EHpXofyn6jBMRAELLbQQD4f3SdjIfS0jTQj/dzEHNDY0ptn2psHNzB9sK6H
+EVDqSj2+dfPbHraVTjtcIuHk4iqdfomN46mEaixQir1gQERhtGeL/qIIl6co7KyZ
+gZxlJ+3vgyNEFDqwPDeUMwuTrlDHX1wL3aMUiGEnF6t88OovqZV/OzWmTlD5SgbD
+yn3XaJM8H1k2ggQ4elg0o72GIaiZpiGiAgLG6RTLSiqeg1vwsNMM2MewEIcPQJSd
+lV5O0m/6zR+geRK2c4eDI1uGjDXs/FQzcN/CyPjExoWmlF/BDP7W/CALructTJDr
+AKj5iFXcNx9yX7DZaNXrBqDfPZZ/kmBCwPgJ//A7CzR+ZDMX7jq5ALpplf1Nyyfa
+0v8oGwfHxey3/c4X28GPIf79lD869OKVpQyRxld1xRKW5H15DQ7bCY43A0VzBF/A
+eDA7Gs/n+NlhxHyBzuCKvkU8E+0DK/KtQNDKbVMYKKj56rV42IGATQymL+tK0oxd
+b70h23DYQScgLDFEEM7G
+=Mqa5
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.0.ebuild b/app-doc/doxygen/doxygen-1.8.0.ebuild
new file mode 100644
index 000000000000..2952254929dc
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.0.ebuild
@@ -0,0 +1,231 @@
+# 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.8.0.ebuild,v 1.1 2012/02/29 09:12:35 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
+
+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
+	http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+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/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
+	doc? ( =dev-lang/python-2* )
+	${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
+	if use doc; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+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 "${DISTDIR}/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
+}