Archived patches in files directory and put them on Gentoo mirrors.

9 files changed, 24 insertions, 151 deletions

diff --git a/app-text/tetex/ChangeLog b/app-text/tetex/ChangeLog
index bb1a4915f9b7..1982047c83ee 100644
--- a/app-text/tetex/ChangeLog
+++ b/app-text/tetex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tetex
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.63 2004/07/01 14:04:02 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/ChangeLog,v 1.64 2004/07/30 19:50:14 usata Exp $
+
+  31 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> -files/teTeX-1.0-dvips.diff,
+  -files/teTeX-1.0-gentoo.diff, -files/tetex-1.0.7-dont-run-config.diff,
+  -files/tetex-1.0.7-dvips-secure.diff, -files/tetex-1.0.7-picins.diff,
+  tetex-1.0.7-r13.ebuild:
+  Archived patches in files directory and put them on Gentoo mirrors.
 
   01 Jul 2004; Tom Gall <tgall@gentoo.org> tetex-2.0.2-r3.ebuild:
   stable on ppc64, bug #54799
diff --git a/app-text/tetex/Manifest b/app-text/tetex/Manifest
index e9e3febf2aaf..001db4172b4d 100644
--- a/app-text/tetex/Manifest
+++ b/app-text/tetex/Manifest
@@ -1,15 +1,10 @@
-MD5 5543823c98e38f4e3f73f6b97bfee1df ChangeLog 11362
+MD5 ff8f24b66db89dfab9cc6c4e9242f49d ChangeLog 11682
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 b96cd38deff87742b1adea737f507fd5 tetex-1.0.7-r13.ebuild 4786
+MD5 f42ae561b062b136306ded87d8b70318 tetex-1.0.7-r13.ebuild 4777
 MD5 132b2753da0877b097557588bdcfd7d3 tetex-2.0.2-r3.ebuild 565
-MD5 e25ee6dd9708723dc411b9acc3ec33db files/digest-tetex-1.0.7-r13 274
 MD5 7c6b2802aa5d3ea38bcc94a91c4ac54e files/digest-tetex-2.0.2-r3 214
-MD5 4cefd677082951973c64809e5368874f files/teTeX-1.0-dvips.diff 389
-MD5 f05081952fcd0ac7d776c04242a3f7d1 files/teTeX-1.0-gentoo.diff 1176
+MD5 9179c455d1a594b0b06b670e0b051374 files/digest-tetex-1.0.7-r13 343
 MD5 cc0a84367e8c96d736ca42ba162594dd files/teTeX-1.0.dif 50852
-MD5 5fd1b7e5bf4c4d6705e7c365995d057d files/tetex-1.0.7-dont-run-config.diff 1305
-MD5 a57ac0ec7f0c9a136cb087abc8d86c46 files/tetex-1.0.7-dvips-secure.diff 1693
-MD5 d1ce2613a3498412c7dde5509a066c9d files/tetex-1.0.7-picins.diff 281
 MD5 476a1c8128397ff7a381c43fe723a522 files/tetex-2.0.2-dont-run-config.diff 1243
 MD5 50c560b391869be15a001b738e0b7bfe files/tetex-2.0.2.diff 2010
 MD5 1c3401dbbc9d478e94c98e44b9b68e38 files/tetex-no-readlink-manpage.diff 542
diff --git a/app-text/tetex/files/digest-tetex-1.0.7-r13 b/app-text/tetex/files/digest-tetex-1.0.7-r13
index b0dad1273c70..d9b435f3bbaa 100644
--- a/app-text/tetex/files/digest-tetex-1.0.7-r13
+++ b/app-text/tetex/files/digest-tetex-1.0.7-r13
@@ -2,3 +2,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
+MD5 8e593d8dc1ffcd9e767d7436504e0a38 tetex-1.0.7-gentoo.tar.gz 18189
diff --git a/app-text/tetex/files/teTeX-1.0-dvips.diff b/app-text/tetex/files/teTeX-1.0-dvips.diff
deleted file mode 100644
index 12aaf5c971b3..000000000000
--- a/app-text/tetex/files/teTeX-1.0-dvips.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- teTeX-1.0/texk/dvipsk/dvips.c.secure	1999-04-11 08:05:48.000000000 +0100
-+++ teTeX-1.0/texk/dvipsk/dvips.c	2002-08-16 17:42:48.000000000 +0100
-@@ -740,7 +740,7 @@
-                cropmarks = (*p != '0') ;
-                break ;
- case 'R':
--               secure = 1 ;
-+               secure = (*p != '0') ;
-                break ;
- case 'S':
-                if (*p == 0 && argv[i+1])
diff --git a/app-text/tetex/files/teTeX-1.0-gentoo.diff b/app-text/tetex/files/teTeX-1.0-gentoo.diff
deleted file mode 100644
index e88767817ae8..000000000000
--- a/app-text/tetex/files/teTeX-1.0-gentoo.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -r -C2 teTeX-1.0.orig/texk/gsftopk/gsftopk.c teTeX-1.0/texk/gsftopk/gsftopk.c
-*** teTeX-1.0.orig/texk/gsftopk/gsftopk.c	Thu Apr 22 01:48:11 1999
---- teTeX-1.0/texk/gsftopk/gsftopk.c	Wed Oct 24 15:17:45 2001
-***************
-*** 407,411 ****
-  Boolean		quiet		= False;
-  
-! struct option {
-  	const char	*longname;
-  	short		shortname;
---- 407,411 ----
-  Boolean		quiet		= False;
-  
-! struct xxx_option {
-  	const char	*longname;
-  	short		shortname;
-***************
-*** 415,419 ****
-  };
-  
-! static	const struct option	options[]	= {
-  		{"test",	't',	False,	&test,	True},
-  		{"mapline",	0,	True,	&mapline, 0},
---- 415,419 ----
-  };
-  
-! static	const struct xxx_option	options[]	= {
-  		{"test",	't',	False,	&test,	True},
-  		{"mapline",	0,	True,	&mapline, 0},
-***************
-*** 1960,1965 ****
-  	argp = argv;
-  	while (++argp < argv + argc && (*argp)[0] == '-') {
-! 	    const struct option *opt_ptr;
-! 	    const struct option *opt;
-  	    char *arg = *argp + 1;
-  
---- 1960,1965 ----
-  	argp = argv;
-  	while (++argp < argv + argc && (*argp)[0] == '-') {
-! 	    const struct xxx_option *opt_ptr;
-! 	    const struct xxx_option *opt;
-  	    char *arg = *argp + 1;
-  
diff --git a/app-text/tetex/files/tetex-1.0.7-dont-run-config.diff b/app-text/tetex/files/tetex-1.0.7-dont-run-config.diff
deleted file mode 100644
index 95d2c5cf99f2..000000000000
--- a/app-text/tetex/files/tetex-1.0.7-dont-run-config.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- teTeX-1.0/Makefile.in.orig	Sat Sep 21 11:35:34 2002
-+++ teTeX-1.0/Makefile.in	Sat Sep 21 11:36:19 2002
-@@ -81,12 +81,12 @@
- 	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)/texconfig && \
--	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
--	    $(scriptdir)/texconfig init
-+#	test -f $(scriptdir)/mktexlsr && \
-+#	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+#	    $(scriptdir)/mktexlsr
-+#	test -f $(scriptdir)/texconfig && \
-+#	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+#	    $(scriptdir)/texconfig init
- 
- install-exec:
- 	for dir in $(ESUBDIRS); do \
-@@ -95,9 +95,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 && \
--	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
--	    $(scriptdir)/texlinks
-+#	test -f $(scriptdir)/texlinks && \
-+#	  TEXMFMAIN=$(texmf) PATH=$(scriptdir):$(bindir):$(PATH) \
-+#	    $(scriptdir)/texlinks
- 
- strip:
- 
diff --git a/app-text/tetex/files/tetex-1.0.7-dvips-secure.diff b/app-text/tetex/files/tetex-1.0.7-dvips-secure.diff
deleted file mode 100644
index b4ebc61103b8..000000000000
--- a/app-text/tetex/files/tetex-1.0.7-dvips-secure.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- teTeX-1.0/texk/dvipsk/dvips.c.secure	2002-05-28 12:18:55.000000000 +0100
-+++ teTeX-1.0/texk/dvipsk/dvips.c	2002-05-28 12:26:38.000000000 +0100
-@@ -64,7 +64,7 @@
- Boolean cropmarks ;           /* add cropmarks? */
- Boolean abspage = 0 ;         /* are page numbers absolute? */
- Boolean tryepsf = 0 ;         /* should we try to make it espf? */
--Boolean secure = 0 ;          /* make safe for suid */
-+Boolean secure = 1 ;          /* make safe for suid */
- int collatedcopies = 1 ;      /* how many collated copies? */
- int sectioncopies = 1 ;       /* how many times to repeat each section? */
- integer pagecopies = 1 ;          /* how many times to repeat each page? */
-@@ -280,7 +280,7 @@
- "p # First page                     P s Load config.$s                  ",
- #endif
- "q*  Run quietly                                                        ",
--"r*  Reverse order of pages         R   Run securely                    ",
-+"r*  Reverse order of pages         R   Run securely (default)          ",
- "s*  Enclose output in save/restore S # Max section size in pages       ",
- "t s Paper format                   T c Specify desired page size       ",  
- "u s PS mapfile                     U*  Disable string param trick      ",
---- teTeX-1.0/texk/dvipsk/dvips.1.secure	2002-05-28 12:28:59.000000000 +0100
-+++ teTeX-1.0/texk/dvipsk/dvips.1	2002-05-28 12:30:59.000000000 +0100
-@@ -328,7 +328,9 @@
- .I \\\special{psfile="`zcat foo.ps.Z"}
- or
- .I \epsffile[72 72 540 720]{"`zcat screendump.ps.gz"}
--are not executed.
-+are not executed.  This is the default; to run insecurely use the
-+.B -R0
-+option.
- .TP
- .B -s
- Causes the entire global output to be enclosed in a save/restore pair.
-
diff --git a/app-text/tetex/files/tetex-1.0.7-picins.diff b/app-text/tetex/files/tetex-1.0.7-picins.diff
deleted file mode 100644
index 18ab29dc5fc6..000000000000
--- a/app-text/tetex/files/tetex-1.0.7-picins.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- teTeX-1.0.ORIG/texmf/tex/latex/misc/picins.sty	1992-09-27 09:00:00.000000000 +0900
-+++ teTeX-1.0/texmf/tex/latex/misc/picins.sty	2003-09-30 05:03:32.000000000 +0900
-@@ -576,4 +576,3 @@
-    \put(\c@xoff,\c@yoff){\box\env@box}%
-  \end{picture}%
- }
--
-\ No newline at end of file
diff --git a/app-text/tetex/tetex-1.0.7-r13.ebuild b/app-text/tetex/tetex-1.0.7-r13.ebuild
index 9674e59d586a..fa43302f510b 100644
--- a/app-text/tetex/tetex-1.0.7-r13.ebuild
+++ b/app-text/tetex/tetex-1.0.7-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # 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.10 2004/06/24 22:53:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tetex/tetex-1.0.7-r13.ebuild,v 1.11 2004/07/30 19:50:14 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,9 +10,10 @@ S=${WORKDIR}/teTeX-1.0
 DESCRIPTION="a complete TeX distribution"
 HOMEPAGE="http://tug.org/teTeX/"
 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"
+	ftp://ftp.dante.de/pub/tex/systems/unix/teTeX/1.0/contrib/ghibo/${TEXMFSRC}
+	mirror://gentoo/ec-ready-mf-tfm.tar.gz
+	mirror://gentoo/teTeX-french.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.gz"
 
 KEYWORDS="x86 ppc sparc alpha hppa"
 SLOT="0"
@@ -48,21 +49,22 @@ src_unpack() {
 	echo ">>> Unpacking teTeX-french.tar.gz"
 	tar --no-same-owner -xzf ${DISTDIR}/teTeX-french.tar.gz || die
 
+	cd ${S}
+	unpack ${P}-gentoo.tar.gz
+
 	# Fixes from way back ... not sure even Achim will
 	# still know why :/
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/teTeX-1.0-gentoo.diff
-	cd ${S}
-	epatch ${FILESDIR}/teTeX-1.0.dif
+	epatch teTeX-1.0-gentoo.diff
+	epatch teTeX-1.0.diff
 
 	# Do not run config stuff
-	epatch ${FILESDIR}/${P}-dont-run-config.diff
+	epatch ${P}-dont-run-config.diff
 
 	# Fix for dvips to print directly.
-	epatch ${FILESDIR}/teTeX-1.0-dvips.diff
+	epatch teTeX-1.0-dvips.diff
 
 	# Fix picins.sty 
-	epatch ${FILESDIR}/${P}-picins.diff
+	epatch ${P}-picins.diff
 
 	# Prevent the silly readlink manpage from installing
 	epatch ${FILESDIR}/${PN}-no-readlink-manpage.diff