closing bugs 14709 and 20843

7 files changed, 389 insertions, 18 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index 36dfb3664547..8296ab432da7 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,9 +1,18 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.43 2003/08/14 14:52:24 usata Exp $
-
-  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> tetex-1.0.7-r12.ebuild:
-  Added virtual/tetex PROVIDE
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.44 2003/09/07 01:01:48 drobbins Exp $
+
+  06 Sep 2003; Daniel Robbins <drobbins@gentoo.org> tetex-2.0.2-r1.ebuild,
+  tetex-1.0.7-r13.ebuild: removed png, libwww and ncurses USE variables, which
+  were off by default.  This fixes bugs 14709 and 20843.  We want tetex to use
+  *our* libpng, libwww and ncurses packages so that we can track dependencies
+  correctly. The internal libwww was using mysql sometimes, resulting in fried
+  compiles since it seemed to often mis-detect mysql availability. Our libwww
+  ebuild does much better. Also added an RDEPEND fix (tons of stuff was
+  missing.)
+  
+  14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> tetex-1.0.7-r12.ebuild: Added
+  virtual/tetex PROVIDE
 
   02 Aug 2003; Todd Sunderlin <todd@gentoo.org> tetex-2.0.2.ebuild:
   Marked stable for sparc
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index 29621ae5f3de..e9cd55a7eddb 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,16 +1,20 @@
-MD5 c6b8fa37bbf1f58eca730dbd2e261f43 ChangeLog 7546
+MD5 9915235f5c96769807e8c1b7c3426fac tetex-1.0.7-r13.ebuild 4711
 MD5 fc241435526292f71de6d264d86d4b8f tetex-1.0.7-r12.ebuild 4841
 MD5 54266fdca91026ded5f015bd8dbc3736 tetex-2.0.2.ebuild 4539
-MD5 eb29daccee75f5f007fa30e18ff0ccb8 files/digest-tetex-1.0.7-r12 1132
-MD5 b8cb43e3d6ac916e7d69e843b43aafad files/digest-tetex-2.0.2 1068
+MD5 81a755c5c3acb731888d7e2690245000 tetex-2.0.2-r1.ebuild 4330
+MD5 06dafbfde07556563930349cbca4effa ChangeLog 8104
+MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010
+MD5 d17a70a33444ac4f10849dfb55af858c files/digest-tetex-2.0.2-r1 214
+MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-r12-gentoo.diff 1693
 MD5 4cefd677082951973c64809e5368874f files/teTeX-1.0-dvips.diff 389
-MD5 f05081952fcd0ac7d776c04242a3f7d1 files/teTeX-1.0-gentoo.diff 1176
-MD5 cc0a84367e8c96d736ca42ba162594dd files/teTeX-1.0.dif 50852
+MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0-dont-run-config.diff 1243
 MD5 5fd1b7e5bf4c4d6705e7c365995d057d files/tetex-1.0.7-dont-run-config.diff 1305
+MD5 b8cb43e3d6ac916e7d69e843b43aafad files/digest-tetex-2.0.2 1068
+MD5 cc0a84367e8c96d736ca42ba162594dd files/teTeX-1.0.dif 50852
+MD5 f7a5360e9a44fa9ad6d14bd00127e6a0 files/texmf.dif 37948
+MD5 f05081952fcd0ac7d776c04242a3f7d1 files/teTeX-1.0-gentoo.diff 1176
+MD5 eb29daccee75f5f007fa30e18ff0ccb8 files/digest-tetex-1.0.7-r12 1132
+MD5 e25ee6dd9708723dc411b9acc3ec33db files/digest-tetex-1.0.7-r13 274
+MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.diff 2010
 MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-r11-gentoo.diff 1693
-MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-r12-gentoo.diff 1693
-MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0-dont-run-config.diff 1243
 MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
-MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010
-MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.diff 2010
-MD5 f7a5360e9a44fa9ad6d14bd00127e6a0 files/texmf.dif 37948
diff --git a/app-text/tetex/files/digest-tetex-1.0.7-r13 b/app-text/tetex/files/digest-tetex-1.0.7-r13
new file mode 100644
index 000000000000..b0dad1273c70
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-1.0.7-r13
@@ -0,0 +1,4 @@
+MD5 2c6da2a45096c2fdc41b8de6a8af1a52 teTeX-src-1.0.7.tar.gz 8040192
+MD5 984530be5cc0dd73738de9d0067bc130 teTeX-texmf-gg-1.0.3.tar.bz2 35037546
+MD5 12925188fdadcd6a970c21bba3269fc2 ec-ready-mf-tfm.tar.gz 386630
+MD5 37393316b285926214c247acd55db743 teTeX-french.tar.gz 268161
diff --git a/app-text/tetex/files/digest-tetex-1.0.7-r5 b/app-text/tetex/files/digest-tetex-1.0.7-r5
deleted file mode 100644
index 65bede7f6629..000000000000
--- a/app-text/tetex/files/digest-tetex-1.0.7-r5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 12925188fdadcd6a970c21bba3269fc2 ec-ready-mf-tfm.tar.gz 389120
-MD5 37393316b285926214c247acd55db743 teTeX-french.tar.gz 270336
-MD5 2c6da2a45096c2fdc41b8de6a8af1a52 teTeX-src-1.0.7.tar.gz 8040448
-MD5 7811ed356cca07b16ea8422f00c3cd34 teTeX-texmf-1.0.2.tar.gz 33153024
diff --git a/app-text/tetex/files/digest-tetex-2.0.2-r1 b/app-text/tetex/files/digest-tetex-2.0.2-r1
new file mode 100644
index 000000000000..235f58e8e41f
--- /dev/null
+++ b/app-text/tetex/files/digest-tetex-2.0.2-r1
@@ -0,0 +1,3 @@
+MD5 a16f6bba227d55e79aeee46fbbd82d28 tetex-src-2.0.2.tar.gz 11745933
+MD5 40d4b2c5582eccbee4b6ec692c3cc253 tetex-texmfsrc-2.0.2.tar.gz 22909537
+MD5 d3bdb96f9077e43b2115d3cc471743b3 tetex-texmf-2.0.2.tar.gz 52424280
diff --git a/app-text/tetex/tetex-1.0.7-r13.ebuild b/app-text/tetex/tetex-1.0.7-r13.ebuild
new file mode 100644
index 000000000000..3d2e6bb8651f
--- /dev/null
+++ b/app-text/tetex/tetex-1.0.7-r13.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.1 2003/09/07 01:01:49 drobbins Exp $
+
+inherit flag-o-matic
+filter-flags "-fstack-protector"
+
+TEXMFSRC="teTeX-texmf-gg-1.0.3.tar.bz2"
+S=${WORKDIR}/teTeX-1.0
+
+DESCRIPTION="a complete TeX distribution"
+SRC_URI="ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/1.0/distrib/sources/teTeX-src-${PV}.tar.gz
+	 ftp://ftp.dante.de/pub/tex/systems/unix/teTeX/1.0/contrib/ghibo/${TEXMFSRC}
+	 mirror://gentoo/ec-ready-mf-tfm.tar.gz
+	 mirror://teTeX-french.tar.gz"
+HOMEPAGE="http://tug.org/teTeX/"
+
+KEYWORDS="x86 ppc sparc alpha hppa"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="X"
+
+DEPEND="sys-apps/ed
+	X? ( virtual/x11 )
+	>=media-libs/libpng-1.2.1
+	sys-libs/ncurses 
+	>=net-libs/libwww-5.3.2-r1
+	sys-libs/zlib"
+RDEPEND="$DEPEND >=dev-lang/perl-5.2
+	dev-util/dialog"
+PROVIDE="virtual/tetex"
+
+src_unpack() {
+	unpack teTeX-src-${PV}.tar.gz
+
+	cd ${S}
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	
+	mkdir ${S}/texmf
+	cd ${S}/texmf
+	umask 022
+	echo ">>> Unpacking ${TEXMFSRC}"
+	tar --no-same-owner -xjf ${DISTDIR}/${TEXMFSRC} || die
+	echo ">>> Unpacking ec-ready-mf-tfm.tar.gz"
+	tar --no-same-owner -xzf ${DISTDIR}/ec-ready-mf-tfm.tar.gz -C .. || die
+	echo ">>> Unpacking teTeX-french.tar.gz"
+	tar --no-same-owner -xzf ${DISTDIR}/teTeX-french.tar.gz || die
+
+	# Fixes from way back ... not sure even Achim will
+	# still know why :/
+	cd ${WORKDIR}
+	patch -p0 < ${FILESDIR}/teTeX-1.0-gentoo.diff || die
+	cd ${S}
+	patch -p0 < ${FILESDIR}/teTeX-1.0.dif || die
+
+	# Do not run config stuff
+	patch -p1 < ${FILESDIR}/${P}-dont-run-config.diff || die
+
+	# Fix for dvips to print directly.
+	patch -p1 < ${FILESDIR}/teTeX-1.0-dvips.diff || die
+
+	# Fix problem where the *.fmt files are not generated due to the LaTeX
+	# source being older than a year.
+        local x
+        for x in `find ${S}/texmf/ -type f -name '*.ini'`
+        do
+                cp ${x} ${x}.orig
+                sed -e '1i \\scrollmode' ${x}.orig > ${x}
+                rm -f ${x}.orig
+        done
+
+	# IMPORTANT!  If you're having *.fmt problems, do this:
+	# fmtutil --all
+	# after the merge.
+
+}
+
+src_compile() {
+
+	local myconf=""
+	use X \
+		&& myconf="--with-x" \
+		|| myconf="--without-x"
+
+	econf \
+		--without-texinfo \
+		--without-dialog \
+		--disable-multiplatform \
+		--with-epsfwin \
+		--with-mftalkwin \
+		--with-regiswin \
+		--with-system-wwwlib \
+		--with-libwww-include=/usr/include/w3c-libwww \
+		--with-system-pnglib \
+		--with-system-ncurses \
+		--with-system-zlib \
+		--with-tektronixwin \
+		--with-unitermwin \
+		--with-ps=gs \
+		--enable-ipc \
+		--with-etex \
+		${myconf} || die "econf failed"
+
+	# emake seems to not work (18 Jan 2003 agriffis)
+	make
+}
+
+src_install() {
+
+	dodir /usr/share/
+    # Install texmf files
+	einfo "Installing texmf..."
+	cp -Rv texmf ${D}/usr/share || die "cp -Rv texmf failed"
+
+	einstall \
+		texmf=${D}/usr/share/texmf \
+		texmfmain=${D}/usr/share/texmf \
+		mandir=${D}/usr/share/man/man1 \
+		|| die "einstall failed"
+
+	dodoc PROBLEMS README
+	docinto texk
+	dodoc texk/ChangeLog texk/README
+	docinto kpathesa
+	cd ${S}/texk/kpathsea
+	dodoc README* NEWS PROJECTS HIER
+	docinto dviljk
+	cd ${S}/texk/dviljk
+	dodoc AUTHORS README NEWS
+	docinto dvipsk
+	cd ${S}/texk/dvipsk
+	dodoc AUTHORS ChangeLog INSTALLATION README
+	docinto makeindexk
+	cd ${S}/texk/makeindexk
+	dodoc CONTRIB COPYING NEWS NOTES PORTING README
+	docinto ps2pkm
+	cd ${S}/texk/ps2pkm
+	dodoc ChangeLog CHANGES.type1 INSTALLATION README* 
+	docinto web2c
+	cd ${S}/texk/web2c
+	dodoc AUTHORS ChangeLog NEWS PROJECTS README
+	docinto xdvik
+	cd ${S}/texk/xdvik
+	dodoc BUGS FAQ README* 
+
+	#fix for conflicting readlink binary:
+	rm -f ${D}/bin/readlink
+	rm -f ${D}/usr/bin/readlink
+	#add /var/cache/fonts directory
+	dodir /var/cache/fonts
+
+	#fix for lousy upstream permisssions on /usr/share/texmf files
+	#NOTE: do not use fowners, as its not recursive ...
+	einfo "Fixing permissions..."
+	chown -R root.root ${D}/usr/share/texmf
+}
+
+pkg_postinst() {
+
+	if [ $ROOT = "/" ]
+	then
+		einfo "Configuring teTeX..."
+		mktexlsr &>/dev/null
+		texlinks &>/dev/null
+		texconfig init &>/dev/null
+		texconfig confall &>/dev/null
+		texconfig font vardir /var/cache/fonts &>/dev/null
+
+		# Fix bug 13789; this should really be done by texconfig init
+		# but oh well, it will probably be fixed by 2.0, right? ;-)
+		# (18 Jan 2003 agriffis)
+		( cd /var/lib/texmf/web2c; inimf mf; ) &>/dev/null
+
+		einfo "Generating format files..."
+		fmtutil --missing &>/dev/null # This should generate all missing fmt files.
+		
+		echo
+		einfo "Use 'texconfig font rw' to allow all users to generate fonts."
+		echo
+	fi
+}
+
diff --git a/app-text/tetex/tetex-2.0.2-r1.ebuild b/app-text/tetex/tetex-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..ed1100afffb4
--- /dev/null
+++ b/app-text/tetex/tetex-2.0.2-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-2.0.2-r1.ebuild,v 1.1 2003/09/07 01:01:49 drobbins Exp $
+
+inherit eutils flag-o-matic
+filter-flags "-fstack-protector"
+
+S=${WORKDIR}/tetex-src-${PV}
+TETEXSRC="tetex-src-${PV}.tar.gz"
+TEXMFSRC="tetex-texmfsrc-${PV}.tar.gz"
+TEXMF="tetex-texmf-${PV}.tar.gz"
+
+DESCRIPTION="a complete TeX distribution"
+SRC_URI="ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/${TETEXSRC}
+         ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/${TEXMFSRC}
+         ftp://cam.ctan.org/tex-archive/systems/unix/teTeX/2.0/distrib/${TEXMF}"
+HOMEPAGE="http://tug.org/teTeX/"
+
+KEYWORDS="~x86 ppc sparc alpha amd64"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="X"
+
+DEPEND="sys-apps/ed
+	sys-libs/zlib
+	X? ( virtual/x11 )
+	>=media-libs/libpng-1.2.1 
+	sys-libs/ncurses 
+	>=net-libs/libwww-5.3.2-r1"
+RDEPEND="$DEPEND >=dev-lang/perl-5.2 dev-util/dialog"
+PROVIDE="virtual/tetex-2.0.2"
+
+src_unpack() {
+	unpack ${TETEXSRC}
+
+	cd ${WORKDIR}
+	mkdir ${S}/texmf
+	cd ${S}/texmf
+	umask 022
+	pwd
+	einfo "Unpacking ${TEXMFSRC}"
+	tar --no-same-owner -xzf ${DISTDIR}/${TEXMFSRC} || die
+
+	einfo "Unpacking ${TEXMF}"
+	tar --no-same-owner -xzf ${DISTDIR}/${TEXMF} || die
+
+	# Do not run config.  Also fix local texmf tree.
+	cd ${WORKDIR}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-dont-run-config.diff
+	epatch ${FILESDIR}/${P}.diff
+}
+
+src_compile() {
+
+	local myconf=""
+	use X \
+		&& myconf="--with-x" \
+		|| myconf="--without-x"
+
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=${S} \
+		--with-system-wwwlib \
+		--with-libwww-include=/usr/include/w3c-libwww \
+		--with-system-ncurses \
+		--with-system-pnglib \
+		--without-texinfo \
+		--without-dialog \
+		--with-system-zlib \
+		--disable-multiplatform \
+		--with-epsfwin \
+		--with-mftalkwin \
+		--with-regiswin \
+		--with-tektronixwin \
+		--with-unitermwin \
+		--with-ps=gs \
+		--enable-ipc \
+		--with-etex \
+		${myconf} || die
+
+	make texmf=/usr/share/texmf || die
+}
+
+src_install() {
+
+	dodir /usr/share/
+    # Install texmf files
+	einfo "Installing texmf..."
+    cp -Rv texmf ${D}/usr/share
+		
+	make prefix=${D}/usr \
+		bindir=${D}/usr/bin \
+		datadir=${D}/usr/share \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		texmf=${D}/usr/share/texmf \
+		install || die
+
+	dodoc PROBLEMS README
+	docinto texk
+	dodoc texk/ChangeLog texk/README
+	docinto kpathesa
+	cd ${S}/texk/kpathsea
+	dodoc README* NEWS PROJECTS HIER
+	docinto dviljk
+	cd ${S}/texk/dviljk
+	dodoc AUTHORS README NEWS
+	docinto dvipsk
+	cd ${S}/texk/dvipsk
+	dodoc AUTHORS ChangeLog INSTALLATION README
+	docinto makeindexk
+	cd ${S}/texk/makeindexk
+	dodoc CONTRIB COPYING NEWS NOTES PORTING README
+	docinto ps2pkm
+	cd ${S}/texk/ps2pkm
+	dodoc ChangeLog CHANGES.type1 INSTALLATION README* 
+	docinto web2c
+	cd ${S}/texk/web2c
+	dodoc AUTHORS ChangeLog NEWS PROJECTS README
+	docinto xdvik
+	cd ${S}/texk/xdvik
+	dodoc BUGS FAQ README* 
+
+	#fix for conflicting readlink binary:
+	rm -f ${D}/bin/readlink
+	rm -f ${D}/usr/bin/readlink
+	#add /var/cache/fonts directory
+	dodir /var/cache/fonts
+
+	#fix for lousy upstream permisssions on /usr/share/texmf files
+	#NOTE: do not use fowners, as its not recursive ...
+	einfo "Fixing permissions..."
+	chown -R root.root ${D}/usr/share/texmf
+	dodir /etc/env.d/
+	echo 'CONFIG_PROTECT="/usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/"' > ${D}/etc/env.d/98tetex
+}
+
+pkg_preinst() {
+	if [ -d "/usr/share/texmf/dvipdfm/config" ]
+	then
+		ewarn "Removing /usr/share/texmf/dvipdfm/config/"
+		rm -rf /usr/share/texmf/dvipdfm/config
+	fi
+
+	# Let's take care of config protecting.
+	einfo "Here I am!"
+}
+
+pkg_postinst() {
+
+	if [ $ROOT = "/" ]
+	then
+		einfo "Configuring teTeX..."
+		mktexlsr &>/dev/null
+		texlinks &>/dev/null
+		texconfig init &>/dev/null
+		texconfig confall &>/dev/null
+		texconfig font rw &>/dev/null
+		texconfig font vardir /var/cache/fonts &>/dev/null
+		texconfig font options varfonts &>/dev/null
+		einfo "Generating format files..."
+		fmtutil --missing &>/dev/null # This should generate all missing fmt files.
+		echo
+		einfo "Use 'texconfig font ro' to disable font generation for users"
+		echo
+	fi
+}
+