Removed virtual/tetex and tetex IUSE flag

5 files changed, 36 insertions, 25 deletions

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 8b8c4e5ecc5a..8778d51a8a17 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # /space/gentoo/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.2 2002/04/16 01:14:04 seemant Exp
 
+  25 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> t1lib-1.3.1.ebuild,
+  t1lib-5.0.0-r1.ebuild, t1lib-5.0.0-r2.ebuild:
+  Removed virtual/tetex since it pulls app-text/tetex in when no
+  virtual/tetex candidate is installed. If you want to install
+  app-text/ptex, it will install t1lib (as app-text/ptex PDEPENDs on
+  app-text/xdvik and xdvik DEPENDs on t1lib) and want app-text/tetex
+  since no virtual/tetex will have been installed (app-text/tetex is
+  the first candidate of virtual/tetex if nothing installed).
+
 *t1lib-5.0.0-r2 (09 Aug 2003)
 
   09 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> t1lib-5.0.0-r2.ebuild:
diff --git a/media-libs/t1lib/Manifest b/media-libs/t1lib/Manifest
index 7a15d8ea0171..942223ec6e7b 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -1,7 +1,7 @@
-MD5 3482a55d8b5d1a954783cbcc4362b7d4 ChangeLog 2342
-MD5 5238abc71e5de472e2925a24aece5990 t1lib-1.3.1.ebuild 1498
-MD5 d577e6ad7670b5c1ed846360fa67c8ca t1lib-5.0.0-r1.ebuild 1743
-MD5 e684da6f9bf3276fcbedf8fc3cd76f23 t1lib-5.0.0-r2.ebuild 1780
+MD5 5f2e407a135248098e7b968a5ef7019c ChangeLog 2857
+MD5 12c6058fe2bb6992930a85d0bfef1b40 t1lib-1.3.1.ebuild 1479
+MD5 57fe4140c935584abaab5f55a11445be t1lib-5.0.0-r2.ebuild 1795
+MD5 50e686f436dae5fa93175e20cbc67dbe t1lib-5.0.0-r1.ebuild 1732
 MD5 817757abf473e739c3314daca2aecea2 files/digest-t1lib-1.3.1 64
-MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r1 64
 MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r2 64
+MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r1 64
diff --git a/media-libs/t1lib/t1lib-1.3.1.ebuild b/media-libs/t1lib/t1lib-1.3.1.ebuild
index 6a1d62d04034..b715ebe93a2f 100644
--- a/media-libs/t1lib/t1lib-1.3.1.ebuild
+++ b/media-libs/t1lib/t1lib-1.3.1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-1.3.1.ebuild,v 1.17 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-1.3.1.ebuild,v 1.18 2003/09/24 16:39:26 usata Exp $
 
 inherit gnuconfig
 
-IUSE="X tetex"
+IUSE="X"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics"
 
-DEPEND="X? ( virtual/x11 )
-	tetex? ( virtual/tetex )"
+DEPEND="X? ( virtual/x11 )"
 
 SLOT="0"
 LICENSE="LGPL-2 GPL-2"
@@ -37,8 +36,10 @@ src_compile() {
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
 
-	use tetex \
-		|| myopt="without_doc"
+	if [ ! -x /usr/bin/latex ] ; then
+		myopt="without_doc"
+	fi
+
 	echo `pwd`
 	econf ${myconf} || die
 	make ${myopt} || die
@@ -68,7 +69,6 @@ src_install() {
 	cd ..
 	dodoc Changes LGPL LICENSE README*
 	cd doc
-	insinto /usr/share/doc/t1lib-1.3.1/
+	insinto /usr/share/doc/${PF}
 	doins *.pdf *.dvi
-
 }
diff --git a/media-libs/t1lib/t1lib-5.0.0-r1.ebuild b/media-libs/t1lib/t1lib-5.0.0-r1.ebuild
index 0469487146f4..04fec21ebd9f 100644
--- a/media-libs/t1lib/t1lib-5.0.0-r1.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.0-r1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r1.ebuild,v 1.4 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r1.ebuild,v 1.5 2003/09/24 16:39:26 usata Exp $
 
 inherit gnuconfig
 
-IUSE="X tetex"
+IUSE="X"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
 SRC_URI="ftp://sunsite.unc.edu/pub/Linux/libs/graphics/${P}.tar.gz"
 HOMEPAGE="ftp://metalab.unc.edu/pub/Linux/libs/graphics"
 
-DEPEND="X? ( virtual/x11 )
-	tetex? ( virtual/tetex )"
+DEPEND="X? ( virtual/x11 )"
 
 SLOT="0"
 LICENSE="LGPL-2 GPL-2"
@@ -25,7 +24,6 @@ src_unpack() {
 	cd ${S}/doc
 	mv Makefile.in Makefile.in-orig
 	sed -e "s:dvips:#dvips:" Makefile.in-orig>Makefile.in
-
 }
 
 src_compile() {
@@ -37,8 +35,10 @@ src_compile() {
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
 
-	use tetex \
-		|| myopt="without_doc"
+	if [ ! -x /usr/bin/latex ] ; then
+		myopt="without_doc"
+	fi
+
 	echo `pwd`
 	econf ${myconf} || die
 	make ${myopt} || die
@@ -68,7 +68,7 @@ src_install() {
 	cd ..
 	dodoc Changes LGPL LICENSE README*
 	cd doc
-	insinto /usr/share/doc/${P}
+	insinto /usr/share/doc/${PF}
 	doins *.pdf *.dvi
 }
 
diff --git a/media-libs/t1lib/t1lib-5.0.0-r2.ebuild b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
index de8a0470b353..04afcd835b68 100644
--- a/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.3 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.4 2003/09/24 16:39:26 usata Exp $
 
 inherit gnuconfig
 
-IUSE="X tetex doc"
+IUSE="X doc"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A Type 1 Rasterizer Library for UNIX/X11"
@@ -37,8 +37,10 @@ src_compile() {
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
 
-	use tetex \
-		|| myopt="without_doc"
+	if [ ! -x /usr/bin/latex ] ; then
+		myopt="without_doc"
+	fi
+
 	echo `pwd`
 	econf ${myconf} || die
 	make ${myopt} || die