old

21 files changed, 0 insertions, 1343 deletions

diff --git a/app-arch/gzip/files/digest-gzip-1.3.10 b/app-arch/gzip/files/digest-gzip-1.3.10
deleted file mode 100644
index b974c3d74c63..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8b6f74a5060f984dceb0fee877aed854 gzip-1.3.10.tar.gz 426699
-RMD160 9efac47867981ecb9ed9d3be3844d653750f1eb2 gzip-1.3.10.tar.gz 426699
-SHA256 4470b390d87855863689865593e02f4e2694337393046cc6a6bdb27e47fa6d31 gzip-1.3.10.tar.gz 426699
diff --git a/app-arch/gzip/files/digest-gzip-1.3.11 b/app-arch/gzip/files/digest-gzip-1.3.11
deleted file mode 100644
index aef70cc8bc07..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a41a6a4b11f941cb7fc13df320f3af5f gzip-1.3.11.tar.gz 431721
-RMD160 7bb4566728bf5836547a8de3b5cdf02ef4e60887 gzip-1.3.11.tar.gz 431721
-SHA256 d185067bf198bc6213402a76b95fbffe9772a592b006f58bf8b89b4b5511cd56 gzip-1.3.11.tar.gz 431721
diff --git a/app-arch/gzip/files/digest-gzip-1.3.5-r10 b/app-arch/gzip/files/digest-gzip-1.3.5-r10
deleted file mode 100644
index cc0c9a56f833..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.5-r10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3d6c191dfd2bf307014b421c12dc8469 gzip-1.3.5.tar.gz 331550
-RMD160 5011f20441f31838c34b981c325107dd85737ff9 gzip-1.3.5.tar.gz 331550
-SHA256 631820e566353eafc4bdc0d9d8221c26c7ef6b5d10a254783dbe9bcac88caa07 gzip-1.3.5.tar.gz 331550
diff --git a/app-arch/gzip/files/digest-gzip-1.3.9 b/app-arch/gzip/files/digest-gzip-1.3.9
deleted file mode 100644
index c460a0c92543..000000000000
--- a/app-arch/gzip/files/digest-gzip-1.3.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7cf923b24b718c418e85a283b2260e14 gzip-1.3.9.tar.gz 420737
-RMD160 27e28003bef96cdf195717c41a8ea16561576cb0 gzip-1.3.9.tar.gz 420737
-SHA256 a6fdbe5ce21f5e4ce219375c29e842da517e61a56900a678cf258b4fdd603e72 gzip-1.3.9.tar.gz 420737
diff --git a/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.2.patch b/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.2.patch
deleted file mode 100644
index 26dfe4291707..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.2.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-http://bugs.gentoo.org/145511
-
-diff -ruN gzip-1.3.5.orig/gzip.h gzip-1.3.5/gzip.h
---- gzip-1.3.5.orig/gzip.h	2001-10-01 07:53:41.000000000 +0100
-+++ gzip-1.3.5/gzip.h	2006-09-27 15:25:23.340499960 +0100
-@@ -198,6 +198,8 @@
- extern int to_stdout;      /* output to stdout (-c) */
- extern int save_orig_name; /* set if original name must be saved */
- 
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-+
- #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
- #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
- 
-diff -ruN gzip-1.3.5.orig/inflate.c gzip-1.3.5/inflate.c
---- gzip-1.3.5.orig/inflate.c	2002-09-25 22:20:13.000000000 +0100
-+++ gzip-1.3.5/inflate.c	2006-09-27 15:25:23.342499656 +0100
-@@ -337,7 +337,7 @@
-   {
-     *t = (struct huft *)NULL;
-     *m = 0;
--    return 0;
-+    return 2;
-   }
- 
- 
-diff -ruN gzip-1.3.5.orig/unlzh.c gzip-1.3.5/unlzh.c
---- gzip-1.3.5.orig/unlzh.c	1999-10-06 06:00:00.000000000 +0100
-+++ gzip-1.3.5/unlzh.c	2006-09-27 15:26:00.882792664 +0100
-@@ -149,13 +149,17 @@
-     unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
- 
-     for (i = 1; i <= 16; i++) count[i] = 0;
--    for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
-+    for (i = 0; i < (unsigned)nchar; i++) {
-+        if (bitlen[i] > 16)
-+        error("Bad table (case a)\n");
-+        else count[bitlen[i]]++;
-+    }
- 
-     start[1] = 0;
-     for (i = 1; i <= 16; i++)
- 	start[i + 1] = start[i] + (count[i] << (16 - i));
--    if ((start[17] & 0xffff) != 0)
--	error("Bad table\n");
-+    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
-+	error("Bad table (case b)\n");
- 
-     jutbits = 16 - tablebits;
-     for (i = 1; i <= (unsigned)tablebits; i++) {
-@@ -169,8 +173,8 @@
- 
-     i = start[tablebits + 1] >> jutbits;
-     if (i != 0) {
--	k = 1 << tablebits;
--	while (i != k) table[i++] = 0;
-+	k = MIN(1 << tablebits, DIST_BUFSIZE);
-+	while (i < k) table[i++] = 0;
-     }
- 
-     avail = nchar;
-@@ -179,6 +183,7 @@
- 	if ((len = bitlen[ch]) == 0) continue;
- 	nextcode = start[len] + weight[len];
- 	if (len <= (unsigned)tablebits) {
-+	    nextcode = MIN(nextcode, DIST_BUFSIZE);
- 	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
- 	} else {
- 	    k = start[len];
-@@ -218,7 +223,7 @@
- 	for (i = 0; i < 256; i++) pt_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NPT)) {
- 	    c = bitbuf >> (BITBUFSIZ - 3);
- 	    if (c == 7) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
-@@ -228,7 +233,7 @@
- 	    pt_len[i++] = c;
- 	    if (i == i_special) {
- 		c = getbits(2);
--		while (--c >= 0) pt_len[i++] = 0;
-+		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
- 	    }
- 	}
- 	while (i < nn) pt_len[i++] = 0;
-@@ -248,7 +253,7 @@
- 	for (i = 0; i < 4096; i++) c_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NC)) {
- 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
- 	    if (c >= NT) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
-@@ -256,14 +261,14 @@
- 		    if (bitbuf & mask) c = right[c];
- 		    else               c = left [c];
- 		    mask >>= 1;
--		} while (c >= NT);
-+		} while (c >= NT && (mask || c != left[c]));
- 	    }
- 	    fillbuf((int) pt_len[c]);
- 	    if (c <= 2) {
- 		if      (c == 0) c = 1;
- 		else if (c == 1) c = getbits(4) + 3;
- 		else             c = getbits(CBIT) + 20;
--		while (--c >= 0) c_len[i++] = 0;
-+		while (--c >= 0 && i < NC) c_len[i++] = 0;
- 	    } else c_len[i++] = c - 2;
- 	}
- 	while (i < NC) c_len[i++] = 0;
-@@ -292,7 +297,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NC);
-+	} while (j >= NC && (mask || j != left[j]));
-     }
-     fillbuf((int) c_len[j]);
-     return j;
-@@ -309,7 +314,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NP);
-+	} while (j >= NP && (mask || j != left[j]));
-     }
-     fillbuf((int) pt_len[j]);
-     if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
-@@ -356,7 +361,7 @@
-     while (--j >= 0) {
- 	buffer[r] = buffer[i];
- 	i = (i + 1) & (DICSIZ - 1);
--	if (++r == count) return r;
-+	if (++r >= count) return r;
-     }
-     for ( ; ; ) {
- 	c = decode_c();
-@@ -366,14 +371,14 @@
- 	}
- 	if (c <= UCHAR_MAX) {
- 	    buffer[r] = c;
--	    if (++r == count) return r;
-+	    if (++r >= count) return r;
- 	} else {
- 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
- 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
- 	    while (--j >= 0) {
- 		buffer[r] = buffer[i];
- 		i = (i + 1) & (DICSIZ - 1);
--		if (++r == count) return r;
-+		if (++r >= count) return r;
- 	    }
- 	}
-     }
-diff -ruN gzip-1.3.5.orig/unpack.c gzip-1.3.5/unpack.c
---- gzip-1.3.5.orig/unpack.c	1999-10-06 06:00:00.000000000 +0100
-+++ gzip-1.3.5/unpack.c	2006-09-27 15:25:23.343499504 +0100
-@@ -13,7 +13,6 @@
- #include "gzip.h"
- #include "crypt.h"
- 
--#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- /* The arguments must not have side effects. */
- 
- #define MAX_BITLEN 25
-@@ -133,7 +132,7 @@
- 	/* Remember where the literals of this length start in literal[] : */
- 	lit_base[len] = base;
- 	/* And read the literals: */
--	for (n = leaves[len]; n > 0; n--) {
-+	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
- 	    literal[base++] = (uch)get_byte();
- 	}
-     }
-@@ -169,7 +168,7 @@
-     prefixp = &prefix_len[1<<peek_bits];
-     for (len = 1; len <= peek_bits; len++) {
- 	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
--	while (prefixes--) *--prefixp = (uch)len;
-+	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
-     }
-     /* The length of all other codes is unknown: */
-     while (prefixp > prefix_len) *--prefixp = 0;
diff --git a/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.patch b/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.patch
deleted file mode 100644
index 85c618741294..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-CVE-2006-4334-8.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-http://bugs.gentoo.org/145511
-
---- gzip-1.3.5/gzip.h
-+++ gzip-1.3.5/gzip.h
-@@ -198,6 +198,8 @@
- extern int to_stdout;      /* output to stdout (-c) */
- extern int save_orig_name; /* set if original name must be saved */
- 
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-+
- #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
- #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
- 
---- gzip-1.3.5/inflate.c
-+++ gzip-1.3.5/inflate.c
-@@ -337,7 +337,7 @@
-   {
-     *t = (struct huft *)NULL;
-     *m = 0;
--    return 0;
-+    return 2;
-   }
- 
- 
---- gzip-1.3.5/unlzh.c
-+++ gzip-1.3.5/unlzh.c
-@@ -149,13 +149,17 @@
-     unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
- 
-     for (i = 1; i <= 16; i++) count[i] = 0;
--    for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
-+    for (i = 0; i < (unsigned)nchar; i++) {
-+        if (bitlen[i] > 16)
-+        error("Bad table (case a)\n");
-+        else count[bitlen[i]]++;
-+    }
- 
-     start[1] = 0;
-     for (i = 1; i <= 16; i++)
- 	start[i + 1] = start[i] + (count[i] << (16 - i));
--    if ((start[17] & 0xffff) != 0)
--	error("Bad table\n");
-+    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
-+	error("Bad table (case b)\n");
- 
-     jutbits = 16 - tablebits;
-     for (i = 1; i <= (unsigned)tablebits; i++) {
-@@ -169,15 +173,15 @@
- 
-     i = start[tablebits + 1] >> jutbits;
-     if (i != 0) {
--	k = 1 << tablebits;
--	while (i != k) table[i++] = 0;
-+	k = MIN(1 << tablebits, DIST_BUFSIZE);
-+	while (i < k) table[i++] = 0;
-     }
- 
-     avail = nchar;
-     mask = (unsigned) 1 << (15 - tablebits);
-     for (ch = 0; ch < (unsigned)nchar; ch++) {
- 	if ((len = bitlen[ch]) == 0) continue;
--	nextcode = start[len] + weight[len];
-+	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
- 	if (len <= (unsigned)tablebits) {
- 	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
- 	} else {
-@@ -218,7 +222,7 @@
- 	for (i = 0; i < 256; i++) pt_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NPT)) {
- 	    c = bitbuf >> (BITBUFSIZ - 3);
- 	    if (c == 7) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
-@@ -228,7 +232,7 @@
- 	    pt_len[i++] = c;
- 	    if (i == i_special) {
- 		c = getbits(2);
--		while (--c >= 0) pt_len[i++] = 0;
-+		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
- 	    }
- 	}
- 	while (i < nn) pt_len[i++] = 0;
-@@ -248,7 +252,7 @@
- 	for (i = 0; i < 4096; i++) c_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NC)) {
- 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
- 	    if (c >= NT) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
-@@ -256,14 +260,14 @@
- 		    if (bitbuf & mask) c = right[c];
- 		    else               c = left [c];
- 		    mask >>= 1;
--		} while (c >= NT);
-+		} while (c >= NT && (mask || c != left[c]));
- 	    }
- 	    fillbuf((int) pt_len[c]);
- 	    if (c <= 2) {
- 		if      (c == 0) c = 1;
- 		else if (c == 1) c = getbits(4) + 3;
- 		else             c = getbits(CBIT) + 20;
--		while (--c >= 0) c_len[i++] = 0;
-+		while (--c >= 0 && i < NC) c_len[i++] = 0;
- 	    } else c_len[i++] = c - 2;
- 	}
- 	while (i < NC) c_len[i++] = 0;
-@@ -292,7 +296,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NC);
-+	} while (j >= NC && (mask || j != left[j]));
-     }
-     fillbuf((int) c_len[j]);
-     return j;
-@@ -309,7 +313,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NP);
-+	} while (j >= NP && (mask || j != left[j]));
-     }
-     fillbuf((int) pt_len[j]);
-     if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
-@@ -356,7 +360,7 @@
-     while (--j >= 0) {
- 	buffer[r] = buffer[i];
- 	i = (i + 1) & (DICSIZ - 1);
--	if (++r == count) return r;
-+	if (++r >= count) return r;
-     }
-     for ( ; ; ) {
- 	c = decode_c();
-@@ -366,14 +370,14 @@
- 	}
- 	if (c <= UCHAR_MAX) {
- 	    buffer[r] = c;
--	    if (++r == count) return r;
-+	    if (++r >= count) return r;
- 	} else {
- 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
- 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
- 	    while (--j >= 0) {
- 		buffer[r] = buffer[i];
- 		i = (i + 1) & (DICSIZ - 1);
--		if (++r == count) return r;
-+		if (++r >= count) return r;
- 	    }
- 	}
-     }
---- gzip-1.3.5/unpack.c
-+++ gzip-1.3.5/unpack.c
-@@ -13,7 +13,6 @@
- #include "gzip.h"
- #include "crypt.h"
- 
--#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- /* The arguments must not have side effects. */
- 
- #define MAX_BITLEN 25
-@@ -133,7 +132,7 @@
- 	/* Remember where the literals of this length start in literal[] : */
- 	lit_base[len] = base;
- 	/* And read the literals: */
--	for (n = leaves[len]; n > 0; n--) {
-+	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
- 	    literal[base++] = (uch)get_byte();
- 	}
-     }
-@@ -169,7 +168,7 @@
-     prefixp = &prefix_len[1<<peek_bits];
-     for (len = 1; len <= peek_bits; len++) {
- 	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
--	while (prefixes--) *--prefixp = (uch)len;
-+	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
-     }
-     /* The length of all other codes is unknown: */
-     while (prefixp > prefix_len) *--prefixp = 0;
diff --git a/app-arch/gzip/files/gzip-1.3.5-alpha.patch b/app-arch/gzip/files/gzip-1.3.5-alpha.patch
deleted file mode 100644
index c31cd3209595..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-alpha.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Taken from Debian.
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=187417
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=184057
-http://bugs.gentoo.org/92232
-
---- gzip-1.3.5.orig/deflate.c
-+++ gzip-1.3.5/deflate.c
-@@ -643,7 +643,8 @@
-         /* Find the longest match, discarding those <= prev_length.
-          * At this point we have always match_length < MIN_MATCH
-          */
--        if (hash_head != NIL && strstart - hash_head <= MAX_DIST) {
-+        if (hash_head != NIL && strstart - hash_head <= MAX_DIST &&
-+            strstart <= window_size - MIN_LOOKAHEAD) {
-             /* To simplify the code, we prevent matches with the string
-              * of window index 0 (in particular we have to avoid a match
-              * of the string with itself at the start of the input file).
-@@ -737,7 +738,8 @@
-         match_length = MIN_MATCH-1;
- 
-         if (hash_head != NIL && prev_length < max_lazy_match &&
--            strstart - hash_head <= MAX_DIST) {
-+            strstart - hash_head <= MAX_DIST && 
-+            strstart <= window_size - MIN_LOOKAHEAD) {
-             /* To simplify the code, we prevent matches with the string
-              * of window index 0 (in particular we have to avoid a match
-              * of the string with itself at the start of the input file).
diff --git a/app-arch/gzip/files/gzip-1.3.5-asm-execstack.patch b/app-arch/gzip/files/gzip-1.3.5-asm-execstack.patch
deleted file mode 100644
index 40cda597ae7b..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-asm-execstack.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Ripped from Fedora.
-Include stack markings in the asm code so the final binary 
-isn't assumed to require executable markings.
---- gzip-1.3.5/match.c
-+++ gzip-1.3.5/match.c
-@@ -54,6 +54,9 @@
- 	.globl	_match_init
- 	.globl  _longest_match
- 
-+	.section .note.GNU-stack, "", @progbits
-+	.previous
-+	
- 	.text
- 
- _match_init:
diff --git a/app-arch/gzip/files/gzip-1.3.5-debian.patch b/app-arch/gzip/files/gzip-1.3.5-debian.patch
deleted file mode 100644
index 0e4908f1e1e7..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-debian.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Hunks ripped from Debian's patchset.
-
---- gzip-1.3.5.orig/gzexe.in
-+++ gzip-1.3.5/gzexe.in
-@@ -42,8 +42,10 @@
-   exit 1
- fi
- 
-+set -C
- tmp=gz$$
--trap "rm -f $tmp; exit 1" 1 2 3 5 10 13 15
-+trap "rm -f $tmp; exit 1" HUP INT QUIT TRAP USR1 PIPE TERM
-+: > $tmp || exit 1
- 
- decomp=0
- res=0
-@@ -53,8 +55,8 @@
-   shift
- fi
- 
--echo hi > zfoo1$$
--echo hi > zfoo2$$
-+echo hi > zfoo1$$ || exit 1
-+echo hi > zfoo2$$ || exit 1
- if test -z "`(${CPMOD-cpmod} zfoo1$$ zfoo2$$) 2>&1`"; then
-   cpmod=${CPMOD-cpmod}
- fi
-@@ -110,26 +112,28 @@
-       writable=0
-       chmod u+w $tmp 2>/dev/null
-     fi
-+    : >| $tmp  # truncate the file, ignoring set -C
-   fi
-   if test $decomp -eq 0; then
--    sed 1q $0 > $tmp
-+    sed 1q $0 >> $tmp
-     sed "s|^if tail|if $tail|" >> $tmp <<'EOF'
--skip=22
-+skip=23
- set -C
- umask=`umask`
- umask 77
--if tail +$skip "$0" | "BINDIR"/gzip -cd > /tmp/gztmp$$; then
-+tmpfile=`tempfile -p gztmp -d /tmp` || exit 1
-+if tail +$skip "$0" | /bin/gzip -cd >> $tmpfile; then
-   umask $umask
--  /bin/chmod 700 /tmp/gztmp$$
-+  /bin/chmod 700 $tmpfile
-   prog="`echo $0 | /bin/sed 's|^.*/||'`"
--  if /bin/ln /tmp/gztmp$$ "/tmp/$prog" 2>/dev/null; then
--    trap '/bin/rm -f /tmp/gztmp$$ "/tmp/$prog"; exit $res' 0
--    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$ "/tmp/$prog") 2>/dev/null &
-+  if /bin/ln $tmpfile "/tmp/$prog" 2>/dev/null; then
-+    trap '/bin/rm -f $tmpfile "/tmp/$prog"; exit $res' 0
-+    (/bin/sleep 5; /bin/rm -f $tmpfile "/tmp/$prog") 2>/dev/null &
-     /tmp/"$prog" ${1+"$@"}; res=$?
-   else
--    trap '/bin/rm -f /tmp/gztmp$$; exit $res' 0
--    (/bin/sleep 5; /bin/rm -f /tmp/gztmp$$) 2>/dev/null &
--    /tmp/gztmp$$ ${1+"$@"}; res=$?
-+    trap '/bin/rm -f $tmpfile; exit $res' 0
-+    (/bin/sleep 5; /bin/rm -f $tmpfile) 2>/dev/null &
-+    $tmpfile ${1+"$@"}; res=$?
-   fi
- else
-   echo Cannot decompress $0; exit 1
-@@ -144,8 +148,8 @@
- 
-   else
-     # decompression
--    skip=22
--    if sed -e 1d -e 2q "$i" | grep "^skip=[0-9][0-9]*$" >/dev/null; then
-+    skip=23
-+    if sed -e 1d -e 2q "$i" | grep "^skip=[0-9]*$" >/dev/null; then
-       eval `sed -e 1d -e 2q "$i"`
-     fi
-     if tail +$skip "$i" | gzip -cd > $tmp; then
---- gzip-1.3.5.orig/zmore.in
-+++ gzip-1.3.5/zmore.in
-@@ -34,16 +34,16 @@
-   cb='min 1 -icanon'; ncb='icanon eof ^d'
- fi
- if test $? -eq 0 && test -n "$oldtty"; then
--   trap 'stty $oldtty 2>/dev/null; exit' 0 2 3 5 10 13 15
-+   trap 'stty $oldtty 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
- else
--   trap 'stty $ncb echo 2>/dev/null; exit' 0 2 3 5 10 13 15
-+   trap 'stty $ncb echo 2>/dev/null; exit' INT QUIT TRAP USR1 PIPE TERM
- fi
- 
- if test $# = 0; then
-     if test -t 0; then
- 	echo usage: ${ZMORE_PROGRAM_NAME-zmore} files...
-     else
--	gzip -cdfq | eval ${PAGER-more}
-+	gzip -cdfq | eval more
-     fi
- else
-     FIRST=1
-@@ -62,7 +62,7 @@
- 	fi
- 	if test "$ANS" != 's'; then
- 		echo "------> $FILE <------"
--		gzip -cdfq "$FILE" | eval ${PAGER-more}
-+		gzip -cdfq "$FILE" | more
- 	fi
- 	if test -t 1; then
- 		FIRST=0
---- gzip-1.3.5.orig/znew.in
-+++ gzip-1.3.5/znew.in
-@@ -16,8 +16,8 @@
- warn="(does not preserve modes and timestamp)"
- tmp=/tmp/zfoo.$$
- set -C
--echo hi > $tmp.1
--echo hi > $tmp.2
-+echo hi > $tmp.1 || exit 1
-+echo hi > $tmp.2 || exit 1
- if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
-   cpmod=${CPMOD-cpmod}
-   warn=""
diff --git a/app-arch/gzip/files/gzip-1.3.5-gunzip-dir.patch b/app-arch/gzip/files/gzip-1.3.5-gunzip-dir.patch
deleted file mode 100644
index ed689e27738d..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-gunzip-dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix a bug reported by Ulf Harnhammar (patch by him too):
-gzip: dir traversal bug when using "gunzip -N"
-
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=305255
-http://bugs.gentoo.org/show_bug.cgi?id=89946
-
---- gzip-1.3.5/gzip.c
-+++ gzip-1.3.5/gzip.c
-@@ -1344,6 +1344,8 @@
- 			error("corrupted input -- file name too large");
- 		    }
- 		}
-+		{ char *base2 = base_name (base);   /* strip any paths that may exists */
-+		strcpy(base, base2); }              /* in the output name */
-                 /* If necessary, adapt the name to local OS conventions: */
-                 if (!list) {
-                    MAKE_LEGAL_NAME(base);
diff --git a/app-arch/gzip/files/gzip-1.3.5-gzip-perm.patch b/app-arch/gzip/files/gzip-1.3.5-gzip-perm.patch
deleted file mode 100644
index 1ee4aee55e5e..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-gzip-perm.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Ripped from Fedora.
-
-Get rid of a possible race condition:
- - close output file
-  - bad man plays with output file
- - try to chmod output file
-Run the chmod on the file descriptor before we close it instead.
-
---- gzip-1.3.5/gzip.c
-+++ gzip-1.3.5/gzip.c
-@@ -881,6 +881,20 @@
-     }
- 
-     close(ifd);
-+    /* ofd ownership and permissions have to be set before close(ofd)*/
-+    if (!to_stdout) {
-+        if (fchmod(ofd, istat.st_mode & 07777)) {
-+            int e = errno;
-+	    WARN((stderr, "%s: ", progname));
-+            if (!quiet) {
-+	        errno = e;
-+	        perror(ofname);
-+	    }
-+        } 						             
-+#ifndef NO_CHOWN
-+        fchown(ofd, istat.st_uid, istat.st_gid);  /* Copy ownership */
-+#endif
-+    }
-     if (!to_stdout && close(ofd)) {
- 	write_error();
-     }
-@@ -902,7 +916,7 @@
- 	}
- 	fprintf(stderr, "\n");
-     }
--    /* Copy modes, times, ownership, and remove the input file */
-+    /* Copy times and remove the input file */
-     if (!to_stdout) {
- 	copy_stat(&istat);
-     }
-@@ -1715,7 +1729,7 @@
- 
- 
- /* ========================================================================
-- * Copy modes, times, ownership from input file to output file.
-+ * Copy times from input file to output file.
-  * IN assertion: to_stdout is false.
-  */
- local void copy_stat(ifstat)
-@@ -1730,18 +1744,6 @@
-     }
-     reset_times(ofname, ifstat);
- #endif
--    /* Copy the protection modes */
--    if (chmod(ofname, ifstat->st_mode & 07777)) {
--	int e = errno;
--	WARN((stderr, "%s: ", progname));
--	if (!quiet) {
--	    errno = e;
--	    perror(ofname);
--	}
--    }
--#ifndef NO_CHOWN
--    chown(ofname, ifstat->st_uid, ifstat->st_gid);  /* Copy ownership */
--#endif
-     remove_ofname = 0;
-     /* It's now safe to remove the input file: */
-     if (xunlink (ifname)) {
diff --git a/app-arch/gzip/files/gzip-1.3.5-huft-build-return-fix.patch b/app-arch/gzip/files/gzip-1.3.5-huft-build-return-fix.patch
deleted file mode 100644
index 2558634de1d9..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-huft-build-return-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-The huft_build() function should return 2 if the input is invalid (such 
-as all zero length codes) and 0 if the input is valid.  The zero length 
-code check incorrectly returns 0 however causing gzip to segv on some 
-invalid input cases.
-
-Discovered & fixed by Tavis Ormandy.
-
-http://bugs.gentoo.org/94584
-
---- inflate.c
-+++ inflate.c
-@@ -336,9 +336,9 @@ int huft_build(b, n, s, d, e, t, m)
-   if (c[0] == n)                /* null input--all zero length codes */
-   {
-     *t = (struct huft *)NULL;
-     *m = 0;
--    return 0;
-+    return 2;
-   }
- 
- 
-   /* Find minimum and maximum length, bound *m by those */
diff --git a/app-arch/gzip/files/gzip-1.3.5-infodir.patch b/app-arch/gzip/files/gzip-1.3.5-infodir.patch
deleted file mode 100644
index bbe3c0dd9b5d..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-infodir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Taken from Debian.
-
---- gzip-1.3.5/gzip.texi
-+++ gzip-1.3.5/gzip.texi
-@@ -6,7 +6,14 @@
- @finalout
- @setchapternewpage odd
- @c %**end of header
-+@dircategory Utilities
-+@direntry
-+* gzip: (gzip). 	The gzip command for compressing files.
-+@end direntry
-+
- @copying
-+This file documents the GNU `gzip' command for compressing files.
-+
- This manual is for Gzip
- (version @value{VERSION}, @value{UPDATED}),
- and documents commands for compressing and decompressing data.
-@@ -31,18 +38,6 @@
- @end quotation
- @end copying
- 
--@c Debian install-info (up through at least version 1.9.20) uses only the
--@c first dircategory.  Put this one first, as it is more useful in practice.
--@dircategory Individual utilities
--@direntry
--* gzip: (gzip)Invoking gzip.                    Compress files.
--@end direntry
--
--@dircategory Utilities
--@direntry
--* Gzip: (gzip).                 The gzip command for compressing files.
--@end direntry
--
- @titlepage
- @title gzip
- @subtitle The data compression program
diff --git a/app-arch/gzip/files/gzip-1.3.5-rsync.patch b/app-arch/gzip/files/gzip-1.3.5-rsync.patch
deleted file mode 100644
index 13ba54ef7971..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-rsync.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-Patch by Rusty Russell that adds --rsyncable option to gzip.
-
-Debian & Fedora use this, so let's join the party :p.
-
---- gzip-1.3.2/deflate.c
-+++ gzip-1.3.2/deflate.c
-@@ -122,6 +122,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
- 
-+#ifndef RSYNC_WIN
-+#  define RSYNC_WIN 4096
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
-  * Local data used by the "longest match" routines.
-  */
-@@ -203,6 +211,8 @@
- unsigned near good_match;
- /* Use a faster search when the previous match is longer than this */
- 
-+local ulg rsync_sum;  /* rolling sum of rsync window */
-+local ulg rsync_chunk_end; /* next rsync sequence point */
- 
- /* Values for max_lazy_match, good_match and max_chain_length, depending on
-  * the desired pack level (0..9). The values given below have been tuned to
-@@ -301,6 +311,10 @@
- #endif
-     /* prev will be initialized on the fly */
- 
-+    /* rsync params */
-+    rsync_chunk_end = 0xFFFFFFFFUL;
-+    rsync_sum = 0;
-+
-     /* Set the default configuration parameters:
-      */
-     max_lazy_match   = configuration_table[pack_level].max_lazy;
-@@ -537,6 +551,8 @@
-         memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
-         match_start -= WSIZE;
-         strstart    -= WSIZE; /* we now have strstart >= MAX_DIST: */
-+	if (rsync_chunk_end != 0xFFFFFFFFUL)
-+	    rsync_chunk_end -= WSIZE;
- 
-         block_start -= (long) WSIZE;
- 
-@@ -564,13 +580,46 @@
-     }
- }
- 
-+local void rsync_roll(start, num)
-+    unsigned start;
-+    unsigned num;
-+{
-+    unsigned i;
-+
-+    if (start < RSYNC_WIN) {
-+	/* before window fills. */
-+	for (i = start; i < RSYNC_WIN; i++) {
-+	    if (i == start + num) return;
-+	    rsync_sum += (ulg)window[i];
-+	}
-+	num -= (RSYNC_WIN - start);
-+	start = RSYNC_WIN;
-+    }
-+
-+    /* buffer after window full */
-+    for (i = start; i < start+num; i++) {
-+	/* New character in */
-+	rsync_sum += (ulg)window[i];
-+	/* Old character out */
-+	rsync_sum -= (ulg)window[i - RSYNC_WIN];
-+	if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
-+	    rsync_chunk_end = i;
-+    }
-+}
-+
-+/* ===========================================================================
-+ * Set rsync_chunk_end if window sum matches magic value.
-+ */
-+#define RSYNC_ROLL(s, n) \
-+   do { if (rsync) rsync_roll((s), (n)); } while(0)
-+
- /* ===========================================================================
-  * Flush the current block, with given end-of-file flag.
-  * IN assertion: strstart is set to the end of the current match.
-  */
- #define FLUSH_BLOCK(eof) \
-    flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
--                (char*)NULL, (long)strstart - block_start, (eof))
-+                (char*)NULL, (long)strstart - block_start, flush-1, (eof))
- 
- /* ===========================================================================
-  * Processes a new input file and return its compressed length. This
-@@ -581,7 +630,7 @@
- local off_t deflate_fast()
- {
-     IPos hash_head; /* head of the hash chain */
--    int flush;      /* set if current block must be flushed */
-+    int flush;      /* set if current block must be flushed, 2=>and padded  */
-     unsigned match_length = 0;  /* length of best match */
- 
-     prev_length = MIN_MATCH-1;
-@@ -610,6 +659,7 @@
- 
-             lookahead -= match_length;
- 
-+	    RSYNC_ROLL(strstart, match_length);
- 	    /* Insert new strings in the hash table only if the match length
-              * is not too large. This saves time but degrades compression.
-              */
-@@ -638,9 +688,14 @@
-             /* No match, output a literal byte */
-             Tracevv((stderr,"%c",window[strstart]));
-             flush = ct_tally (0, window[strstart]);
-+	    RSYNC_ROLL(strstart, 1);
-             lookahead--;
- 	    strstart++; 
-         }
-+	if (rsync && strstart > rsync_chunk_end) {
-+	    rsync_chunk_end = 0xFFFFFFFFUL;
-+	    flush = 2;
-+	} 
-         if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-         /* Make sure that we always have enough lookahead, except
-@@ -713,6 +768,7 @@
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+	    RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -725,24 +781,39 @@
-             match_available = 0;
-             match_length = MIN_MATCH-1;
-             strstart++;
--            if (flush) FLUSH_BLOCK(0), block_start = strstart;
- 
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+	    }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-         } else if (match_available) {
-             /* If there was no match at the previous position, output a
-              * single literal. If there was a match but the current match
-              * is longer, truncate the previous match to a single literal.
-              */
-             Tracevv((stderr,"%c",window[strstart-1]));
--            if (ct_tally (0, window[strstart-1])) {
--                FLUSH_BLOCK(0), block_start = strstart;
--            }
-+	    flush = ct_tally (0, window[strstart-1]);
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+	    }
-+            if (flush) FLUSH_BLOCK(0), block_start = strstart;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         } else {
-             /* There is no previous match to compare with, wait for
-              * the next step to decide.
-              */
-+	    if (rsync && strstart > rsync_chunk_end) {
-+		/* Reset huffman tree */
-+		rsync_chunk_end = 0xFFFFFFFFUL;
-+		flush = 2;
-+		FLUSH_BLOCK(0), block_start = strstart;
-+	    }
-             match_available = 1;
-+	    RSYNC_ROLL(strstart, 1);
-             strstart++;
-             lookahead--;
-         }
---- gzip-1.3.2/gzip.c
-+++ gzip-1.3.2/gzip.c
-@@ -249,6 +249,7 @@
- unsigned insize;           /* valid bytes in inbuf */
- unsigned inptr;            /* index of next byte to be processed in inbuf */
- unsigned outcnt;           /* bytes in output buffer */
-+int rsync = 0;             /* make ryncable chunks */
- 
- struct option longopts[] =
- {
-@@ -278,6 +279,7 @@
-     {"best",       0, 0, '9'}, /* compress better */
-     {"lzw",        0, 0, 'Z'}, /* make output compatible with old compress */
-     {"bits",       1, 0, 'b'}, /* max number of bits per code (implies -Z) */
-+    {"rsyncable",  0, 0, 'R'}, /* make rsync-friendly archive */
-     { 0, 0, 0, 0 }
- };
- 
-@@ -368,6 +370,7 @@
-  " -Z --lzw         produce output compatible with old compress",
-  " -b --bits maxbits   max number of bits per code (implies -Z)",
- #endif
-+ "    --rsyncable   Make rsync-friendly archive",
-  " file...          files to (de)compress. If none given, use standard input.",
-  "Report bugs to <bug-gzip@gnu.org>.",
-   0};
-@@ -546,6 +549,9 @@
- #else
- 	    recursive = 1; break;
- #endif
-+	case 'R':
-+	    rsync = 1; break;
-+
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
---- gzip-1.3.2/gzip.h
-+++ gzip-1.3.2/gzip.h
-@@ -133,6 +133,7 @@
- extern unsigned insize; /* valid bytes in inbuf */
- extern unsigned inptr;  /* index of next byte to be processed in inbuf */
- extern unsigned outcnt; /* bytes in output buffer */
-+extern int rsync;  /* deflate into rsyncable chunks */
- 
- extern off_t bytes_in;   /* number of input bytes */
- extern off_t bytes_out;  /* number of output bytes */
-@@ -281,7 +282,7 @@
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--off_t flush_block OF((char *buf, ulg stored_len, int eof));
-+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof));
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
---- gzip-1.3.2/gzip.texi
-+++ gzip-1.3.2/gzip.texi
-@@ -340,6 +340,14 @@
- into the directory and compress all the files it finds there (or
- decompress them in the case of @code{gunzip}).
- 
-+@item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input.  This reduces compression by about 1 percent most cases, but
-+means that the @code{rsync} program can take advantage of similarities
-+in the uncompressed input when syncronizing two files compressed with
-+this flag.  @code{gunzip} cannot tell the difference between a
-+compressed file created with this option, and one created without it.
-+
- @item --suffix @var{suf}
- @itemx -S @var{suf}
- Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
---- gzip-1.3.2/trees.c
-+++ gzip-1.3.2/trees.c
-@@ -847,9 +847,10 @@
-  * trees or store, and output the encoded block to the zip file. This function
-  * returns the total compressed length for the file so far.
-  */
--off_t flush_block(buf, stored_len, eof)
-+off_t flush_block(buf, stored_len, pad, eof)
-     char *buf;        /* input block, or NULL if too old */
-     ulg stored_len;   /* length of input block */
-+    int pad;          /* pad output to byte boundary */
-     int eof;          /* true if this is the last block for a file */
- {
-     ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -941,6 +942,10 @@
-         Assert (input_len == bytes_in, "bad input size");
-         bi_windup();
-         compressed_len += 7;  /* align on byte boundary */
-+    } else if (pad && (compressed_len % 8) != 0) {
-+        send_bits((STORED_BLOCK<<1)+eof, 3);  /* send block type */
-+        compressed_len = (compressed_len + 3 + 7) & ~7L;
-+        copy_block(buf, 0, 1); /* with header */
-     }
- 
-     return compressed_len >> 3;
---- gzip-1.3.5/gzip.1
-+++ gzip-1.3.5/gzip.1
-@@ -290,6 +290,15 @@
- .I gunzip
- ).
- .TP
-+.B --rsyncable
-+While compressing, synchronize the output occasionally based on the input.
-+This increases size by less than 1 percent most cases, but means that the
-+.BR rsync (1)
-+program can much more efficiently syncronize files compressed with this flag.
-+.I gunzip
-+cannot tell the difference between a compressed file created with this option,
-+and one created without it.
-+.TP
- .B \-S .suf   --suffix .suf
- Use suffix .suf instead of .gz. Any suffix can be given, but suffixes
- other than .z and .gz should be avoided to avoid confusion when files
diff --git a/app-arch/gzip/files/gzip-1.3.5-zgrep-sed.patch b/app-arch/gzip/files/gzip-1.3.5-zgrep-sed.patch
deleted file mode 100644
index 9681818ac539..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-zgrep-sed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Ripped from Fedora.
-
-http://bugs.gentoo.org/90626
-
---- zgrep.in
-+++ zgrep.in
-@@ -24,7 +24,7 @@
- 
- PATH="BINDIR:$PATH"; export PATH
- 
--prog=`echo $0 | sed 's|.*/||'`
-+prog=`echo "$0" | sed 's|.*/||'`
- case "$prog" in
- 	*egrep)	grep=${EGREP-egrep -a}	;;
- 	*fgrep)	grep=${FGREP-fgrep -a}	;;
-@@ -112,12 +112,15 @@
-   fi
-   $uncompress -cdfq "$i" |
-     if test $files_with_matches -eq 1; then
--      $grep $opt "$pat" > /dev/null && echo $i
-+      $grep $opt "$pat" > /dev/null && printf "%s\n" "$i"
-     elif test $files_without_matches -eq 1; then
--      $grep $opt "$pat" > /dev/null || echo $i
-+      $grep $opt "$pat" > /dev/null || printf "%s\n" "$i"
-     elif test $with_filename -eq 0 && { test $# -eq 1 || test $no_filename -eq 1; }; then
-       $grep $opt "$pat"
-     else
-+      i=${i//\\/\\\\}
-+      i=${i//|/\\|}
-+      i=${i//&/\\&}
-       if test $with_filename -eq 1; then
- 	sed_script="s|^[^:]*:|${i}:|"
-       else
diff --git a/app-arch/gzip/files/gzip-1.3.5-zgreppipe.patch b/app-arch/gzip/files/gzip-1.3.5-zgreppipe.patch
deleted file mode 100644
index c20403983ba9..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-zgreppipe.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Ripped from Fedora
-
---- gzip-1.3.1/zgrep.in
-+++ gzip-1.3.1/zgrep.in
-@@ -92,6 +92,7 @@
- fi
- 
- res=0
-+trap break SIGPIPE
- for i do
-   gzip -cdfq "$i" |
-     if test $files_with_matches -eq 1; then
-@@ -110,5 +111,8 @@
-     fi
-   r=$?
-   test $res -lt $r && res=$r
-+  # SIGPIPE + 128
-+  test "$r" -eq 141 && exit $res
- done
-+trap - SIGPIPE
- exit $res
diff --git a/app-arch/gzip/files/gzip-1.3.5-znew-tempfile-2.patch b/app-arch/gzip/files/gzip-1.3.5-znew-tempfile-2.patch
deleted file mode 100644
index 334e6a134d3e..000000000000
--- a/app-arch/gzip/files/gzip-1.3.5-znew-tempfile-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- znew.in.orig	2004-12-12 23:22:11.668680240 -0500
-+++ znew.in	2004-12-12 23:23:48.827909792 -0500
-@@ -14,7 +14,7 @@
- # block is the disk block size (best guess, need not be exact)
- 
- warn="(does not preserve modes and timestamp)"
--tmp=/tmp/zfoo.$$
-+tmp=`mktemp /tmp/zfoo.XXXXXX`
- set -C
- echo hi > $tmp.1 || exit 1
- echo hi > $tmp.2 || exit 1
-@@ -77,6 +77,7 @@
- 
- for i do
-   n=`echo $i | sed 's/.Z$//'`
-+  ntmp=`mktemp $n.XXXXXX`
-   if test ! -f "$n.Z" ; then
-     echo $n.Z not found
-     res=1; continue
-@@ -92,7 +93,7 @@
-     fi
-   else
-     if test $check -eq 1; then
--      if cp -p "$n.Z" "$n.$$" 2> /dev/null || cp "$n.Z" "$n.$$"; then
-+      if cp -p "$n.Z" "$ntmp" 2> /dev/null || cp "$n.Z" "$ntmp"; then
- 	:
-       else
- 	echo cannot backup "$n.Z"
-@@ -102,7 +103,7 @@
-     if gzip -d "$n.Z"; then
-       :
-     else
--      test $check -eq 1 && mv "$n.$$" "$n.Z"
-+      test $check -eq 1 && mv "$ntmp" "$n.Z"
-       echo error while uncompressing $n.Z
-       res=1; continue
-     fi
-@@ -110,7 +111,7 @@
-       :
-     else
-       if test $check -eq 1; then
--	mv "$n.$$" "$n.Z" && rm -f "$n"
-+	mv "$ntmp" "$n.Z" && rm -f "$n"
-         echo error while recompressing $n
-       else
- 	# compress $n  (might be dangerous if disk full)
-@@ -125,7 +126,7 @@
-     if test $pipe -eq 1; then
-       rm -f "$n$ext"
-     elif test $check -eq 1; then
--      mv "$n.$$" "$n.Z" && rm -f "$n$ext"
-+      mv "$ntmp" "$n.Z" && rm -f "$n$ext"
-     else
-       gzip -d "$n$ext" && compress "$n" && rm -f "$n$ext"
-     fi
-@@ -133,9 +134,9 @@
- 
-   elif test $check -eq 1; then
-     if gzip -t "$n$ext" ; then
--      rm -f "$n.$$" "$n.Z"
-+      rm -f "$ntmp" "$n.Z"
-     else
--      test $pipe -eq 0 && mv "$n.$$" "$n.Z"
-+      test $pipe -eq 0 && mv "$ntmp" "$n.Z"
-       rm -f "$n$ext"
-       echo error while testing $n$ext, $n.Z unchanged
-       res=1; continue
-@@ -144,4 +145,5 @@
-     rm -f "$n.Z"
-   fi
- done
-+rm -f "$ntmp"
- exit $res
diff --git a/app-arch/gzip/gzip-1.3.10.ebuild b/app-arch/gzip/gzip-1.3.10.ebuild
deleted file mode 100644
index 3b9a33471413..000000000000
--- a/app-arch/gzip/gzip-1.3.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.10.ebuild,v 1.1 2006/12/31 11:17:56 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-SRC_URI="ftp://alpha.gnu.org/gnu/gzip/${P}.tar.gz
-	mirror://gnu/gzip/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static pic"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-}
-
-src_compile() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog NEWS README THANKS TODO
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${D}"/usr/bin/{gunzip,gzip,zcat} "${D}"/bin/ || die
-	dosym /bin/gunzip /usr/bin/gunzip || die
-}
diff --git a/app-arch/gzip/gzip-1.3.11.ebuild b/app-arch/gzip/gzip-1.3.11.ebuild
deleted file mode 100644
index 83dfe9d9ed14..000000000000
--- a/app-arch/gzip/gzip-1.3.11.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.11.ebuild,v 1.11 2007/05/18 20:53:52 ferdy Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-SRC_URI="ftp://alpha.gnu.org/gnu/gzip/${P}.tar.gz
-	mirror://gnu/gzip/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls static pic"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-}
-
-src_compile() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog NEWS README THANKS TODO
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${D}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${D}"/bin/ || die
-}
diff --git a/app-arch/gzip/gzip-1.3.5-r10.ebuild b/app-arch/gzip/gzip-1.3.5-r10.ebuild
deleted file mode 100644
index 9e727ab1f0f6..000000000000
--- a/app-arch/gzip/gzip-1.3.5-r10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.5-r10.ebuild,v 1.3 2006/11/11 09:36:40 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/gzip.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="nls build static pic"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-CVE-2006-4334-8.2.patch
-	epatch "${FILESDIR}"/${P}-debian.patch
-	epatch "${FILESDIR}"/${P}-znew-tempfile-2.patch
-	epatch "${FILESDIR}"/${P}-gunzip-dir.patch
-	epatch "${FILESDIR}"/${P}-asm-execstack.patch
-	epatch "${FILESDIR}"/${P}-gzip-perm.patch
-	epatch "${FILESDIR}"/${P}-infodir.patch
-	epatch "${FILESDIR}"/${P}-rsync.patch
-	epatch "${FILESDIR}"/${P}-zgrep-sed.patch
-	epatch "${FILESDIR}"/${P}-alpha.patch
-	epatch "${FILESDIR}"/${P}-zgreppipe.patch
-}
-
-src_compile() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf --exec-prefix=/ $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	make prefix=${D}/usr \
-		exec_prefix=${D}/ \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	cd ${D}/bin
-
-	for i in gzexe zforce zgrep zmore znew zcmp
-	do
-		sed -i -e "s:${D}::" ${i} || die
-		chmod 755 ${i}
-	done
-
-	# No need to waste space -- these guys should be links
-	# gzcat is equivilant to zcat, but historically zcat
-	# was a link to compress.
-	rm -f gunzip zcat zcmp zegrep zfgrep
-	dosym gzip /bin/gunzip
-	dosym gzip /bin/gzcat
-	dosym gzip /bin/zcat
-	dosym zdiff /bin/zcmp
-	dosym zgrep /bin/zegrep
-	dosym zgrep /bin/zfgrep
-
-	if ! use build
-	then
-		cd ${D}/usr/share/man/man1
-		rm -f gunzip.* zcmp.* zcat.*
-		ln -s gzip.1.gz gunzip.1.gz
-		ln -s zdiff.1.gz zcmp.1.gz
-		ln -s gzip.1.gz zcat.1.gz
-		ln -s gzip.1.gz gzcat.1.gz
-		cd ${S}
-		rm -rf ${D}/usr/man ${D}/usr/lib
-		dodoc ChangeLog NEWS README THANKS TODO
-		docinto txt
-		dodoc algorithm.doc gzip.doc
-	else
-		rm -rf ${D}/usr
-	fi
-}
diff --git a/app-arch/gzip/gzip-1.3.9.ebuild b/app-arch/gzip/gzip-1.3.9.ebuild
deleted file mode 100644
index 65fe9d3c5e3a..000000000000
--- a/app-arch/gzip/gzip-1.3.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/gzip/gzip-1.3.9.ebuild,v 1.1 2006/12/16 03:08:25 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="http://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.gz
-	mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="nls static pic"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PROVIDE="virtual/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${FILESDIR}"/${PN}-1.3.5-rsync.patch
-	epatch "${FILESDIR}"/${PN}-1.3.8-install-symlinks.patch
-}
-
-src_compile() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog NEWS README THANKS TODO
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${D}"/usr/bin/{gunzip,gzip,zcat} "${D}"/bin/ || die
-	dosym /bin/gunzip /usr/bin/gunzip || die
-}