Revbump 1.8.4 due to broken libo doc generating. Patch already applied upstream and will be in next version.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 297 insertions, 5 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 63a71f3a8da7..9396ddcb3912 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.242 2013/06/03 12:03:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.243 2013/06/04 12:21:06 scarabeus Exp $
+
+*doxygen-1.8.4-r1 (04 Jun 2013)
+
+  04 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +doxygen-1.8.4-r1.ebuild,
+  +files/doxygen-1.8.4-libreoffice.patch:
+  Revbump 1.8.4 due to broken libo doc generating. Patch already applied
+  upstream and will be in next version.
 
   03 Jun 2013; Jeroen Roovers <jer@gentoo.org> doxygen-1.8.3.1.ebuild:
   Stable for HPPA (bug #471692).
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 4cf7a5a5e31b..362c3e43a165 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -12,6 +12,7 @@ AUX doxygen-1.5.6-prefix-misc-alt.patch 2017 SHA256 ee4b8c11c8af9bc3dfb365eff06a
 AUX doxygen-1.5.8-kdedocs.patch 854 SHA256 48703fc843633e774e05c64e6903badfd74f456f7099399d44b3150f9b964e6c SHA512 10dc047c049203dad2b4e2d602310d1296498a90cacb5a3599387dc0cbc845b591abe543954960b50bd3fa054c3516fb23789ae450bb8b4cdb45d45bb6130f86 WHIRLPOOL 736c568c5f11cbcf1aa9a7ed840bdcff506c6b162e6da8ccf92950a029de63ef32fd7764b317f155a3871567cee2230e59ba0c53c4af6825a705cfc0975f12ae
 AUX doxygen-1.8.1-prefix-misc-alt.patch 2119 SHA256 3e888815a63ff804053711cf31f25130abc509e9b52cb4263b209764b70b633b SHA512 2b0c28168ab2d173ecf9cad03d5b5c684a0e8d15f80d937836440a72d301d64816ab9c61e958e8eef771c2c2ea6fcc1c8d2a62737ffcfa25f3166e52ce8fe245 WHIRLPOOL 2b5898621ae4868a75e0266e551f2c706e94483e91f9e22a7c68efd5e6d18af32178f5112d3059472bcf520f51907577254fc39191052a2ccb2fcc867140127d
 AUX doxygen-1.8.3.1-empty-line-sigsegv.patch 483 SHA256 d0d3e2f1e1d450b8b31fb9553fcf38d74816c36673ffe455959dacc7f9c01384 SHA512 777e26fe365226d8640eac89c3f11883f7cdca17cf667b32c8f7ed50b2160794620a312c4098e6e53a1af6c799fc9bd067d4846014381189de23bc84210cc752 WHIRLPOOL 072d65e3f619994bfaf170904f3699e40682f2d45a7ad3a600ba871f52ceb2ea1273b3919e008d7070a37f8beed198cf87c81a83babbdf0265e0105ff6a2940e
+AUX doxygen-1.8.4-libreoffice.patch 1362 SHA256 c73bd1e543b333f2fad202459c3b2bb71d7ebab6aae56d2828696ceda2331840 SHA512 d05d3f7e5dea817e42f45d9c82497877792efe8e09b8579afcaedaf2ccc36649470ed8eb40768ed65dbf625da33128ef512df5ff64ac439bc88a008019b8411e WHIRLPOOL a0593826c5c651912f87347ccb5f4e602efe976613c664ee59739ffee07d548896c80d6d4c8fb52bd756ca63155d099e855baa09dab3cfd94488fef82f973a81
 DIST doxygen-1.4.7-utf8-ru.patch.gz 14755 SHA256 a4293ad1687c911ec6074677292172897bdec386f142c9af4b2f0726b91f2069 SHA512 2ece20c6882f5f20c7f2958bd0363072fd70e1b56f48c932620377cbe7f50de14ce540c1095e91ccd173ab933af785ac6b27a739c00508f4c8f6ed1e6f1e6393 WHIRLPOOL cdaedd576e8c24547baf3e3835cd5fbd505a86a070a5751ce3fa8369562cdeaed963f469e3bce44820f6afcc1e3e83fb1a2f8401ef301cf95e071405937ba213
 DIST doxygen-1.4.7.src.tar.gz 2928354 SHA256 5db0e9ddf6fe74273096419d53d3835e9f1822581f20f5f20c057500a5e512ed SHA512 99da7e30c4147a501b3f0e71d03065f42071cd5490f9daaf6025f6b39d486953d59860e83f6535ee7cd12f93d635ab298f4a42da0f8493e80229df85469d4be6 WHIRLPOOL d96f31eed61cefdbe553d9de684e391fecd3ff9623c83964be5777510890e08447734d7f38b5b479fa977ee8990811ee1900ee18f99156a08cc1c6e62101f235
 DIST doxygen-1.5.4.src.tar.gz 3762535 SHA256 12e6a2166b8c78a991d4ceef1dd9042117b24b76e20ccfdfdfc30bc4a7e31df2 SHA512 2509043698780ab399615e48d2c30f0719c347ff44a7cbae63f2f579a7aeb81b39821cea682b022b291180fd5a41008ba9c4920d94b5b8d129944c3e8f71b5a5 WHIRLPOOL 76822c115597505d2d0d81bc8f048618961ea92897a8abff490d73806a960d0cd5cdb7e0cfa9438a3779ef448c13da1057b89522fa7ae504b824a9f39fb6ebf8
@@ -25,13 +26,24 @@ EBUILD doxygen-1.5.4.ebuild 4600 SHA256 269bd42ab1d0e6fd4e51aaca5377117e0028567a
 EBUILD doxygen-1.5.8-r1.ebuild 5486 SHA256 d0f5300eb97fa3ee4a70394149495bf2ae46fbf3bb20f2fa378857bea2d0fd75 SHA512 5282be489d998fcd2a5cda8af68d0c699c254e7365b12663e329b3941fddf7b282cce19d0eb47c415eba1ae5be6a6d6a8f2320dc6d312cc7e9ff5e5dcd73de2c WHIRLPOOL 765454d84b512f3ab74f06b8e71b23e67c900f4c6a72b74ad7d27223ac29e7b596e3dee4d97424585aabedaec0356506fd4d764c7b12562baf21f9f0f980d5c2
 EBUILD doxygen-1.7.6.1.ebuild 6419 SHA256 0ef4088a125e4a2990403cf1c0210a4a6b9cf542a054623b596aaf97a2f63c2c SHA512 9be0e38e0028e0a1f3071df73458347f608c1a934429218ce0e62f2d66e8e497459df12803b46231a0613f56863fcd500e650471d5cc2a024119e4547f70a55e WHIRLPOOL 055c48f2d2596646945c2a66a86c341f9383ff955d5c1ddde213de3662380e61ef8b8836846ce0070e912429c08c4dbc2b19e491871f7f36b29c556093c4ce8f
 EBUILD doxygen-1.8.3.1.ebuild 6868 SHA256 259782ad36e4c29e53a8579de1c48a3f1eb58d330e7488c1ef698c7a8d92dd63 SHA512 22b3f6565be2f321338aac31356cef3e8b591289a7e1ab39a157a9f6827d1f271da6238c85f0f18bfc9da0ea5c02ce5e760993e4f4ef3320f3ea58d79cfaf762 WHIRLPOOL e8ade09ce83cfaca28631c0cdf5a8789a454b9208f718c84f6515e50489850b527373aa66bb01a7d8aa84e7e615346fdaf27bc24b3ac3684c2c12eb301fd20d6
+EBUILD doxygen-1.8.4-r1.ebuild 6903 SHA256 2b6f70ed2e4fac1e0a360ca166f266d17c55f99e376ecffdb9beede433bfce8e SHA512 f5a11438ab6a286b29666b1b08279d8b6e05620dc2e40d6bfb118036e8d46da0346530e7c9838432f656d1c7cce3648c931fe8edf6f302471946301cb1b9b074 WHIRLPOOL 02133ca0a4f2d4b8055d836fa12df344628d76c9a9929bb337083d43f5f5109d1f805a36dd27a4e0221245fe33683654fc18c6a7afcb458804d1ec905ae3fa8d
 EBUILD doxygen-1.8.4.ebuild 6827 SHA256 1da09556fcd3ed89e4379dd42dfe65f9364cabe3ddbc5c986860ee17c0a5a577 SHA512 8636e8188f251e8e4f72c2b9e320c78e317c5b72348ad15dbdc84dedc7757d95c9f01e058d8a7d90c5fee734ee95cb3cd7d202bae788729e3ae191b922e25778 WHIRLPOOL 6f05ed8c4ee8df04a34ad53a1020119b389f2cee96391319e734c992ab27bbc9628c4e041707b463d387f814a38f3a3233761c172bf6f8016177c37c427a804a
-MISC ChangeLog 40865 SHA256 4c1899a62a0a550d2727d9bed315b0fe8301b908556df537740a0289103570e3 SHA512 3a63fff8dc9c93e75a42e42010a64a3efecd63d0e4fd7d01bcf6ff825c56a9db0906ce2dd9752b7b3004e5fb9a287d0c52dbc86b9d097826760ce75655e88bf3 WHIRLPOOL dc0b0fd1d795143bbedbdc4994096295f6f95134e59acb62a3b73cfaf5b0dd1bf1ccf222c78587d6d6cd21af814b19bfd28b970f736a0e778a0209bb84c44bdc
+MISC ChangeLog 41141 SHA256 dfab57afc6c6e4e95a09575c59944be234074f8296fd021faea926d47e703fd6 SHA512 c392a4451a711709f72066a8f30de0098a71faa303b222fdbaae5e1aba3c85fd3f15d5435f1a3ae2eafcd6fd2f52ca71a58ee3233bc95367ca47e614b9f4eba4 WHIRLPOOL 0113606517a3567c3d1f8c99697243e11fb08b16d3162f91aa08f3677641ad548d6803afead3ae6ecd3cbefcd0591219f54be03156865f9636c24fd53f00817e
 MISC metadata.xml 833 SHA256 a1612d5400b6e418c45fa45da7b064d391bef410cf31b47b72f2808e7af25b44 SHA512 69c56f20d98619a74f0ab9e19b06b5251a77738e806db61ad3c5fc7874add0163f087d5f074d2d8e1141e5e919c3fd965bce39b23f55d42d28b7726602b25cae WHIRLPOOL fc799fb6c0e8ef4facea0766797a0c1324a012d2f7aa299991687ac2b2c1163bc7d8b2ed9e938317967899a80bc66ecf17ca83470bf1d46442f5d68cf8defa75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGshhoACgkQVWmRsqeSphN5cwCeJELa256uHa2ObVvY5FpsMgTS
-HgsAn1vWtCUiQZ65nbbNzDYtNW48DR2e
-=rIR3
+iQIcBAEBCAAGBQJRrduzAAoJEOSiRoyO7jvoDn4P/0FSaHE2XZYJ+xyByVBNNB81
+RO4P5+vxONTjxdJxdxoHdAkvulnYgUJowH89dUMVbmKwYBN17/9aUjFIV8LEbuDs
+oGcUahBYgMh4g8YR/HkfhmPlWjNcutEpQrqAKVRXPn6BxmOLGuVd1NgrZ2jZUotD
+dk9i6NUbPc4djC6fSiqmaWxb7pEAsdidFGrRVqAGJySHQPv2Ef2EpzLXH647dou4
+VmqE8t9+vAyDJllB8uqLqbYJ2AKbCbFAMpgLvvUPA/LndYhgZWImthN1B05hU3VD
+JEJWfgg606Tms9mIG2nmvTkscNkxKymVu5Me03yML4Zczo/1yXEcWes+EZHQUjbP
+uD7FMTqja8HIMdIT+GiwEKR/m7ZVOvVZ49aKEA4YxpMKq4mQ1CZiSeGqOFQGck/k
+8CYyY1kf3tRYmmPXsuzpDt1UmC+ul8Qzcbo+KNKqrQADFDlJ1cxBDZaQIc4Tyl/F
+rF6cX4YyDbtpNmeBbPbHbhjvNLOn5LvqjFtiINI3qxjjrobO88lN5N1tqT++TKj8
+pYNbGprFXkDaS3HBLDbjlHeL+j23T+qWVW6/vEfn4ZVqjKEOsJ/quCNYkJGWrE3T
+6Dmb9H7yrmFxHWO7pxYLhZuicKfXV70ibIbngyJgV1+4OgYO1OvMXQx4yRB1wNpW
+YeWuAb2NQz2xeiG7LW62
+=EhC3
 -----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.8.4-r1.ebuild b/app-doc/doxygen/doxygen-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..5d2e574128e2
--- /dev/null
+++ b/app-doc/doxygen/doxygen-1.8.4-r1.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.4-r1.ebuild,v 1.1 2013/06/04 12:21:06 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 toolchain-funcs
+
+DESCRIPTION="Documentation system for most programming languages"
+HOMEPAGE="http://www.doxygen.org/"
+SRC_URI="http://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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="debug doc dot qt4 latex sqlite elibc_FreeBSD userland_GNU"
+
+#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? ( dev-qt/qtgui:4 )
+	latex? ( app-text/texlive[extra] )
+	dev-lang/perl
+	virtual/libiconv
+	media-libs/libpng
+	app-text/ghostscript-gpl
+	sqlite? ( dev-db/sqlite:3 )
+	dot? (
+		media-gfx/graphviz
+		media-libs/freetype
+	)"
+
+DEPEND="sys-apps/sed
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( ${PYTHON_DEPS} )
+	${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
+	use doc && python-any-r1_pkg_setup
+}
+
+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_CC\s*\)=.*$:\1= $(tc-getCC):" \
+		-e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \
+		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.8.1-prefix-misc-alt.patch
+	epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348
+
+	# patch applied upstream
+	epatch ""${FILESDIR}"/${P}-libreoffice.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
+
+	sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \
+		-i Makefile.in || die #428280
+
+	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"
+
+	use sqlite && my_conf="${my_conf} --with-sqlite3"
+
+	# On non GNU userland (e.g. BSD), configure script picks up make and bails
+	# out because it is not GNU make, so we force the right value.
+	use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
+
+	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" \
+			"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/files/doxygen-1.8.4-libreoffice.patch b/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch
new file mode 100644
index 000000000000..7aa7baa37596
--- /dev/null
+++ b/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch
@@ -0,0 +1,30 @@
+From b3e1f10a2d795d0cf31f6efb3f88a31ad4c68980 Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl@redhat.com>
+Date: Wed, 29 May 2013 16:29:04 +0200
+Subject: [PATCH] fix "Constant Groups" regression on file pages
+
+Due to a copy/paste error in the UNO IDL patch the "Namespaces"
+listed on the "File Reference" pages are erroneously duplicated.
+(thanks to Stephan Bergmann for finding this problem)
+
+Signed-off-by: Dimitri van Heesch <dimitri@stack.nl>
+---
+ src/layout.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/layout.cpp b/src/layout.cpp
+index c2b1ac5..010c850 100644
+--- a/src/layout.cpp
++++ b/src/layout.cpp
+@@ -582,7 +582,7 @@ class LayoutParser : public QXmlDefaultHandler
+                                            SrcLangExt_Fortran,theTranslator->trModules()
+                                          )));
+       m_sHandler.insert("file/memberdecl/constantgroups",
+-          new StartElementHandlerSection(this,LayoutDocEntry::FileNamespaces,&LayoutParser::startSectionEntry,
++          new StartElementHandlerSection(this,LayoutDocEntry::FileConstantGroups,&LayoutParser::startSectionEntry,
+                                          theTranslator->trConstantGroups()));
+       m_sHandler.insert("file/memberdecl/defines", 
+           new StartElementHandlerMember(this,&LayoutParser::startMemberDeclEntry,
+-- 
+1.8.1.6
+