Added tetex IUSE flag. Thanks to Ronny Shoebel <ronny@l61.de> for submitting a patch to ebuilds. This closes bug #42067

6 files changed, 101 insertions, 48 deletions

diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog
index 3d266225fc42..1ba60196040c 100644
--- a/app-doc/doxygen/ChangeLog
+++ b/app-doc/doxygen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-doc/doxygen
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.29 2004/02/06 22:11:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.30 2004/02/20 20:53:28 usata Exp $
+
+  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> doxygen-1.3.2.ebuild,
+  doxygen-1.3.3.ebuild, doxygen-1.3.4.ebuild, doxygen-1.3.5.ebuild:
+  Added tetex IUSE flag. Thanks to Ronny Schoebel <ronny@l61.de> for
+  submitting a patch to ebuilds. This closes bug #42067
 
   06 Feb 2004; <gustavoz@gentoo.org> doxygen-1.3.5.ebuild:
   stable on sparc
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest
index a098b32b7c9c..098568efba93 100644
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@@ -1,12 +1,12 @@
-MD5 517aa227e9b75a3c48bccd3c175e7a1a ChangeLog 5738
+MD5 4ccd8a79b34326c9793e00cece131272 doxygen-1.3.5.ebuild 2593
+MD5 dfaeb4806061920142764ce32e9c88d9 doxygen-1.3.4.ebuild 2591
+MD5 945369d6ab32e0ca44b222641e85a1a1 doxygen-1.3.2.ebuild 2584
 MD5 d3e6417eb331e4d3363a0c7bf8503427 doxygen-1.2.18.ebuild 1211
-MD5 96d1b1c5f0f6df51b2e97a97fb21ff93 doxygen-1.3.2.ebuild 2147
-MD5 2d2cb5f5c0ad2f0d4e31ad71a2c690f8 doxygen-1.3.3.ebuild 2149
-MD5 80e45663eb338600964a980c823c58b7 doxygen-1.3.4.ebuild 2156
-MD5 c4bd2ad12b5c63e2cd8ace799b96ff58 doxygen-1.3.5.ebuild 2159
+MD5 0a840624127370797e56b55520a0dd75 doxygen-1.3.3.ebuild 2584
+MD5 196372d55061dcc066446a76b359938a ChangeLog 6000
 MD5 6566b6f7ce0ea73e6129f23b0ef7d0c0 metadata.xml 280
-MD5 5f7d25c12b6cceb408f76864abbf1c28 files/digest-doxygen-1.2.18 71
 MD5 b930ec9ff54b96c72eacc864e989d25e files/digest-doxygen-1.3.2 70
 MD5 282fe1e391c89b5f590758bf816160b5 files/digest-doxygen-1.3.3 70
 MD5 d160d86e5eae4bf2ed853e16fab32355 files/digest-doxygen-1.3.4 70
+MD5 5f7d25c12b6cceb408f76864abbf1c28 files/digest-doxygen-1.2.18 71
 MD5 6fbdec5b9c246aad6da7d0e897fc88c0 files/digest-doxygen-1.3.5 70
diff --git a/app-doc/doxygen/doxygen-1.3.2.ebuild b/app-doc/doxygen/doxygen-1.3.2.ebuild
index 98f014df76d9..9e5bf3e476f0 100644
--- a/app-doc/doxygen/doxygen-1.3.2.ebuild
+++ b/app-doc/doxygen/doxygen-1.3.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.2.ebuild,v 1.9 2004/01/12 21:08:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.2.ebuild,v 1.10 2004/02/20 20:53:28 usata Exp $
 
-IUSE="doc qt"
+IUSE="doc qt tetex"
 
 DESCRIPTION="Doxygen is a documentation system for C++, C, Java, IDL (Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP and C#."
 HOMEPAGE="http://www.doxygen.org"
@@ -13,9 +13,9 @@ LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc ~alpha hppa"
 
 RDEPEND="media-gfx/graphviz
-	doc? ( virtual/tetex
-		virtual/ghostscript )
-	qt? ( x11-libs/qt )"
+	qt? ( x11-libs/qt )
+	doc? ( tetex? ( virtual/tetex )
+		virtual/ghostscript )"
 
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
@@ -44,15 +44,25 @@ src_compile() {
 	./configure ${confopts} || die '"./configure" failed.'
 	emake all || die '"emake all" failed.'
 
-	# generate html and pdf documents.
+	# 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
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make docs" failed.'
+		if use tetex; then
+			addwrite /var/cache/fonts
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make 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
 }
 
@@ -64,7 +74,9 @@ src_install() {
 	# pdf and html manuals
 	if use doc; then
 		insinto /usr/share/doc/${P}
-		doins latex/doxygen_manual.pdf
+		if use tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
 		dohtml -r html/*
 	fi
 }
diff --git a/app-doc/doxygen/doxygen-1.3.3.ebuild b/app-doc/doxygen/doxygen-1.3.3.ebuild
index ec4d87558472..a99211ca68cc 100644
--- a/app-doc/doxygen/doxygen-1.3.3.ebuild
+++ b/app-doc/doxygen/doxygen-1.3.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.3.ebuild,v 1.8 2004/01/12 21:08:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.3.ebuild,v 1.9 2004/02/20 20:53:28 usata Exp $
 
-IUSE="doc qt"
+IUSE="doc qt tetex"
 
 DESCRIPTION="Doxygen is a documentation system for C++, C, Java, IDL (Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP and C#."
 HOMEPAGE="http://www.doxygen.org"
@@ -14,11 +14,11 @@ KEYWORDS="x86 ~ppc ~sparc alpha ~hppa"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( x11-libs/qt )
-	doc? ( virtual/tetex
+	doc? ( tetex? ( virtual/tetex )
 		virtual/ghostscript )"
 
 DEPEND=">=sys-apps/sed-4
-		${RDEPEND}"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -44,15 +44,25 @@ src_compile() {
 	./configure ${confopts} || die '"./configure" failed.'
 	emake all || die '"emake all" failed.'
 
-	# generate html and pdf documents.
+	# 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
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make docs" failed.'
+		if use tetex; then
+			addwrite /var/cache/fonts
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make 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
 }
 
@@ -64,7 +74,9 @@ src_install() {
 	# pdf and html manuals
 	if use doc; then
 		insinto /usr/share/doc/${P}
-		doins latex/doxygen_manual.pdf
+		if use tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
 		dohtml -r html/*
 	fi
 }
diff --git a/app-doc/doxygen/doxygen-1.3.4.ebuild b/app-doc/doxygen/doxygen-1.3.4.ebuild
index f59eb626be8a..290d70108fe0 100644
--- a/app-doc/doxygen/doxygen-1.3.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.3.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.4.ebuild,v 1.6 2004/01/12 21:08:16 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.4.ebuild,v 1.7 2004/02/20 20:53:28 usata Exp $
 
-IUSE="doc qt"
+IUSE="doc qt tetex"
 
 DESCRIPTION="Doxygen is a documentation system for C++, C, Java, IDL (Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP and C#."
 HOMEPAGE="http://www.doxygen.org"
@@ -14,11 +14,11 @@ KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa amd64"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( x11-libs/qt )
-	doc? ( virtual/tetex
+	doc? ( tetex? ( virtual/tetex )
 		virtual/ghostscript )"
 
 DEPEND=">=sys-apps/sed-4
-		${RDEPEND}"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -44,15 +44,25 @@ src_compile() {
 	./configure ${confopts} || die '"./configure" failed.'
 	emake all || die '"emake all" failed.'
 
-	# generate html and pdf documents.
+	# 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
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make docs" failed.'
+		if use tetex; then
+			addwrite /var/cache/fonts
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make 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
 }
 
@@ -64,7 +74,9 @@ src_install() {
 	# pdf and html manuals
 	if use doc; then
 		insinto /usr/share/doc/${P}
-		doins latex/doxygen_manual.pdf
+		if use tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
 		dohtml -r html/*
 	fi
 }
diff --git a/app-doc/doxygen/doxygen-1.3.5.ebuild b/app-doc/doxygen/doxygen-1.3.5.ebuild
index 92b68773854d..2b0e64d3d449 100644
--- a/app-doc/doxygen/doxygen-1.3.5.ebuild
+++ b/app-doc/doxygen/doxygen-1.3.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.5.ebuild,v 1.6 2004/02/06 22:11:15 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.3.5.ebuild,v 1.7 2004/02/20 20:53:28 usata Exp $
 
-IUSE="doc qt"
+IUSE="doc qt tetex"
 
 DESCRIPTION="Doxygen is a documentation system for C++, C, Java, IDL (Corba, Microsoft, and KDE-DCOP flavors) and to some extent PHP and C#."
 HOMEPAGE="http://www.doxygen.org"
@@ -14,11 +14,11 @@ KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ia64"
 
 RDEPEND="media-gfx/graphviz
 	qt? ( x11-libs/qt )
-	doc? ( virtual/tetex
+	doc? ( tetex? ( virtual/tetex )
 		virtual/ghostscript )"
 
 DEPEND=">=sys-apps/sed-4
-		${RDEPEND}"
+	${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -44,15 +44,25 @@ src_compile() {
 	./configure ${confopts} || die '"./configure" failed.'
 	emake all || die '"emake all" failed.'
 
-	# generate html and pdf documents.
+	# 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
-		addwrite /var/cache/fonts
-		addwrite /usr/share/texmf/fonts/pk
-		addwrite /usr/share/texmf/ls-R
-		make pdf || ewarn '"make docs" failed.'
+		if use tetex; then
+			addwrite /var/cache/fonts
+			addwrite /usr/share/texmf/fonts/pk
+			addwrite /usr/share/texmf/ls-R
+			make pdf || ewarn '"make 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
 }
 
@@ -64,7 +74,9 @@ src_install() {
 	# pdf and html manuals
 	if use doc; then
 		insinto /usr/share/doc/${P}
-		doins latex/doxygen_manual.pdf
+		if use tetex; then
+			doins latex/doxygen_manual.pdf
+		fi
 		dohtml -r html/*
 	fi
 }