do not link support libraries dynamically, see discussion on bug #554974; reintroduce useless latex use flag, see bug #556808

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

3 files changed, 207 insertions, 15 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 6fe9831e6e60..0d20535fbb0b 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.290 2015/08/05 21:56:49 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.291 2015/08/06 14:54:01 tamiko Exp $
+
+*doxygen-1.8.10-r1 (06 Aug 2015)
+
+  06 Aug 2015; Matthias Maier <tamiko@gentoo.org> +doxygen-1.8.10-r1.ebuild:
+  do not link support libraries dynamically, see discussion on bug #554974;
+  reintroduce useless latex use flag, see bug #556808
 
 *doxygen-1.8.10 (05 Aug 2015)
 
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 3c97cd9033d1..fa29b70c5122 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -22,6 +22,7 @@ DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3
 DIST doxygen-1.8.8.src.tar.gz 4955485 SHA256 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1 SHA512 f9cdc7b5ce18321449f29ec86d0824f34d22bf41e2007224d266e68520141e8e21553dab2add361795dc23c56845f7e118b11298ecbed061b25ffabf638a79c1 WHIRLPOOL 26497b9ed9d4236d3937ac98f61593747fe1608d41dbec7649524d060adce104355f08d1a8cab19f4c93594034d2245380b3c927e3995515b4bbdcb5614a5f52
 DIST doxygen-1.8.9.1.src.tar.gz 5007458 SHA256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec SHA512 b76d06fc6e22d5e8e2b73814bc99cc0cf75ddf4e5a6ad1bd79832f12ccce5ccc2681777862b9ad0dbfdf1791fd1ce1f0f5ce669a78c7d38f91b0e8d5ebda8ade WHIRLPOOL 3971ceb79619282dbf1409b71d457dbdf8cd67b7d57dc106215442237e16fed8530e637d2d712d1be2dc2d186b29e75a23522b06387913fe2584eebf8b52b44e
 DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb
+EBUILD doxygen-1.8.10-r1.ebuild 4883 SHA256 f08864144845efe2779b40880b599a96c60dbeffa103ccaab52a3ff213caf436 SHA512 ef7d0ba1c7bac7ebc3f68e8e39fb4d52d55e7f68cfee996e6dc2dbe82e4ac24b32b7ede3cce4618409ec3d495b23c331b78fa6e2a319bc493ad797b014d7bb1a WHIRLPOOL ff96803e982a2d888beb96d9648604e3ea8f9c4cbeaa71106d9d3be08abbb9086821be547c8bc7435211f215b0867d96836276eaab7f00b608d329920856c3c4
 EBUILD doxygen-1.8.10.ebuild 4870 SHA256 c9271cf76b3c52957d3aec1700dbb278764a25c7adc800688e5e23d4513bb16b SHA512 29a3ae83e711a9b7fad1039367ecd9a7fd9326fad9956fa97928f6e609a300018c408916a47abe517ccd68aaee3ab54fecd70da61602ac2abdda4a6982cd6626 WHIRLPOOL 7dee66c074d368968d9b69abbc8972c6499bae8749462fbcdaeeb41ebd63c4250b4c0a21b7bb090f731e1e21592f35e49ed20a5fb22bb4451b08f628fa7ca880
 EBUILD doxygen-1.8.3.1.ebuild 6801 SHA256 73f562b63613930acaad03f937692c85727be81e0715ebaf0029fdf5475fe596 SHA512 f40fde3ff1d4ceb49515d38b48bcd0b900dc53e442d3bee4122ce72d197b29675c8971bc5ca7dbfe97cb9f868d6b26d6e7f7fb93c95ff0b5cd6d3fe5493297c4 WHIRLPOOL c45963f1210d71a8568224bb88ad4745990e5d0f53feb54be7f88976a09d0a74d04328d14202e2c4839b788438ad6720d2fef6c1ce84d5619c2f36c7a4dfd79a
 EBUILD doxygen-1.8.4-r2.ebuild 6895 SHA256 6a7d14dae7bab49b8e0bdf2b7baff71085ce35fa0e8af9f1f6f7675bbf4db296 SHA512 bcd91c485d3356f526606e10f453bcf02b44c2446aaa789d90b4aab3e10c0da4f86ae92037f3d9e15431c6e2d4ac6af5944d9fb90f17daae0afcc3cc42858418 WHIRLPOOL a7e4ff16ff3f3387aa6361f460315008eec00381b5cd0b4cee36b12dfdd0ca3ee979965de68616618207820c476ac7b54d9b2cb12ec5a1a53c3c2c3d7c90c10e
@@ -29,22 +30,22 @@ EBUILD doxygen-1.8.5.ebuild 6740 SHA256 ce18f37be0876d4de47acdcf1f5fe5daedccb3de
 EBUILD doxygen-1.8.8.ebuild 6929 SHA256 8d762c12533363289512c9c30137b7538eca0dc668b1abafc8442a4088131192 SHA512 c4521f6de60a04a2f75965652094c69634bfce460c6fbad42d312b01b7b646fb42763c1f2e7d0448ff64bdd9347067678848a9198b0fb990c43849e5083c4673 WHIRLPOOL 71d11cde6df0d23982c82d97a0ac5bf28375be166fb80533767b51cbfe237aba16f70073c249182b084e0175639b32b1cedeac23a78a8c2ef424788749f62b19
 EBUILD doxygen-1.8.9.1.ebuild 6914 SHA256 577d429b98be1b30c1f53ad3ec8ef520f18ebddfb5cad2665344e6fa9d1790cc SHA512 1e202b61b4aa796df2ea7efbb1f633154e0f6555dc0942668aa3f72946d7148867ca2e3bfe135c58d51cf55fa8a623866e702a212afb1a8a654a4dcf74b6de6b WHIRLPOOL 9e2dc52b83d5e4f7b6cd341df9eaab02d1117df71047620ec4e36971a3e3b224d37536ffe590f4d5c81a945633117e8919af889def6931a2ad7d7de5c63058cf
 EBUILD doxygen-9999.ebuild 4874 SHA256 f8197a623fe2c6404ee62e2ac6f4b1f8356519f4b973182b3e0b77a6a2e893c0 SHA512 56e09b8fb6be80b0b7ea8ec4bb2690759a8b7d7e21d2725d71d133d198015e4ea688d4f876b6ebf11382fac54be622af80494da5081fb74e7dcf1793a83f4aaf WHIRLPOOL 46ba4cae3bb072f775056e3aa455c243323a6ebdffe742cfac3b82b82cdf8be32f741446b105da81fdf9b47b3a4dc63db62c152bbddf98ad0dbd27e266397739
-MISC ChangeLog 47476 SHA256 1879e79d772171410da63e2759e0a0780d5ce4140c9f7be9001842172507d42a SHA512 dd8d86cc8413ff14cf61947a9268c1479c17de019a6050696be99de7f8af9c1e01ade922dac006a213951c3317dbd9af9f82da66db0834f12f13e7c847e48956 WHIRLPOOL 9c7b8ee24a8eeb488a0c2eecb4939e86f6b61fe5421bbf93ea58ff58273300c5202f1ae36fc4fdd09c5b4bad61196905dc07fd36e9bc21ae578abb248ef0a2c3
+MISC ChangeLog 47718 SHA256 04cbdd251352dbafb6bbff8482f07cd334528830404e4e8fd6fc4f6096eada79 SHA512 3bdf8ad25a5d953f2deb592f14a9ad4b992b2d612bc8a3368483cb985e9e61ce86b38c0d257f1059bff38721dfe7d95e756f3d525ba626bd1c0a51b58b942682 WHIRLPOOL bf5de29d23c92589d58bafe60813fef9babb95f14f53ad01388598294038e702d6bee94fdc63dfe12c0ec98e72cfe2b809f794978e12b5b7924cc0882bfdc776
 MISC metadata.xml 807 SHA256 4772ca52089969311afc870c8399b2548df564a6eec5360bb1d4a9bd74625941 SHA512 c1eb3c2271ea8bd83d12e20341c88633d32ce7ac1702537e2ac0c256301bc9e54f2a7625c2776a9af5d3a48e1e06c7dfc5fbb343e2a0fc904100bb1ec6961156 WHIRLPOOL ec05818b69f223ce6bf218f44c3401d1f92e1b294eb9bc5527e0b0f3ef9f178166352e97aacda22d4325690eae814ead2db4c7b9b992bfc432d46d90bac52cf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVwoajAAoJELhOzYlK7nn/oEQQAJgJEd6fdytJiSKkF3fHU5Wy
-ympT/Ne2Aw65B6eS6xHgOAs8Cl2UIgrDtfgFLdfKAvfJJFyKF8dAKC5Usvrbh0XV
-vPnJ+YrUwfm0wWO4GbPu4mFM/molYxijDTIWqdkTeeiOQ21oUXC9mVBgWAYzAApx
-VL36387+kSahPseinR3y0/WGFnG1VnhcSsR1EEq1rmlzN2p9F3UYe28CNtQZQVp4
-4V6Fepbsh6T6tMpjqSyZIln29lhj5I+HtQCU+CUlLX67r2ORgIB3l6ei8uW3FwG8
-PUl13x+fek9Yqf/DRHUnxW6fjigiwSB5xXY3x9t/Q6gEfDu3nme1I9RNWNGfRueT
-wsZOd337sJK3P5ecX4OuMXrxpfhOvsKixMTHxQ8kdXcFFI1+mhUAiMSbAxoHUxfo
-jOBBZ6Ym25mZWLEqzNsq5fRrcIrhgIqftVm/34kLUNDCZ7NJbnmS1sBWNG07o1HO
-1vxZS24LhMPjWstAJnGQMgmutxT3UnqxDgAPd5ZK9PUzO+3Cc31XYB0rQW/qf8HR
-wMEf5KLK7JmZLkf/4DY0sSAfmWDY5UOAtvCPU9y46HGZdifSji2jvU9+qOzz5qJi
-NAnl54V8iGSG1JhUTK+C52fogUAwAqdfizOtrcqJj74dIvIzxyyVqNbMQtQ0UOmU
-9e0S4O8KwdY51sCBDPWN
-=mj06
+iQIcBAEBCAAGBQJVw3ULAAoJELhOzYlK7nn/ld4QALv8+vKb0iq6FlJrzf3Se7qA
+iQR7DELmsk/hSpfXfbKK7KZlZPAgSyF75xNf8L0RGxqF73lX99eFLzhGHC4Nxe51
+5EkdLS7sj+sleeLFiMxLNLNmTLTuV7yTB+cSkoG/jASxtjtr+RaINZjSSpzQCgRH
+05YMznJLIUQJFzPP3wVk+zU2zmu3VBxc1d1+nw8M2I+Q/HPtGUBBWYqGbtH8Lpp1
+pSGp7q+3ZRqnNki3caAaW6JZWK5URv1Itqoo4m7LJwt7UmN7YZJCBPVj+D720cLW
+WBtrT5X3OucDWD31O2tfmSAX4nAUl7bb2ClyHlwpLk5zv2MRbovZScZf4UfbwbSZ
+5qnV5BUvaX2LIkES8j7NWlyighdTBKzR6Mqc33McFhA1Pjja20LB73f8ztjsGall
+aI0QELnAU6/4VZso+1gRENPhgfoqi6wwAKGEhqVLCqdH4ZHOhOHTdAIl0WlATCCG
+GA+4cw92ENct6ECR8n9RffKf7ixl7SlKmx/LebOwjThgzDR3O8izov5f82JS3M+y
+STi4EmSkPHIHAutNMYzinZvOWLeL3XOfAwN6RsclvjH0DDDClgrwwI3F//UrI9Zm
+ez+9nZN45m2YCae4Em7/kvevMoBe6t0L+ak0LLpdczIluLBVHOYxm2uwYNvsDqA9
+A4HDjGpKacWzK+hpKW4r
+=oJFb
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.10-r1.ebuild b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
new file mode 100644
index 000000000000..549c16ea917e
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.10-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.10-r1.ebuild,v 1.1 2015/08/06 14:54:01 tamiko Exp $
+
+EAPI=4
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/doxygen/doxygen.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
+	KEYWORDS="~amd64"
+	# KEYWORDS="~alpha ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+SRC_URI+=" http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="clang debug doc dot doxysearch latex qt4 sqlite"
+
+#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="app-text/ghostscript-gpl
+	dev-lang/perl
+	media-libs/libpng
+	virtual/libiconv
+	clang? ( sys-devel/clang )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)
+	doxysearch? ( =dev-libs/xapian-1.2* )
+	latex? ( app-text/texlive[extra] )
+	qt4? ( dev-qt/qtgui:4 )
+	sqlite? ( dev-db/sqlite:3 )
+	"
+
+REQUIRED_USE="doc? ( latex )"
+
+DEPEND="sys-apps/sed
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( ${PYTHON_DEPS} )
+	${RDEPEND}"
+
+# src_test() defaults to make -C testing but there is no such directory (bug #504448)
+RESTRICT="mirror test"
+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() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Ensure we link to -liconv
+	if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; 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.8.9.1-empty-line-sigsegv.patch #454348
+
+	epatch "${FILESDIR}"/${P}-link_with_pthread.patch
+
+	# 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() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR="share/doc/${P}"
+		-DLANG_CODES="$(get_langs)"
+		$(cmake-utils_use clang use_libclang)
+		$(cmake-utils_use doc build_doc)
+		$(cmake-utils_use doxysearch build_search)
+		$(cmake-utils_use qt4 build_wizard)
+		$(cmake-utils_use sqlite use_sqlite3)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# generate html and pdf 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
+		cd "${BUILD_DIR}" && emake docs
+	fi
+}
+
+src_install() {
+	if use qt4; then
+		doicon "${DISTDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+			"/usr/share/pixmaps/doxywizard.png" \
+			"Development"
+	fi
+
+	dodoc LANGUAGE.HOWTO README.md
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+
+	elog
+	elog "For examples and other goodies, see the source tarball. For some"
+	elog "example output, run doxygen on the doxygen source using the"
+	elog "Doxyfile 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
+}