Remove app-text/tetex from dependencies, bug 227443.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

8 files changed, 163 insertions, 166 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 0e5c2af1afc6..49127227d416 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.157 2009/02/04 14:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.158 2009/05/30 08:19:53 ulm Exp $
+
+  30 May 2009; Ulrich Mueller <ulm@gentoo.org> doxygen-1.4.7.ebuild,
+  doxygen-1.5.4.ebuild, doxygen-1.5.5.ebuild, doxygen-1.5.6.ebuild,
+  doxygen-1.5.7.1.ebuild, doxygen-1.5.8.ebuild:
+  Remove app-text/tetex from dependencies, bug 227443.
 
   04 Feb 2009; Ben de Groot <yngwin@gentoo.org> doxygen-1.5.8:
   Correct qt:4 dep to use split deps
@@ -28,7 +33,7 @@
   Updated latex depends for bugs 237960 and 241350 since the virtual does
   not seem to be working very well for people.  Added several deps for
   texlive; thanks to mephinet <mephinet@gmx.net> and <gengor@gentoo.org>
-  for helping to track down some of the needed depends (this latex/tetex 
+  for helping to track down some of the needed depends (this latex/tetex
   thing is painful).
 
   02 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
@@ -241,7 +246,7 @@
   +files/1.4.7/06_all_qtools.patch, +doxygen-1.4.7.ebuild:
   Version bump for bug #137283, need arch testing and graphviz answers (see
   bug #134575) before package cleanup can occur.  Filed bug #138937 on the
-  doxygen stablization issue.  Thanks to Adam Piatyszek for providing the 
+  doxygen stablization issue.  Thanks to Adam Piatyszek for providing the
   updated ebuild and patches.
 
   24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> doxygen-1.4.2.ebuild,
@@ -395,7 +400,7 @@
   30 May 2005; Steve Arnold <nerdboy@gentoo.org>
   +files/doxygen-1.4.3-cp1251.patch, doxygen-1.4.2.ebuild,
   +doxygen-1.4.3.ebuild:
-  new version for bug 92789, patch for bug 85668, and stable bumps on 
+  new version for bug 92789, patch for bug 85668, and stable bumps on
   covered arches. Also added brute-force workaround for bug 89075.
 
   15 May 2005; Fernando J. Pereda <ferdy@gentoo.org> doxygen-1.4.1.ebuild:
@@ -669,11 +674,11 @@
 
   17 Apr 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   Copied 1.2.13.1 ebuild over for 1.2.15 (#1786)
-  
+
 *doxygen-1.2.13.1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index 246ce086c11a..684405825dec 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -18,11 +21,18 @@ DIST doxygen-1.5.5.src.tar.gz 4010148 RMD160 212ef3eca6a43c33189b11d3ab400f5b206
 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
-EBUILD doxygen-1.5.8.ebuild 5441 RMD160 900243a70b07fb8e27e90e5e1c44b6fd06a4d748 SHA1 6af1106697f6a33a822da4e7ab655dcc2610d0c3 SHA256 4019e3fbb78b7a7c225da90f287277277ba97c17f230ea0795c726485a020fc9
-MISC ChangeLog 26496 RMD160 81ac33a66b6312955142ccbf713210be07da0b61 SHA1 7ad72a17c17b4fd0f8b1dec79c16ac13383b928e SHA256 8c4673bff7b3ac67e982108fb6c01f8103a0d83601671668b277b13d541b7468
+EBUILD doxygen-1.4.7.ebuild 4121 RMD160 7081a5298f89f311412505a393faf0207039a408 SHA1 7a2d1fe6f6287b37391441faf4c62f9dc2e3a824 SHA256 46e94677d828ecfeed207933ff946d3d339ce060159aff2ff62c8cea819acfed
+EBUILD doxygen-1.5.4.ebuild 5052 RMD160 b916bd7d3ede4ea4191100db752ebcf8c31d581d SHA1 b4d62673958a5fa045eabf2a98850f134276d613 SHA256 ca5de239d784b12b874771f04be0ad0ffeafe53d31174f88be0cde37d38bf4a2
+EBUILD doxygen-1.5.5.ebuild 5092 RMD160 c2ec2ebfc2c22f10dcee98e680fac5cf357f4d9c SHA1 57d7ccf3fbbd1c50ed62c76f2b84aed735238976 SHA256 5c8febe96e4b6784d75cb3bd40376bba6b5669c1d86b55cf0b968e41ec7f6e23
+EBUILD doxygen-1.5.6.ebuild 5092 RMD160 1070ba96de3321c82810b306b30356f4bef70e64 SHA1 080787a2a0e92460325b5f603153f8731e653a0f SHA256 20d46668251abb45a71f7ec6daac0a5873f04114365f54ddb34d14a46f4b2903
+EBUILD doxygen-1.5.7.1.ebuild 5320 RMD160 865e8b8550125d6b890eb921023b0988f8dc8773 SHA1 fb002135bf8c816e60948a66797f0f4cdf79a99d SHA256 874a190497d93fbe713cbba010f60a2d27a7cbf0ee31f8ff3f9c3c9769d81938
+EBUILD doxygen-1.5.8.ebuild 5402 RMD160 fdeeb9c1fae77d2a0524a26b94d9c820982c9bcd SHA1 3c69141b879b66994d37c9878321e6fcdf16571a SHA256 25a67abc35ac0745c8e0ba84277e125ea6514b3109887e98a7eae05cff0c6d7a
+MISC ChangeLog 26727 RMD160 3a7017223f0ae3896bb62bf15b8641ee3ddc3f78 SHA1 8ec16c6702ac6a2b46b84d7b87a04f563263a32b SHA256 a03d813f1bd069e89da1383ab305e50a4f07ee380339b649cce6b70a92b2ff7d
 MISC metadata.xml 740 RMD160 288a23989773f251e7acccaf77ae390ca2376c3a SHA1 8fc5f720b18d2952fd0519fd73e3dcb66aa94ee4 SHA256 90abffce7a6f2d24635ea2cf3cb7e64c9374304d9f9daacf5f963e0d8bfcb4f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkog7IcACgkQOeoy/oIi7uxW5gCgrtdTAdaoMEO1/1VlZb3oXjRE
+KyEAoIRgizCcTZTEK5iwnGyqnJC0RIwK
+=DI6P
+-----END PGP SIGNATURE-----
diff --git a/app-doc/doxygen/doxygen-1.4.7.ebuild b/app-doc/doxygen/doxygen-1.4.7.ebuild
index 41a2af6cd565..214f525a8f86 100644
--- a/app-doc/doxygen/doxygen-1.4.7.ebuild
+++ b/app-doc/doxygen/doxygen-1.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.4.7.ebuild,v 1.26 2008/10/12 01:49:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.4.7.ebuild,v 1.27 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -18,13 +18,10 @@ IUSE="doc qt3 latex unicode"
 
 RDEPEND=">=media-gfx/graphviz-2.6
 	qt3? ( x11-libs/qt:3 )
-	latex? ( || (
-		( app-text/texlive-core
+	latex? ( app-text/texlive-core
 		dev-texlive/texlive-latexrecommended
 		dev-texlive/texlive-genericrecommended
 		dev-texlive/texlive-fontsrecommended )
-		( app-text/tetex ) )
-		)
 	virtual/ghostscript"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
diff --git a/app-doc/doxygen/doxygen-1.5.4.ebuild b/app-doc/doxygen/doxygen-1.5.4.ebuild
index b5e013633dcd..761dc48b746a 100644
--- a/app-doc/doxygen/doxygen-1.5.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.4.ebuild,v 1.16 2008/10/12 01:49:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.4.ebuild,v 1.17 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -16,13 +16,10 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	latex? ( || (
-		( app-text/texlive-core
+	latex? ( app-text/texlive-core
 		dev-texlive/texlive-latexrecommended
 		dev-texlive/texlive-genericrecommended
 		dev-texlive/texlive-fontsrecommended )
-		( app-text/tetex ) )
-		)
 	dev-lang/python
 	virtual/libiconv
 	virtual/ghostscript
@@ -39,10 +36,10 @@ src_unpack() {
 
 	# 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"
+		-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
@@ -59,18 +56,18 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
 
 	if [ $(get_libdir) == "lib64" ] ; then
-	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
 	fi
 
 	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"
+		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
 }
 
@@ -79,52 +76,52 @@ src_compile() {
 	# set ./configure options (prefix, Qt based wizard, docdir)
 
 	if use debug; then
-	    local my_conf="--prefix ${D}usr --debug"
+		local my_conf="--prefix ${D}usr --debug"
 	else
-	    local my_conf="--prefix ${D}usr"
+		local my_conf="--prefix ${D}usr"
 	fi
 
 	if use qt3; then
-	    einfo "using QTDIR: '$QTDIR'."
-	    export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
-	    export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
-	    einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
-	    einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
-	    ./configure ${my_conf} $(use_with qt3 doxywizard) \
+		einfo "using QTDIR: '$QTDIR'."
+		export LD_LIBRARY_PATH=${QTDIR}/$(get_libdir):${LD_LIBRARY_PATH}
+		export LIBRARY_PATH=${QTDIR}/$(get_libdir):${LIBRARY_PATH}
+		einfo "using QT LIBRARY_PATH: '$LIBRARY_PATH'."
+		einfo "using QT LD_LIBRARY_PATH: '$LD_LIBRARY_PATH'."
+		./configure ${my_conf} $(use_with qt3 doxywizard) \
 		|| die 'configure with qt3 failed'
 	else
-	    ./configure ${my_conf} || die 'configure failed'
+		./configure ${my_conf} || die 'configure failed'
 	fi
 
 	# and compile
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
+		LINK_SHLIB="$(tc-getCXX)" 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
+		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
+			{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
+		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
+			doc/Doxyfile
 		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-		    -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-		    -e "s/@sed/# @sed/" doc/Makefile
+			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+			-e "s/@sed/# @sed/" doc/Makefile
 		make docs || ewarn '"make html docs" failed.'
-	    fi
+		fi
 	fi
 }
 
@@ -133,8 +130,8 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt3; then
-	    doicon "${FILESDIR}/doxywizard.png"
-	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		doicon "${FILESDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
 	fi
 
@@ -142,11 +139,11 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/${PF}
-	    if use latex; then
+		insinto /usr/share/doc/${PF}
+		if use latex; then
 		doins latex/doxygen_manual.pdf
-	    fi
-	    dohtml -r html/*
+		fi
+		dohtml -r html/*
 	fi
 }
 
diff --git a/app-doc/doxygen/doxygen-1.5.5.ebuild b/app-doc/doxygen/doxygen-1.5.5.ebuild
index 107f79e22115..cdba5765247e 100644
--- a/app-doc/doxygen/doxygen-1.5.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.5.ebuild,v 1.6 2008/10/12 01:49:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.5.ebuild,v 1.7 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -16,13 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	latex? ( || (
-		( app-text/texlive-core
+	latex? ( app-text/texlive-core
 		dev-texlive/texlive-latexrecommended
 		dev-texlive/texlive-genericrecommended
 		dev-texlive/texlive-fontsrecommended )
-		( app-text/tetex ) )
-		)
 	dev-lang/python
 	virtual/libiconv
 	media-libs/libpng
@@ -40,16 +37,16 @@ src_unpack() {
 
 	# 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"
+		-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
+		for pro in */*.pro.in */*/*.pro.in; do
 		echo "unix:LIBS += -liconv" >> "${pro}"
-	    done
+		done
 	fi
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
@@ -60,18 +57,18 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
 
 	if [ $(get_libdir) == "lib64" ] ; then
-	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
 	fi
 
 	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"
+		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
 }
 
@@ -81,52 +78,52 @@ src_compile() {
 
 	local my_conf=""
 	if use debug; then
-	    my_conf="--prefix ${D}usr --debug"
+		my_conf="--prefix ${D}usr --debug"
 	else
-	    my_conf="--prefix ${D}usr"
+		my_conf="--prefix ${D}usr"
 	fi
 
 	if use qt3; then
-	    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 qt3 doxywizard) \
+		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 qt3 doxywizard) \
 		|| die 'configure with qt3 failed'
 	else
-	    ./configure ${my_conf} || die 'configure failed'
+		./configure ${my_conf} || die 'configure failed'
 	fi
 
 	# and compile
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
+		LINK_SHLIB="$(tc-getCXX)" 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
+		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
+			{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
+		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
+			doc/Doxyfile
 		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-		    -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-		    -e "s/@sed/# @sed/" doc/Makefile
+			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+			-e "s/@sed/# @sed/" doc/Makefile
 		make docs || ewarn '"make html docs" failed.'
-	    fi
+		fi
 	fi
 }
 
@@ -135,8 +132,8 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt3; then
-	    doicon "${FILESDIR}/doxywizard.png"
-	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		doicon "${FILESDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
 	fi
 
@@ -144,11 +141,11 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/"${PF}"
-	    if use latex; then
+		insinto /usr/share/doc/"${PF}"
+		if use latex; then
 		doins latex/doxygen_manual.pdf
-	    fi
-	    dohtml -r html/*
+		fi
+		dohtml -r html/*
 	fi
 }
 
diff --git a/app-doc/doxygen/doxygen-1.5.6.ebuild b/app-doc/doxygen/doxygen-1.5.6.ebuild
index 9f247cc75405..69e6e6354fe5 100644
--- a/app-doc/doxygen/doxygen-1.5.6.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.6.ebuild,v 1.2 2008/10/12 01:49:49 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.6.ebuild,v 1.3 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -16,13 +16,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	latex? ( || (
-		( app-text/texlive-core
+	latex? ( app-text/texlive-core
 		dev-texlive/texlive-latexrecommended
 		dev-texlive/texlive-genericrecommended
 		dev-texlive/texlive-fontsrecommended )
-		( app-text/tetex ) )
-		)
 	dev-lang/python
 	virtual/libiconv
 	media-libs/libpng
@@ -40,16 +37,16 @@ src_unpack() {
 
 	# 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"
+		-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
+		for pro in */*.pro.in */*/*.pro.in; do
 		echo "unix:LIBS += -liconv" >> "${pro}"
-	    done
+		done
 	fi
 
 	# Consolidate patches, apply FreeBSD configure patch, codepage patch,
@@ -60,18 +57,18 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.5-system-libpng.patch"
 
 	if [ $(get_libdir) == "lib64" ] ; then
-	    epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
+		epatch "${FILESDIR}/${PN}-1.5-qtlibdir.patch"
 	fi
 
 	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"
+		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
 }
 
@@ -81,52 +78,52 @@ src_compile() {
 
 	local my_conf=""
 	if use debug; then
-	    my_conf="--prefix ${D}usr --debug"
+		my_conf="--prefix ${D}usr --debug"
 	else
-	    my_conf="--prefix ${D}usr"
+		my_conf="--prefix ${D}usr"
 	fi
 
 	if use qt3; then
-	    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 qt3 doxywizard) \
+		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 qt3 doxywizard) \
 		|| die 'configure with qt3 failed'
 	else
-	    ./configure ${my_conf} || die 'configure failed'
+		./configure ${my_conf} || die 'configure failed'
 	fi
 
 	# and compile
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" \
-	    LINK_SHLIB="$(tc-getCXX)" all || die 'emake failed'
+		LINK_SHLIB="$(tc-getCXX)" 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
+		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
+			{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
+		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
+			doc/Doxyfile
 		sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
-		    -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
-		    -e "s/@sed/# @sed/" doc/Makefile
+			-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
+			-e "s/@sed/# @sed/" doc/Makefile
 		make docs || ewarn '"make html docs" failed.'
-	    fi
+		fi
 	fi
 }
 
@@ -135,8 +132,8 @@ src_install() {
 		install || die '"make install" failed.'
 
 	if use qt3; then
-	    doicon "${FILESDIR}/doxywizard.png"
-	    make_desktop_entry doxywizard "DoxyWizard ${PV}" \
+		doicon "${FILESDIR}/doxywizard.png"
+		make_desktop_entry doxywizard "DoxyWizard ${PV}" \
 		"doxywizard.png" "Application;Development"
 	fi
 
@@ -144,11 +141,11 @@ src_install() {
 
 	# pdf and html manuals
 	if use doc; then
-	    insinto /usr/share/doc/"${PF}"
-	    if use latex; then
+		insinto /usr/share/doc/"${PF}"
+		if use latex; then
 		doins latex/doxygen_manual.pdf
-	    fi
-	    dohtml -r html/*
+		fi
+		dohtml -r html/*
 	fi
 }
 
diff --git a/app-doc/doxygen/doxygen-1.5.7.1.ebuild b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
index bfbd9d7bffc2..781750d05082 100644
--- a/app-doc/doxygen/doxygen-1.5.7.1.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.7.1.ebuild,v 1.3 2008/12/24 02:18:09 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.7.1.ebuild,v 1.4 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -16,14 +16,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="debug doc nodot qt3 latex elibc_FreeBSD"
 
 RDEPEND="qt3? ( x11-libs/qt:3 )
-	latex? ( || (
-		( app-text/texlive-core
+	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
diff --git a/app-doc/doxygen/doxygen-1.5.8.ebuild b/app-doc/doxygen/doxygen-1.5.8.ebuild
index 6b528c119fc1..8b8c21fb8a38 100644
--- a/app-doc/doxygen/doxygen-1.5.8.ebuild
+++ b/app-doc/doxygen/doxygen-1.5.8.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2009/02/04 14:53:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.5.8.ebuild,v 1.4 2009/05/30 08:19:53 ulm Exp $
 
 EAPI=1
 
@@ -16,14 +16,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="debug doc nodot qt4 latex elibc_FreeBSD"
 
 RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	latex? ( || (
-		( app-text/texlive-core
+	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