Revbump to push out fixed texmf-update. Removed 3.0

Package-Manager: portage-2.0.51-r15

7 files changed, 61 insertions, 95 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index 64168f17b61d..96f8f389b369 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,12 @@
 # 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.87 2005/02/21 13:17:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.88 2005/02/21 13:48:37 usata Exp $
+
+*tetex-2.0.2-r6 (21 Feb 2005)
+
+  21 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> +tetex-2.0.2-r6.ebuild,
+  tetex-3.0-r1.ebuild, -tetex-3.0.ebuild:
+  Revbump to push out fixed texmf-update. Removed 3.0.
 
   20 Feb 2005; Aron Griffis <agriffis@gentoo.org> tetex-2.0.2-r5.ebuild:
   stable on ia64 #75801
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 18608fa0046b..7712e603ff6d 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,21 +1,21 @@
 MD5 8f27cd5e7c06b0c37851607799f69316 tetex-1.0.7-r13.ebuild 4770
-MD5 b286784c535b129a4c487d1666192d6b tetex-2.0.2-r5.ebuild 1165
-MD5 bc60fbc65057fb830cb0831c93021471 tetex-3.0-r1.ebuild 2059
-MD5 18a2c88ee01a228f443743b3cbf2a234 tetex-2.0.2-r4.ebuild 611
-MD5 04c9aa48793ce2c85276892a28beddf3 ChangeLog 15505
+MD5 3cbcc333592523639a4244772e6d86b3 tetex-2.0.2-r6.ebuild 1170
+MD5 ef43ac3353608b8c73be3cc3a7370382 ChangeLog 15704
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 0914a927a521f6171ed062dc16729e5b tetex-3.0.ebuild 2008
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r4 282
-MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r5 282
+MD5 18a2c88ee01a228f443743b3cbf2a234 tetex-2.0.2-r4.ebuild 611
+MD5 b286784c535b129a4c487d1666192d6b tetex-2.0.2-r5.ebuild 1165
+MD5 7cf2c582396a5bc021129f70336e1110 tetex-3.0-r1.ebuild 2103
 MD5 77107ec8ba31c93b0e1bc35a9e4c9c4b files/xdvizilla.patch 912
+MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r4 282
 MD5 41f87c91f8bb6ceeae3c1fb7ca0dce1c files/tetex-texdoctk-gentoo.patch 509
-MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/xpdf2-underflow.patch 2363
-MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r1 202
+MD5 ed2101fe2206c296c09f0d2b67759841 files/digest-tetex-2.0.2-r5 282
+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 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
-MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0 202
 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 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424
-MD5 6f48f0b987b7ea33b02aea8ba198eeed files/iso-8859-7.def 4419
 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
+MD5 7184c72f1e38b2f0ddb843687cf80832 files/digest-tetex-3.0-r1 202
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r6 b/app-text/tetex/files/digest-tetex-2.0.2-r6
new file mode 100644
index 000000000000..e7e17c3b6698
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r6
@@ -0,0 +1,4 @@
+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/files/digest-tetex-3.0 b/app-text/tetex/files/digest-tetex-3.0
deleted file mode 100644
index 79805884155f..000000000000
--- a/app-text/tetex/files/digest-tetex-3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 944a4641e79e61043fdaf8f38ecbb4b3 tetex-src-3.0.tar.gz 12749314
-MD5 11aa15c8d3e28ee7815e0d5fcdf43fd4 tetex-texmf-3.0.tar.gz 91762123
-MD5 3d45189842f826b84ed867ab74a8b9fe tetex-3.0-gentoo.tar.gz 1352
diff --git a/app-text/tetex/tetex-2.0.2-r6.ebuild b/app-text/tetex/tetex-2.0.2-r6.ebuild
new file mode 100644
index 000000000000..32596e805f67
--- /dev/null
+++ b/app-text/tetex/tetex-2.0.2-r6.ebuild
@@ -0,0 +1,34 @@
+# 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 $
+
+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_unpack() {
+	tetex_src_unpack
+
+	# bug 75801
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-CESA-2004-007-xpdf2-newer.diff
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf-goo-sizet.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf -p1" epatch ${FILESDIR}/xpdf2-underflow.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl2-CAN-2004-1125.patch
+	EPATCH_OPTS="-d ${S}/libs/xpdf/xpdf -p0" epatch ${FILESDIR}/xpdf-3.00pl3-CAN-2005-0064.patch
+	EPATCH_OPTS="-d ${S} -p1" epatch ${FILESDIR}/xdvizilla.patch
+}
+
+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-3.0-r1.ebuild b/app-text/tetex/tetex-3.0-r1.ebuild
index 25faae9398f0..17a72fea54fc 100644
--- a/app-text/tetex/tetex-3.0-r1.ebuild
+++ b/app-text/tetex/tetex-3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/12 15:24:20 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-3.0-r1.ebuild,v 1.3 2005/02/21 13:48:37 usata Exp $
 
 inherit tetex eutils flag-o-matic
 
@@ -50,7 +50,8 @@ pkg_setup() {
 }
 
 src_compile() {
-	sed -i -e "/mktexlsr/,+3d" Makefile.in || die
+	sed -i -e "s/updmap-sys/updmap-sys --nohash/g" \
+		-e "/mktexlsr/,+3d" Makefile.in || die
 
 	use amd64 && replace-flags "-O3" "-O2"
 
diff --git a/app-text/tetex/tetex-3.0.ebuild b/app-text/tetex/tetex-3.0.ebuild
deleted file mode 100644
index 3c8aaf805cce..000000000000
--- a/app-text/tetex/tetex-3.0.ebuild
+++ /dev/null
@@ -1,76 +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-3.0.ebuild,v 1.1 2005/02/08 15:31:37 usata Exp $
-
-inherit tetex eutils flag-o-matic
-
-#TETEX_TEXMF_PV=2.96.5.20040711
-TETEX_TEXMF_PV=${PV}
-TEXMF_PATH=/var/lib/texmf
-S=${WORKDIR}/tetex-src-${PV}
-
-TETEX_SRC="tetex-src-${TETEX_SRC_PV:-${TETEX_PV}}.tar.gz"
-TETEX_TEXMF="tetex-texmf-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
-#TETEX_TEXMF_SRC="tetex-texmfsrc-${TETEX_TEXMF_PV:-${TETEX_PV}}.tar.gz"
-TETEX_TEXMF_SRC=""
-
-DESCRIPTION="a complete TeX distribution"
-HOMEPAGE="http://tug.org/teTeX/"
-
-SRC_PATH_TETEX=ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/current/distrib
-SRC_URI="${SRC_PATH_TETEX}/${TETEX_SRC}
-	${SRC_PATH_TETEX}/${TETEX_TEXMF}
-	mirror://gentoo/${P}-gentoo.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${P}-gentoo.tar.gz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
-IUSE="motif lesstif Xaw3d neXt"
-
-DEPEND="motif? ( lesstif? ( x11-libs/lesstif )
-		!lesstif? ( x11-libs/openmotif ) )
-	!motif? ( neXt? ( x11-libs/neXtaw )
-		!neXt? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
-	!dev-tex/memoir
-	!dev-tex/lineno
-	!dev-tex/SIunits
-	!dev-tex/floatflt
-	!dev-tex/g-brief
-	!dev-tex/pgf
-	!dev-tex/xcolor
-	!dev-tex/xkeyval"
-
-pkg_setup() {
-	ewarn
-	ewarn "teTeX 3.0 ebuild will remove config files stored in /usr/share/texmf."
-	ewarn "Please make a backup before upgrading if you changed anything."
-	ewarn
-
-	ebeep
-	epause
-}
-
-src_compile() {
-	use amd64 && replace-flags "-O3" "-O2"
-
-	if use motif ; then
-		if use lesstif ; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-		fi
-		toolkit="motif"
-	elif use neXt ; then
-		toolkit="neXtaw"
-	elif use Xaw3d ; then
-		toolkit="xaw3d"
-	else
-		toolkit="xaw"
-	fi
-
-	TETEX_ECONF="--with-x-toolkit=${toolkit}"
-
-	tetex_src_compile
-}
-
-src_install() {
-	tetex_src_install base doc fixup link
-}