Changed to use tetex-2 and tetex-3, respectively.

Package-Manager: portage-2.0.51.19

7 files changed, 27 insertions, 65 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index f360bebb982c..b10b8162e757 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.90 2005/04/02 05:02:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.91 2005/04/05 17:09:57 usata Exp $
+
+  05 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> -tetex-2.0.2-r4.ebuild,
+  tetex-2.0.2-r5.ebuild, tetex-2.0.2-r6.ebuild, tetex-3.0-r1.ebuild:
+  Changed to use tetex-2 and tetex-3, respectively.
 
   02 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> tetex-3.0-r1.ebuild:
   Fixed xdvi toolkit dependency; bug #87375. Removed ~mips for now;
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 48fc9750a4f5..ae27ccdcc978 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,31 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 448ae9488ef41cfef17fbafcce0afa05 ChangeLog 15963
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 8f27cd5e7c06b0c37851607799f69316 tetex-1.0.7-r13.ebuild 4770
-MD5 7c26bd1a9d2cb0677c5f011e638f378f tetex-3.0-r1.ebuild 2125
-MD5 3cbcc333592523639a4244772e6d86b3 tetex-2.0.2-r6.ebuild 1170
-MD5 18a2c88ee01a228f443743b3cbf2a234 tetex-2.0.2-r4.ebuild 611
-MD5 0540c1a933a0b1285ea70403d50fe6f0 tetex-2.0.2-r5.ebuild 1161
-MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
-MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r1 202
-MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r4 282
+MD5 2ce21318dff4993ac4b43860e86734d2 tetex-2.0.2-r6.ebuild 1169
+MD5 646c66d9e1511c8f5cf2e8197640e05e ChangeLog 16158
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 ebb5312ccec7bb8f4d6dba5dfe889c42 tetex-2.0.2-r5.ebuild 1158
+MD5 bfdb2c8fdf372c6b4f08a7acc30ddd5e tetex-3.0-r1.ebuild 2062
+MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
 MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r6 282
 MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r5 282
-MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
-MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
+MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r6 282
+MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
 MD5 1c3401dbbc9d478e94c98e44b9b68e38 files/tetex-no-readlink-manpage.diff 542
 MD5 5d40ba9d885af84bcc917ad17e2bf8e0 files/xpdf-3.00pl2-CAN-2004-1125.patch 1136
+MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
 MD5 c32a612ce419b9930ff273cf382558bf files/xpdf-3.00pl3-CAN-2005-0064.patch 346
 MD5 87d20c86d1451638e4b7adc2f7ac8067 files/xpdf-CESA-2004-007-xpdf2-newer.diff 2718
+MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCTiUAVWNWqTUmv+0RAgrZAJ9Ue/HMuLiwehib0VMnHarpOxwuFwCbBvcY
-BQfisldx29hn3SePEzh4Mu4=
-=DK0P
------END PGP SIGNATURE-----
+MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r1 202
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r4 b/app-text/tetex/files/digest-tetex-2.0.2-r4
deleted file mode 100644
index e7e17c3b6698..000000000000
--- a/app-text/tetex/files/digest-tetex-2.0.2-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
-MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
-MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
-MD5 0a0ba30552331663f496d41b8ca2a299 tetex-2.0.2-gentoo.tar.gz 1704
diff --git a/app-text/tetex/tetex-2.0.2-r4.ebuild b/app-text/tetex/tetex-2.0.2-r4.ebuild
deleted file mode 100644
index a211cd68ea3b..000000000000
--- a/app-text/tetex/tetex-2.0.2-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r4.ebuild,v 1.5 2005/01/01 16:37:56 eradicator Exp $
-
-inherit tetex eutils flag-o-matic
-
-DESCRIPTION="a complete TeX distribution"
-HOMEPAGE="http://tug.org/teTeX/"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
-IUSE=""
-
-src_compile() {
-	use amd64 && replace-flags "-O3" "-O2"
-	tetex_src_compile
-}
-
-src_install() {
-	insinto /usr/share/texmf/tex/latex/greek
-	doins ${FILESDIR}/iso-8859-7.def
-	tetex_src_install
-}
diff --git a/app-text/tetex/tetex-2.0.2-r5.ebuild b/app-text/tetex/tetex-2.0.2-r5.ebuild
index db1c217f6078..96646f5a3593 100644
--- a/app-text/tetex/tetex-2.0.2-r5.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r5.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.11 2005/03/09 00:49:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r5.ebuild,v 1.12 2005/04/05 17:09:57 usata Exp $
 
-inherit tetex eutils flag-o-matic
+inherit tetex-2 flag-o-matic
 
 DESCRIPTION="a complete TeX distribution"
 HOMEPAGE="http://tug.org/teTeX/"
 
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ~ppc-macos s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
 IUSE=""
 
 src_unpack() {
-	tetex_src_unpack
+	tetex-2_src_unpack
 
 	# bug 75801
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	insinto /usr/share/texmf/tex/latex/greek
 	doins ${FILESDIR}/iso-8859-7.def
-	tetex_src_install
+	tetex-2_src_install
 }
diff --git a/app-text/tetex/tetex-2.0.2-r6.ebuild b/app-text/tetex/tetex-2.0.2-r6.ebuild
index 32596e805f67..c6797ae17e9c 100644
--- a/app-text/tetex/tetex-2.0.2-r6.ebuild
+++ b/app-text/tetex/tetex-2.0.2-r6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r6.ebuild,v 1.1 2005/02/21 13:48:37 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r6.ebuild,v 1.2 2005/04/05 17:09:57 usata Exp $
 
-inherit tetex eutils flag-o-matic
+inherit tetex-2 flag-o-matic
 
 DESCRIPTION="a complete TeX distribution"
 HOMEPAGE="http://tug.org/teTeX/"
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~spa
 IUSE=""
 
 src_unpack() {
-	tetex_src_unpack
+	tetex-2_src_unpack
 
 	# bug 75801
 	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
@@ -30,5 +30,5 @@ src_compile() {
 src_install() {
 	insinto /usr/share/texmf/tex/latex/greek
 	doins ${FILESDIR}/iso-8859-7.def
-	tetex_src_install
+	tetex-2_src_install
 }
diff --git a/app-text/tetex/tetex-3.0-r1.ebuild b/app-text/tetex/tetex-3.0-r1.ebuild
index 35d27e093549..889fb43da10f 100644
--- a/app-text/tetex/tetex-3.0-r1.ebuild
+++ b/app-text/tetex/tetex-3.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0-r1.ebuild,v 1.5 2005/04/02 05:02:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0-r1.ebuild,v 1.6 2005/04/05 17:09:57 usata Exp $
 
-inherit tetex eutils flag-o-matic
+inherit tetex-3 flag-o-matic
 
 #TETEX_TEXMF_PV=2.96.5.20040711
 TETEX_TEXMF_PV=${PV}
@@ -74,7 +74,3 @@ src_compile() {
 
 	tetex_src_compile
 }
-
-src_install() {
-	tetex_src_install base doc fixup link
-}