cleanup

3 files changed, 120 insertions, 53 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index 7374fa2e78cd..8897e428ba17 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.11 2002/09/12 16:48:58 satai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.12 2002/09/16 14:14:58 azarah Exp $
 
-*tetex-20020901 (11 Sep 2002)
+  16 Sep 2002; Martin Schlemmer <azarah@gentoo.org> tetex-20020901-r1.ebuild :
+
+    Some cleanups and <tab> fixes.  Fix permissions on /usr/share/texmf
+    (fowners is not recursive).  Add a patch for not running the config
+    stuff during 'make install', as we should rather do it in src_unpack().
+
+*tetex-20020901-r1 (11 Sep 2002)
 
   11 Sep 2002; satai <satai@gentoo.org> tetex-20020901-r1.ebuild :
 
diff --git a/app-text/tetex/files/tetex-20020901-dont-run-config.diff b/app-text/tetex/files/tetex-20020901-dont-run-config.diff
new file mode 100644
index 000000000000..912bd5d259ec
--- /dev/null
+++ b/app-text/tetex/files/tetex-20020901-dont-run-config.diff
@@ -0,0 +1,40 @@
+--- teTeX-src-beta-20020901/Makefile.in.orig	Mon Sep 16 15:06:33 2002
++++ teTeX-src-beta-20020901/Makefile.in	Mon Sep 16 15:12:22 2002
+@@ -85,15 +85,15 @@
+ 	done
+ 	$(srcdir)/selfautofix "$(bindir)" "$(texmf)/web2c"
+ 	cd $(bindir); for i in $(ALLPROGS); do test -f $$i && { echo strip $$i; strip $$i || true; }; done; true
+-	test -f $(scriptdir)/mktexlsr && \
+-	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	    $(scriptdir)/mktexlsr
+-	test -f $(scriptdir)/fmtutil && \
+-	  TEXMFCNF=$(texmf)/web2c TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	    $(scriptdir)/fmtutil --all
+-	test -f $(scriptdir)/texlinks && \
+-	  TEXMF=$(texmf) TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	    $(scriptdir)/texlinks
++#	test -f $(scriptdir)/mktexlsr && \
++#	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++#	    $(scriptdir)/mktexlsr
++#	test -f $(scriptdir)/fmtutil && \
++#	  TEXMFCNF=$(texmf)/web2c TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++#	    $(scriptdir)/fmtutil --all
++#	test -f $(scriptdir)/texlinks && \
++#	  TEXMF=$(texmf) TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++#	    $(scriptdir)/texlinks
+ 
+ install-exec:
+ 	for dir in $(ESUBDIRS); do \
+@@ -102,9 +102,9 @@
+               $(MAKE) $@) || exit 1; \
+ 	done
+ 	cd $(bindir); for i in $(ALLPROGS); do test -f $$i && { echo strip $$i; strip $$i || true; }; done; true
+-	test -f $(scriptdir)/texlinks && \
+-	  TEXMF=$(texmf) TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
+-	    $(scriptdir)/texlinks
++#	test -f $(scriptdir)/texlinks && \
++#	  TEXMF=$(texmf) TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
++#	    $(scriptdir)/texlinks
+ 
+ strip:
+ 
diff --git a/app-text/tetex/tetex-20020901-r1.ebuild b/app-text/tetex/tetex-20020901-r1.ebuild
index 23ddd8e4ea5b..6c8d502ad12c 100644
--- a/app-text/tetex/tetex-20020901-r1.ebuild
+++ b/app-text/tetex/tetex-20020901-r1.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-20020901-r1.ebuild,v 1.2 2002/09/12 16:48:58 satai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-20020901-r1.ebuild,v 1.3 2002/09/16 14:14:58 azarah Exp $
 
+TETEXSRC="teTeX-src-beta-${PV}.tar.gz"
 TEXMFSRC="teTeX-texmfsrc-beta-20020829.tar.gz"
-TEXMF="teTeX-texmf-beta-20020901.tar.gz"
+TEXMF="teTeX-texmf-beta-${PV}.tar.gz"
+
 S=${WORKDIR}/teTeX-src-beta-${PV}
 DESCRIPTION="teTeX is a complete TeX distribution"
-SRC_URI=" ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/teTeX-src-beta-20020901.tar.gz
-	 ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/${TEXMFSRC}
-	 ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/${TEXMF}
-     http://www.ibiblio.org/gentoo/distfiles/ec-ready-mf-tfm.tar.gz
-     http://www.ibiblio.org/gentoo/distfiles/teTeX-french.tar.gz"
+SRC_URI=" ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/${TETEXSRC}
+	ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/${TEXMFSRC}
+	ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/${TEXMF}
+	mirror://gentoo/ec-ready-mf-tfm.tar.gz
+	mirror://gentoo/teTeX-french.tar.gz"
 HOMEPAGE="http://tug.cs.umb.edu/tetex/"
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc sparc64"
 
 DEPEND="sys-apps/ed
 	sys-libs/zlib 
@@ -25,51 +29,59 @@ DEPEND="sys-apps/ed
 RDEPEND=">=sys-devel/perl-5.2
 	dev-util/dialog"
 
-KEYWORDS="x86 ppc sparc sparc64"
-
 src_unpack() {
 
-	unpack teTeX-src-beta-20020901.tar.gz
+	unpack ${TETEXSRC}
 	
-	mkdir ${S}/texmf
+	mkdir -p ${S}/texmf
 	cd ${S}/texmf
 	echo ">>> Unpacking ${TEXMFSRC}"
-	tar xzf ${DISTDIR}/${TEXMFSRC}
+	tar xzf ${DISTDIR}/${TEXMFSRC} || die "Failed to unpack ${TEXMFSRC}!"
 	echo ">>> Unpacking ${TEXMF}"
-	tar xzf ${DISTDIR}/${TEXMF}
+	tar xzf ${DISTDIR}/${TEXMF} || die "Failed to unpack ${TEXMF}!"
 	echo ">>> Unpacking ec-ready-mf-tfm.tar.gz"
-	tar xzf ${DISTDIR}/ec-ready-mf-tfm.tar.gz -C ..
+	tar xzf ${DISTDIR}/ec-ready-mf-tfm.tar.gz -C .. || \
+		die "Failed to unpack ec-ready-mf-tfm.tar.gz!"
 	echo ">>> Unpacking teTeX-french.tar.gz"
-	tar xzf ${DISTDIR}/teTeX-french.tar.gz
+	tar xzf ${DISTDIR}/teTeX-french.tar.gz || \
+		die "Failed to unpack teTeX-french.tar.gz!"
 
 	cd ${S}
-	patch -p0 < ${FILESDIR}/tetex-20020901-fontmap.diff || die
-	patch -p1 < ${FILESDIR}/tetex-20020901-local.diff || die
-	use ncurses \
-		&& cd ${S}/texk/tetex \
-		&& sed 's/tcdialog/dialog/g' texconfig > tc-gentoo \
-		&& mv tc-gentoo texconfig
-
+	# Fix invalid font mappings.
+	patch -p0 < ${FILESDIR}/${P}-fontmap.diff || die
+	# Change TEXMFLOCAL to /usr/local/share/texmf by default.
+	patch -p1 < ${FILESDIR}/${P}-local.diff || die
+
+	# Do not run config stuff during 'make install'
+	# Rather do it here, as we really should not do it during
+	# src_install().
+	patch -p1 < ${FILESDIR}/${P}-dont-run-config.diff || die
+	
+	if [ "`use ncurses`" ]
+	then
+		cd ${S}/texk/tetex
+		sed 's/tcdialog/dialog/g' texconfig > tc-gentoo
+		mv tc-gentoo texconfig
+	fi
 }
 
 src_compile() {
 
-	local myconf
+	local myconf=""
 	use X \
 		&& myconf="--with-x" \
 		|| myconf="--without-x"
 
-	use libwww && ( \
-		myconf="${myconf} --with-system-wwwlib"
-	)
+	use libwww \
+		&& myconf="${myconf} --with-system-wwwlib"
 
 	use png \
 		&& myconf="${myconf} --with-system-pnglib"
-
 	
 	use ncurses \
-		&& myconf="${myconf} --with-system-ncurses --with-ncurses-libdir=/usr/lib --with-ncurses-include=/usr/include"
-
+		&& myconf="${myconf} --with-system-ncurses \
+		                     --with-ncurses-libdir=/usr/lib \
+		                     --with-ncurses-include=/usr/include"
 	
 	./configure --host=${CHOST} \
 		--prefix=/usr \
@@ -97,20 +109,17 @@ src_compile() {
 
 src_install() {
 
-	cd ${S}
 	dodir /usr/share/
+	einfo "Installing texmf data..."
 	cp -af texmf ${D}/usr/share
-	sed -e 's:    \$(scriptdir)/mktexlsr:    echo:' \
-		-e 's:\$(scriptdir)/texconfig init:echo:' \
-		Makefile > Makefile.install
-	patch -p0 < ${FILESDIR}/tetex-20020901-makefile.diff || die
+	
 	make prefix=${D}/usr \
 		bindir=${D}/usr/bin \
 		datadir=${D}/usr/share \
 		mandir=${D}/usr/share/man/man1 \
 		infodir=${D}/usr/share/info \
 		texmf=${D}/usr/share/texmf \
-		-f Makefile.install \
+		-f Makefile \
 		install || die
 
 	dodoc PROBLEMS README
@@ -138,27 +147,39 @@ src_install() {
 	cd ${S}/texk/xdvik
 	dodoc BUGS FAQ README* 
 
-	#fix for conflicting readlink binary:
-	rm ${D}/bin/readlink
-	#add /var/cache/fonts directory
+	# Fix for conflicting readlink binary.
+	rm -f ${D}/bin/readlink
+	# Add /var/cache/fonts directory.
 	dodir /var/cache/fonts
 
-	#fix for lousy upstream permisssions on /usr/share/texmf files
-	fowners root.root /usr/share/texmf/*
+	# Fix for lousy upstream permissions on /usr/share/texmf files
+	# NOTE: fowners is not recursive...
+	einfo "Fixing permissions and ownership..."
+	chown -R root.root ${D}/usr/share/texmf/*
+	-find ${D}/usr/share/texmf/ -type d -exec chmod a+rx {} \;
+	-find ${D}/usr/share/texmf/ -type f -exec chmod a+r {} \;
 }
 
 pkg_postinst() {
 
-	if [ $ROOT = "/" ]
+	if [ "${ROOT}" = "/" ]
 	then
-		echo ">>> Configuring teTeX..."
-		mktexlsr >/dev/null 2>&1 
-        fmtutil --all >/dev/null 2>&1
-		texlinks >/dev/null 2>&1
-		texconfig init >/dev/null 2>&1
-		texconfig confall >/dev/null 2>&1
-		texconfig font vardir /var/cache/fonts >/dev/null 2>&1
-		texconfig font rw
-		echo "*** use 'texconfig font ro' to allow only root to generate fonts ***"
+		einfo "Configuring teTeX..."
+		mktexlsr &> /dev/null
+        fmtutil --all &> /dev/null
+		texlinks &> /dev/null
+		texconfig init &> /dev/null
+		texconfig confall &> /dev/null
+		texconfig font vardir /var/cache/fonts &> /dev/null
+		texconfig font rw &> /dev/null
+		echo
+		
+		einfo "****************************************************"
+		einfo " To allow only root to generate fonts, use:"
+		einfo
+		einfo "   # texconfig font ro"
+		einfo 
+		einfo "****************************************************"
 	fi
 }
+