old

Package-Manager: portage-2.1.1_pre2-r8

12 files changed, 10 insertions, 829 deletions

diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index bcdf7dd98d75..1fec73025168 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,6 @@
-AUX 64bitnumfile.patch 340 RMD160 8a664f7b8a97852302bc341571446668ae16d966 SHA1 84ec9b3fc5d015869748b298d63f0c03cf74c33a SHA256 655d50ce49fefd24eb1fe1e940de0e9b1fe4de29468abfd373855eedbaedf7fa
-MD5 c40ec6dfabda5864b7f62fa57d2329bd files/64bitnumfile.patch 340
-RMD160 8a664f7b8a97852302bc341571446668ae16d966 files/64bitnumfile.patch 340
-SHA256 655d50ce49fefd24eb1fe1e940de0e9b1fe4de29468abfd373855eedbaedf7fa files/64bitnumfile.patch 340
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX filefuncs/Makefile 1212 RMD160 7b94f136f4a1e5cbfeade53c952c353378584c22 SHA1 e23965d28e8ae856b20211faedaca22cee613c11 SHA256 954bc6e837240b8d756cf6bd1460a24cae2a1cc5c738daf53746a0cff23791a1
 MD5 bcc8ea75aa8f87927bb5e498f4222d2e files/filefuncs/Makefile 1212
 RMD160 7b94f136f4a1e5cbfeade53c952c353378584c22 files/filefuncs/Makefile 1212
@@ -18,22 +17,6 @@ AUX gawk-3.1.3-getpgrp_void.patch 1225 RMD160 ea06ae87acd4d8df1a9a7c160c00b2d13d
 MD5 8a25d43ff539b0c949fc5bbce8488e06 files/gawk-3.1.3-getpgrp_void.patch 1225
 RMD160 ea06ae87acd4d8df1a9a7c160c00b2d13d3ab564 files/gawk-3.1.3-getpgrp_void.patch 1225
 SHA256 2e43682e4c86e6f50eeca42b3fc333c1c9c080838b29f3020c88f1d95dc02767 files/gawk-3.1.3-getpgrp_void.patch 1225
-AUX gawk-3.1.4-disable-DFA.patch 1837 RMD160 327f9fcec9a00a8d14cd897787e48a0fc1dd78db SHA1 7e3e1766fa8ccff63b917222088c5dfdf679a0e2 SHA256 fbd75950d40a2d02700d36ea584133df3f9051b6dd8645420c1493f2c16ee967
-MD5 3cca4692ffa1c396bff698d02f1a41e0 files/gawk-3.1.4-disable-DFA.patch 1837
-RMD160 327f9fcec9a00a8d14cd897787e48a0fc1dd78db files/gawk-3.1.4-disable-DFA.patch 1837
-SHA256 fbd75950d40a2d02700d36ea584133df3f9051b6dd8645420c1493f2c16ee967 files/gawk-3.1.4-disable-DFA.patch 1837
-AUX gawk-3.1.4-flonum.patch 3341 RMD160 0deb7fd892ab4e5ff318a017727f5424d477f1d6 SHA1 257c5e0e1393bcab55732f1722476829e9d188ba SHA256 da3464cffbfb688c0719172737e6f5f8c4b2e47e19bf83e5ef2e1a586d512ed3
-MD5 6778659e2892fddf115cee2c244e60a8 files/gawk-3.1.4-flonum.patch 3341
-RMD160 0deb7fd892ab4e5ff318a017727f5424d477f1d6 files/gawk-3.1.4-flonum.patch 3341
-SHA256 da3464cffbfb688c0719172737e6f5f8c4b2e47e19bf83e5ef2e1a586d512ed3 files/gawk-3.1.4-flonum.patch 3341
-AUX gawk-3.1.4-nextc.patch 716 RMD160 e2251ab1467c1f474aaa4cff5f538003cbe78619 SHA1 dd1bfa4daf762cc4d03b136aead28243a389c199 SHA256 f12a56397330a6abe4c60cb56365d572c3e1f8a1c49e095e4325eedc749150e0
-MD5 334e1cf92033c20c5e401f5ae5f498cc files/gawk-3.1.4-nextc.patch 716
-RMD160 e2251ab1467c1f474aaa4cff5f538003cbe78619 files/gawk-3.1.4-nextc.patch 716
-SHA256 f12a56397330a6abe4c60cb56365d572c3e1f8a1c49e095e4325eedc749150e0 files/gawk-3.1.4-nextc.patch 716
-AUX gawk-3.1.4-uplow.patch 5636 RMD160 623c4c86ceb45cf7e021ee88b3559cbebe37a433 SHA1 bd1a728681825f5648011ec605d785eba2e2dec3 SHA256 92a026f634f54a844536c527addc23bce45efeeb4ce7e6748bd1dc827e953cf8
-MD5 513af85f3e12197f97b42c3fee7c491c files/gawk-3.1.4-uplow.patch 5636
-RMD160 623c4c86ceb45cf7e021ee88b3559cbebe37a433 files/gawk-3.1.4-uplow.patch 5636
-SHA256 92a026f634f54a844536c527addc23bce45efeeb4ce7e6748bd1dc827e953cf8 files/gawk-3.1.4-uplow.patch 5636
 AUX gawk-3.1.5-binmode.patch 694 RMD160 da518848ea916a6f39a33fa1cc00ae11c185fb3f SHA1 7eec7cf07bcb0b1c4be1ca32ae54d5f381e8048f SHA256 e4dae2f48d444ce628aed9280840d8e92dec45f10ca99daf8eab3a7c2321612d
 MD5 289bd104c6e8f65d6385ae1987b394f3 files/gawk-3.1.5-binmode.patch 694
 RMD160 da518848ea916a6f39a33fa1cc00ae11c185fb3f files/gawk-3.1.5-binmode.patch 694
@@ -54,26 +37,11 @@ AUX gawk-3.1.5-num2str.patch 1319 RMD160 869a086ff89e25adfbf56e68de5df9d3aae7f61
 MD5 4d820de101fcc80c3041506c5635227c files/gawk-3.1.5-num2str.patch 1319
 RMD160 869a086ff89e25adfbf56e68de5df9d3aae7f61f files/gawk-3.1.5-num2str.patch 1319
 SHA256 2cadd540e4d3a5afc63fcaca3d797df18a668ff91c5a1f94fa4a2b4cb1600762 files/gawk-3.1.5-num2str.patch 1319
-DIST gawk-3.1.3.tar.gz 2078246 RMD160 19f037bb7b2edb39138761d5e996f605c61c3dad SHA1 0900eab07506ecff1ce52756e687a810149bb296 SHA256 35b974e959ae640b44e7bbf3d023968ec59b3978abdc1830c3aaa471d9862c5b
-DIST gawk-3.1.4.tar.gz 2260582 RMD160 3b301795a33ad12d22429e1418002a4c92fa0a1a SHA1 f9bedbff008bdaf1196586670ad2b68480fae14f SHA256 5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f
 DIST gawk-3.1.5.tar.gz 2310919 RMD160 8d875f4ea9e9ef5c932468cf43c691f6e082b197 SHA1 6cb385b4bc33780a5a4288b787523cbd4a30a900 SHA256 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8
-DIST patch_3.1.4__xml_20040920 79433
-EBUILD gawk-3.1.3-r2.ebuild 2764 RMD160 c4d3aeb0e1215cf8d70cea91adfab727f98ec4a9 SHA1 37375a03391b0048d1ed0bf842356b0c43ecd9c2 SHA256 b7943e60e2abb13c5078197e51443f744904d2c63622929f9e78b5d2f4233482
-MD5 e0f9b7570483cbca8caa3706b334416c gawk-3.1.3-r2.ebuild 2764
-RMD160 c4d3aeb0e1215cf8d70cea91adfab727f98ec4a9 gawk-3.1.3-r2.ebuild 2764
-SHA256 b7943e60e2abb13c5078197e51443f744904d2c63622929f9e78b5d2f4233482 gawk-3.1.3-r2.ebuild 2764
-EBUILD gawk-3.1.4-r4.ebuild 3856 RMD160 67025a744155d92ff6f3509d2ec2e3debc788931 SHA1 3dc396188069e3311a35bb3b54eaa16dab77cbf4 SHA256 8c00d64de905e8849a3075a0f5b6b3d187a1debfabebb584c0f458a2e7f27c74
-MD5 09fbc4e3606506a36a62d00e0a4a4dea gawk-3.1.4-r4.ebuild 3856
-RMD160 67025a744155d92ff6f3509d2ec2e3debc788931 gawk-3.1.4-r4.ebuild 3856
-SHA256 8c00d64de905e8849a3075a0f5b6b3d187a1debfabebb584c0f458a2e7f27c74 gawk-3.1.4-r4.ebuild 3856
 EBUILD gawk-3.1.5-r1.ebuild 3253 RMD160 a1043853c48bedb1a008e77ed0fb4bfce65406e2 SHA1 995b102a1788399a625c8f3eb663bb9ce27c9a80 SHA256 7c70fa7930ccff31446ca4b7f0799cfb71bb4b29e3fd3a38649e83bafe7423aa
 MD5 1c4c6c0c0baee356f75608137a60b8e0 gawk-3.1.5-r1.ebuild 3253
 RMD160 a1043853c48bedb1a008e77ed0fb4bfce65406e2 gawk-3.1.5-r1.ebuild 3253
 SHA256 7c70fa7930ccff31446ca4b7f0799cfb71bb4b29e3fd3a38649e83bafe7423aa gawk-3.1.5-r1.ebuild 3253
-EBUILD gawk-3.1.5.ebuild 3101 RMD160 ef53669f26cc8c5ee79f253eb84c344b95ed7972 SHA1 11926d1be607daead3bc44f3cdf82dcec79119c2 SHA256 4e3e000902e32afb1e5ea0a126d8b8f4821f4ecab449791ced7d8c2bf7186390
-MD5 20bc8c2ff1c75817ddd31c773fb68a99 gawk-3.1.5.ebuild 3101
-RMD160 ef53669f26cc8c5ee79f253eb84c344b95ed7972 gawk-3.1.5.ebuild 3101
-SHA256 4e3e000902e32afb1e5ea0a126d8b8f4821f4ecab449791ced7d8c2bf7186390 gawk-3.1.5.ebuild 3101
 MISC ChangeLog 12713 RMD160 c7d5a30201c18426b02a540bb93ea81978aa90d0 SHA1 6b5d4d3b8b3f30eb0006a94e662b2fc49dda6ed7 SHA256 83952ec477c8b958fbc7bcb23e40b78ae6f5644d56a1a7ca417cecbf75fc66bc
 MD5 8413a9886c2fe9d489d4a576a27ce3ff ChangeLog 12713
 RMD160 c7d5a30201c18426b02a540bb93ea81978aa90d0 ChangeLog 12713
@@ -82,15 +50,13 @@ MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164
-MD5 ab3d38b15ec7de784a39df947d68112c files/digest-gawk-3.1.3-r2 235
-RMD160 efcf05c8412d28258935689623d0165c3e81fb5d files/digest-gawk-3.1.3-r2 235
-SHA256 c5f5fc02bd451d9b9912bf9b8ffc32492f629af98990677550643d69a2d5f229 files/digest-gawk-3.1.3-r2 235
-MD5 0b780fb1ed7e01175925de8c46b5c345 files/digest-gawk-3.1.4-r4 304
-RMD160 f42402a7ae39ab1c6dd4faf660f21b55ffda07b0 files/digest-gawk-3.1.4-r4 304
-SHA256 f0232e96ce6052deaf46f98490cdb3e02b4aed51cb2e475954298e22e48a1024 files/digest-gawk-3.1.4-r4 304
-MD5 5717d8332bd2e98dbded1334cc76bee2 files/digest-gawk-3.1.5 235
-RMD160 3d116e6731687336128135022efa9fa0e506dbad files/digest-gawk-3.1.5 235
-SHA256 01e8243cf09dada7e4b9a224466042712149a3e32a8941dd0c2319064daf6e3b files/digest-gawk-3.1.5 235
 MD5 5717d8332bd2e98dbded1334cc76bee2 files/digest-gawk-3.1.5-r1 235
 RMD160 3d116e6731687336128135022efa9fa0e506dbad files/digest-gawk-3.1.5-r1 235
 SHA256 01e8243cf09dada7e4b9a224466042712149a3e32a8941dd0c2319064daf6e3b files/digest-gawk-3.1.5-r1 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEuy0famhnQswr0vIRAv8sAKCCrOQ/BJiZHKeBc8jXsmHuI43n/wCgpgGH
+S+RMeAl6yLRrILx2fv4fRyY=
+=vmja
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/64bitnumfile.patch b/sys-apps/gawk/files/64bitnumfile.patch
deleted file mode 100644
index 7afc9bffd873..000000000000
--- a/sys-apps/gawk/files/64bitnumfile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gawk-3.1.3/awkgram.y.orig	2004-04-26 02:14:03.126892264 -0500
-+++ gawk-3.1.3/awkgram.y	2004-04-26 02:14:47.071001704 -0500
-@@ -90,7 +90,7 @@
- extern char *source;
- extern int sourceline;
- extern struct src *srcfiles;
--extern int numfiles;
-+extern long numfiles;
- extern int errcount;
- extern NODE *begin_block;
- extern NODE *end_block;
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.3-r2 b/sys-apps/gawk/files/digest-gawk-3.1.3-r2
deleted file mode 100644
index 98d47059a75e..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b637b454005f9e72a9a8eecfacd07ca0 gawk-3.1.3.tar.gz 2078246
-RMD160 19f037bb7b2edb39138761d5e996f605c61c3dad gawk-3.1.3.tar.gz 2078246
-SHA256 35b974e959ae640b44e7bbf3d023968ec59b3978abdc1830c3aaa471d9862c5b gawk-3.1.3.tar.gz 2078246
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.4-r4 b/sys-apps/gawk/files/digest-gawk-3.1.4-r4
deleted file mode 100644
index c3372dbb82fd..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.4-r4
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3c8935efb9fdc7202720894279ad04a7 gawk-3.1.4.tar.gz 2260582
-RMD160 3b301795a33ad12d22429e1418002a4c92fa0a1a gawk-3.1.4.tar.gz 2260582
-SHA256 5cdfe0c0919895e2ec87773c583cc6ebf2b84cba7617d5ec6cfd0150749e190f gawk-3.1.4.tar.gz 2260582
-MD5 828fbed5314eab4dd0f75ce32dc28bda patch_3.1.4__xml_20040920 79433
diff --git a/sys-apps/gawk/files/digest-gawk-3.1.5 b/sys-apps/gawk/files/digest-gawk-3.1.5
deleted file mode 100644
index 9ac602be41d5..000000000000
--- a/sys-apps/gawk/files/digest-gawk-3.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4760325489479cac17fe0114b8f62f30 gawk-3.1.5.tar.gz 2310919
-RMD160 8d875f4ea9e9ef5c932468cf43c691f6e082b197 gawk-3.1.5.tar.gz 2310919
-SHA256 463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8 gawk-3.1.5.tar.gz 2310919
diff --git a/sys-apps/gawk/files/gawk-3.1.4-disable-DFA.patch b/sys-apps/gawk/files/gawk-3.1.4-disable-DFA.patch
deleted file mode 100644
index 54a58c84ba61..000000000000
--- a/sys-apps/gawk/files/gawk-3.1.4-disable-DFA.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-# Taken from Fedora SRPM gawk-3.1.4-4:
-#   http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/gawk-3.1.4-4.src.rpm
-#
-# * Tue Nov  9 2004 Karel Zak <kzak@redhat.com> 3.1.4-2
-# - add dfacache.patch for fix LC_ALL=de_DE.UTF-8 ./gawk '/^[ \t]/ { print }',
-#  (by Aharon Robbins), #135210, #131498
-	
---- gawk-3.1.4/dfa.c.dfacache	2004-11-09 14:42:53.594099744 +0100
-+++ gawk-3.1.4/dfa.c	2004-11-09 14:45:38.661005760 +0100
-@@ -2871,6 +2871,14 @@
-   if (MB_CUR_MAX > 1)
-     {
-       int remain_bytes, i;
-+#if 0
-+      /*
-+       * This caching can get things wrong:
-+
-+      printf "ab\n\tb\n" | LC_ALL=de_DE.UTF-8 ./gawk '/^[ \t]/ { print }'
-+
-+       * should print \tb but doesn't
-+       */
-       buf_begin -= buf_offset;
-       if (buf_begin <= (unsigned char const *)begin && (unsigned char const *) end <= buf_end) {
- 	buf_offset = (unsigned char const *)begin - buf_begin;
-@@ -2878,6 +2886,7 @@
- 	buf_end = end;
- 	goto go_fast;
-       }
-+#endif
- 
-       buf_offset = 0;
-       buf_begin = begin;
-@@ -2916,7 +2925,9 @@
-       mblen_buf[i] = 0;
-       inputwcs[i] = 0; /* sentinel */
-     }
-+#if 0
- go_fast:
-+#endif
- #endif /* MBS_SUPPORT */
- 
-   for (;;)
-@@ -2930,7 +2941,7 @@
-             s1 = s;
- 	    if (d->states[s].mbps.nelem != 0)
- 	      {
--		/* Can match with a multibyte character( and multi character
-+		/* Can match with a multibyte character (and multi character
- 		   collating element).  */
- 		unsigned char const *nextp;
- 
-@@ -3668,9 +3679,9 @@
-  done:
-   if (strlen(result))
-     {
--      dm = (struct dfamust *) malloc(sizeof (struct dfamust));
-+      MALLOC(dm, struct dfamust, 1);
-       dm->exact = exact;
--      dm->must = malloc(strlen(result) + 1);
-+      MALLOC(dm->must, char, strlen(result) + 1);
-       strcpy(dm->must, result);
-       dm->next = dfa->musts;
-       dfa->musts = dm;
diff --git a/sys-apps/gawk/files/gawk-3.1.4-flonum.patch b/sys-apps/gawk/files/gawk-3.1.4-flonum.patch
deleted file mode 100644
index 5ba45cdd05ad..000000000000
--- a/sys-apps/gawk/files/gawk-3.1.4-flonum.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Ripped from Fedora.
-
---- gawk-3.1.4/node.c.flonum	2004-07-28 15:45:04.000000000 +0200
-+++ gawk-3.1.4/node.c	2004-11-09 15:53:03.353119096 +0100
-@@ -91,7 +91,7 @@
- 
- 	if (do_non_decimal_data) {
- 		errno = 0;
--		if (! do_traditional && isnondecimal(cp)) {
-+		if (! do_traditional && isnondecimal(cp, TRUE)) {
- 			n->numbr = nondec2awknum(cp, cpend - cp);
- 			goto finish;
- 		}
-@@ -584,3 +584,38 @@
- 		return c;
- 	}
- }
-+
-+/* isnondecimal --- return true if number is not a decimal number */
-+
-+int
-+isnondecimal(const char *str, int use_locale)
-+{
-+	int dec_point = '.';
-+#if ENABLE_NLS && defined(HAVE_LOCALE_H)
-+	if (use_locale)
-+		dec_point = loc.decimal_point[0];	/* XXX --- assumes one char */
-+#endif
-+
-+	if (str[0] != '0')
-+		return FALSE;
-+
-+	/* leading 0x or 0X */
-+	if (str[1] == 'x' || str[1] == 'X')
-+		return TRUE;
-+
-+	/*
-+	 * Numbers with '.', 'e', or 'E' are decimal.
-+	 * Have to check so that things like 00.34 are handled right.
-+	 *
-+	 * These beasts can have trailing whitespace. Deal with that too.
-+	 */
-+	for (; *str != '\0'; str++) {
-+		if (*str == 'e' || *str == 'E' || *str == dec_point)
-+			return FALSE;
-+		else if (! ISDIGIT(*str))
-+			break;
-+	}
-+
-+	return TRUE;
-+}
-+
---- gawk-3.1.4/awkgram.y.flonum	2004-07-26 16:11:12.000000000 +0200
-+++ gawk-3.1.4/awkgram.y	2004-11-09 15:53:03.355118792 +0100
-@@ -2069,12 +2069,14 @@
- 			eof_warned = TRUE;
- 		}
- 		tokadd('\0');
--		if (! do_traditional && isnondecimal(tokstart)) {
--			static short warned = FALSE;
--			if (do_lint && ! warned) {
--				warned = TRUE;
--				lintwarn("numeric constant `%.*s' treated as octal or hexadecimal",
--					strlen(tokstart)-1, tokstart);
-+		if (! do_traditional && isnondecimal(tokstart, FALSE)) {
-+			if (do_lint) {
-+				if (ISDIGIT(tokstart[1]))       /* not an 'x' or 'X' */
-+					lintwarn("numeric constant `%.*s' treated as octal",
-+						strlen(tokstart)-1, tokstart);
-+				else if (tokstart[1] == 'x' || tokstart[1] == 'X')
-+					lintwarn("numeric constant `%.*s' treated as hexadecimal",
-+						strlen(tokstart)-1, tokstart);
- 			}
- 			yylval.nodeval = make_number(nondec2awknum(tokstart, strlen(tokstart)));
- 		} else
---- gawk-3.1.4/builtin.c.flonum	2004-07-13 09:55:28.000000000 +0200
-+++ gawk-3.1.4/builtin.c	2004-11-09 15:53:03.357118488 +0100
-@@ -2779,7 +2779,7 @@
- 
- 	if ((tmp->flags & (NUMBER|NUMCUR)) != 0)
- 		d = (double) force_number(tmp);
--	else if (isnondecimal(tmp->stptr))
-+	else if (isnondecimal(tmp->stptr, TRUE))
- 		d = nondec2awknum(tmp->stptr, tmp->stlen);
- 	else
- 		d = (double) force_number(tmp);
---- gawk-3.1.4/awk.h.flonum	2004-07-26 16:11:05.000000000 +0200
-+++ gawk-3.1.4/awk.h	2004-11-09 15:53:03.358118336 +0100
-@@ -742,8 +742,6 @@
- /* ------------------------- Pseudo-functions ------------------------- */
- 
- #define is_identchar(c)		(isalnum(c) || (c) == '_')
--#define isnondecimal(str)	(((str)[0]) == '0' && (ISDIGIT((str)[1]) \
--					|| (str)[1] == 'x' || (str)[1] == 'X'))
- 
- #define var_uninitialized(n)	((n)->var_value == Nnull_string)
- 
-@@ -1138,6 +1136,7 @@
- extern int avoid_dfa P((NODE *re, char *str, size_t len));	/* temporary */
- extern int reisstring P((const char *text, size_t len, Regexp *re, const char *buf));
- extern int remaybelong P((const char *text, size_t len));
-+extern int isnondecimal P((const char *str, int use_locale));
- 
- /* strncasecmp.c */
- #ifndef BROKEN_STRNCASECMP
diff --git a/sys-apps/gawk/files/gawk-3.1.4-nextc.patch b/sys-apps/gawk/files/gawk-3.1.4-nextc.patch
deleted file mode 100644
index bbed6591e24a..000000000000
--- a/sys-apps/gawk/files/gawk-3.1.4-nextc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Ripped from Fedora.
-
---- gawk-3.1.4/awkgram.y.nextc	2004-11-09 15:53:03.355118792 +0100
-+++ gawk-3.1.4/awkgram.y	2004-11-09 16:05:46.091165288 +0100
-@@ -1433,6 +1433,11 @@
- nextc(void)
- {
- 	if (gawk_mb_cur_max > 1)	{
-+		if (!lexptr || lexptr >= lexend)
-+			if (!get_src_buf()) {
-+				return EOF;
-+			}
-+
- 		/* Update the buffer index.  */
- 		cur_ring_idx = (cur_ring_idx == RING_BUFFER_SIZE - 1)? 0 :
- 			cur_ring_idx + 1;
-@@ -1444,11 +1449,6 @@
- 			mbstate_t tmp_state;
- 			size_t mbclen;
- 
--			if (!lexptr || lexptr >= lexend)
--				if (!get_src_buf()) {
--					return EOF;
--				}
--
- 			for (idx = 0 ; lexptr + idx < lexend ; idx++) {
- 				tmp_state = cur_mbstate;
- 				mbclen = mbrlen(lexptr, idx + 1, &tmp_state);
diff --git a/sys-apps/gawk/files/gawk-3.1.4-uplow.patch b/sys-apps/gawk/files/gawk-3.1.4-uplow.patch
deleted file mode 100644
index 2db5185595df..000000000000
--- a/sys-apps/gawk/files/gawk-3.1.4-uplow.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Ripped from Fedora.
-
---- gawk-3.1.4/builtin.c.uplow	2004-11-09 15:53:03.357118488 +0100
-+++ gawk-3.1.4/builtin.c	2004-11-09 15:55:25.455516248 +0100
-@@ -1652,51 +1652,116 @@
- 		fflush(rp->fp);
- }
- 
-+/* wide_tolower_toupper --- lower- or uppercase a multibute string */
-+
-+typedef int (*isw_func)(wint_t);
-+typedef wint_t (*tow_func)(wint_t);
-+
-+static NODE *
-+wide_tolower_toupper(NODE *t1, isw_func iswu, tow_func towl)
-+{
-+#ifdef MBS_SUPPORT
-+	register unsigned char *cp, *cpe;
-+	register unsigned char *cp2;
-+	size_t mbclen;
-+	mbstate_t mbs, prev_mbs;
-+	wchar_t wc;
-+	NODE *t2;
-+	/*
-+	 * Since the lowercase char and its uppercase equivalent may occupy
-+	 * different number of bytes (Turkish `i'), we cannot say the length
-+	 * of the output string.
-+	 * This approach is adapted from format_tree().
-+	 */
-+	unsigned char *obuf;
-+	size_t osiz, ofre;
-+
-+	/*
-+	 * Better 2 spare bytes than 1, consistently with make_str_node().
-+	 * And we need gawk_mb_cur_max free bytes before we convert the last
-+	 * char, so we add (gawk_mb_cur_max - 1).
-+	 */
-+	osiz = t1->stlen + 2 + (gawk_mb_cur_max - 1);
-+	ofre = osiz - 2;
-+	emalloc(obuf, char *, osiz, "wide_tolower_toupper");
-+
-+	memset(&mbs, 0, sizeof(mbstate_t));
-+	cp = (unsigned char *)t1->stptr;
-+	cpe = (unsigned char *)(t1->stptr + t1->stlen);
-+	cp2 = obuf;
-+	while (cp < cpe) {
-+		if (ofre < gawk_mb_cur_max) {
-+			size_t olen = cp2 - obuf;
-+			ofre += osiz;
-+			osiz *= 2;
-+			erealloc(obuf, char *, osiz, "wide_tolower_toupper");
-+			cp2 = obuf + olen;
-+		}
-+		prev_mbs = mbs;
-+		mbclen = (size_t) mbrtowc(&wc, (char *) cp, cpe - cp,
-+					  &mbs);
-+		if (mbclen == 0 || mbclen == (size_t) -1 || mbclen == (size_t) -2) {
-+			/* Null wide char, or a problem appeared. */
-+			*cp2++ = *cp++;
-+			ofre--;
-+			continue;
-+		}
-+			 
-+		/* If the character doesn't need change, copy it. */
-+		if (!(*iswu)(wc)) {
-+			ofre -= mbclen;
-+			while (mbclen--)
-+				*cp2++ = *cp++;
-+			continue;
-+		}
-+
-+		/* Increment the input pointer. */
-+		cp += mbclen;
-+
-+		/* Write the modified wide character. */
-+		mbclen = wcrtomb((char *) cp2, (*towl)(wc), &prev_mbs);
-+
-+		if (mbclen > 0 && mbclen < (size_t) -2) {
-+			/* Increment the output pointer. */
-+			cp2 += mbclen;
-+			ofre -= mbclen;
-+		} else {
-+			/* A problem appeared. */
-+			cp2++;
-+			ofre--;
-+		}
-+	}
-+	t2 = make_str_node(obuf, cp2 - obuf, ALREADY_MALLOCED);
-+	t2->flags |= TEMP;
-+	return t2;
-+#else
-+	cant_happen();
-+	return NULL;
-+#endif
-+}
-+
- /* do_tolower --- lower case a string */
- 
- NODE *
- do_tolower(NODE *tree)
- {
- 	NODE *t1, *t2;
--	register unsigned char *cp, *cp2;
--#ifdef MBS_SUPPORT
--	size_t mbclen = 0;
--	mbstate_t mbs, prev_mbs;
--	if (gawk_mb_cur_max > 1)
--		memset(&mbs, 0, sizeof(mbstate_t));
--#endif
- 
- 	t1 = tree_eval(tree->lnode);
- 	if (do_lint && (t1->flags & (STRING|STRCUR)) == 0)
- 		lintwarn(_("tolower: received non-string argument"));
- 	t1 = force_string(t1);
--	t2 = tmp_string(t1->stptr, t1->stlen);
--	for (cp = (unsigned char *)t2->stptr,
--	     cp2 = (unsigned char *)(t2->stptr + t2->stlen); cp < cp2; cp++)
--#ifdef MBS_SUPPORT
--		if (gawk_mb_cur_max > 1) {
--			wchar_t wc;
--			prev_mbs = mbs;
--			mbclen = (size_t) mbrtowc(&wc, (char *) cp, cp2 - cp,
--						  &mbs);
--			if ((mbclen != 1) && (mbclen != (size_t) -1) &&
--				(mbclen != (size_t) -2) && (mbclen != 0)) {
--				/* a multibyte character.  */
--				if (iswupper(wc)) {
--					wc = towlower(wc);
--					wcrtomb((char *) cp, wc, &prev_mbs);
--				}
--				/* Adjust the pointer.  */
--				cp += mbclen - 1;
--			} else {
--				/* Otherwise we treat it as a singlebyte character.  */
--				if (ISUPPER(*cp))
--					*cp = tolower(*cp);
--			}
--		} else
--#endif
--		if (ISUPPER(*cp))
--			*cp = TOLOWER(*cp);
-+
-+	if (gawk_mb_cur_max > 1)
-+		t2 = wide_tolower_toupper(t1, &iswupper, &towlower);
-+	else {
-+		register unsigned char *cp, *cpe;
-+		t2 = tmp_string(t1->stptr, t1->stlen);
-+		for (cp = (unsigned char *)t2->stptr,
-+		     cpe = (unsigned char *)(t2->stptr + t2->stlen); cp < cpe; cp++)
-+			if (ISUPPER(*cp))
-+				*cp = TOLOWER(*cp);
-+	}
- 	free_temp(t1);
- 	return t2;
- }
-@@ -1707,45 +1772,22 @@
- do_toupper(NODE *tree)
- {
- 	NODE *t1, *t2;
--	register unsigned char *cp, *cp2;
--#ifdef MBS_SUPPORT
--	size_t mbclen = 0;
--	mbstate_t mbs, prev_mbs;
--	if (gawk_mb_cur_max > 1)
--		memset(&mbs, 0, sizeof(mbstate_t));
--#endif
- 
- 	t1 = tree_eval(tree->lnode);
- 	if (do_lint && (t1->flags & (STRING|STRCUR)) == 0)
- 		lintwarn(_("toupper: received non-string argument"));
- 	t1 = force_string(t1);
--	t2 = tmp_string(t1->stptr, t1->stlen);
--	for (cp = (unsigned char *)t2->stptr,
--	     cp2 = (unsigned char *)(t2->stptr + t2->stlen); cp < cp2; cp++)
--#ifdef MBS_SUPPORT
--		if (gawk_mb_cur_max > 1) {
--			wchar_t wc;
--			prev_mbs = mbs;
--			mbclen = (size_t) mbrtowc(&wc, (char *) cp, cp2 - cp,
--						  &mbs);
--			if ((mbclen != 1) && (mbclen != (size_t) -1) &&
--				(mbclen != (size_t) -2) && (mbclen != 0)) {
--				/* a multibyte character.  */
--				if (iswlower(wc)) {
--					wc = towupper(wc);
--					wcrtomb((char *) cp, wc, &prev_mbs);
--				}
--				/* Adjust the pointer.  */
--				cp += mbclen - 1;
--			} else {
--				/* Otherwise we treat it as a singlebyte character.  */
--				if (ISLOWER(*cp))
--					*cp = toupper(*cp);
--			}
--		} else
--#endif
--		if (ISLOWER(*cp))
--			*cp = TOUPPER(*cp);
-+
-+	if (gawk_mb_cur_max > 1)
-+		t2 = wide_tolower_toupper(t1, &iswlower, &towupper);
-+	else {
-+		register unsigned char *cp, *cpe;
-+		t2 = tmp_string(t1->stptr, t1->stlen);
-+		for (cp = (unsigned char *)t2->stptr,
-+		     cpe = (unsigned char *)(t2->stptr + t2->stlen); cp < cpe; cp++)
-+			if (ISLOWER(*cp))
-+				*cp = TOUPPER(*cp);
-+	}
- 	free_temp(t1);
- 	return t2;
- }
diff --git a/sys-apps/gawk/gawk-3.1.3-r2.ebuild b/sys-apps/gawk/gawk-3.1.3-r2.ebuild
deleted file mode 100644
index f5e0e4045623..000000000000
--- a/sys-apps/gawk/gawk-3.1.3-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.3-r2.ebuild,v 1.6 2005/09/01 06:18:06 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-
-	# Copy filefuncs module's source over ...
-	cp -PR "${FILESDIR}/filefuncs" "${WORKDIR}" || die "cp failed"
-
-	cd ${S}
-	# support for dec compiler.
-	[ "${CC}" == "ccc" ] && epatch ${FILESDIR}/${PN}-3.1.2-dec-alpha-compiler.diff
-	epatch ${FILESDIR}/64bitnumfile.patch
-}
-
-src_compile() {
-	econf --bindir=/bin $(use_enable nls) || die
-	emake || die "emake failed"
-
-	cd ${WORKDIR}/filefuncs
-	emake AWKINCDIR=${S} CC=$(tc-getCC) || die "filefuncs emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	cd ${WORKDIR}/filefuncs
-	make \
-		DESTDIR=${D} \
-		AWKINCDIR=${S} \
-		LIBDIR="$(get_libdir)" \
-		install || die "filefuncs install failed"
-
-	dodir /usr/bin
-	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
-	# (p)gawk-${PV} ..  Also make sure that /bin/(p)gawk is a symlink
-	# to /bin/(p)gawk-${PV}.
-	local x=
-	for x in gawk pgawk igawk
-	do
-		local binpath="/bin"
-
-		case ${x} in
-		igawk|pgawk)
-				binpath="/usr/bin"
-				;;
-		esac
-
-		if [ -f "${D}/bin/${x}" -a ! -f "${D}/bin/${x}-${PV}" ]
-		then
-			mv -f ${D}/bin/${x} ${D}/${binpath}/${x}-${PV}
-		elif [ -f "${D}/bin/${x}-" -a ! -f "${D}/bin/${x}-${PV}" ]
-		then
-			mv -f ${D}/bin/${x}- ${D}/${binpath}/${x}-${PV}
-		elif [ "${binpath}" = "/usr/bin" -a -f "${D}/bin/${x}-${PV}" ]
-		then
-			mv -f ${D}/bin/${x}-${PV} ${D}/${binpath}/${x}-${PV}
-		fi
-
-		rm -f ${D}/bin/${x}
-		dosym ${x}-${PV} ${binpath}/${x}
-		[ "${binpath}" = "/usr/bin" ] && dosym /usr/bin/${x}-${PV} /bin/${x}
-	done
-
-	rm -f ${D}/bin/awk
-	dosym gawk-${PV} /bin/awk
-	# Compat symlinks
-	dodir /usr/bin
-	dosym /bin/gawk-${PV} /usr/bin/awk
-	dosym /bin/gawk-${PV} /usr/bin/gawk
-
-	# Install headers
-	insinto /usr/include/awk
-	for x in ${S}/*.h
-	do
-		# We do not want 'acconfig.h' in there ...
-		[ -f "${x}" -a "${x/acconfig\.h/}" = "${x}" ] && doins ${x}
-	done
-
-	if ! use build ; then
-		cd ${S}
-		dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -rf "${D}"/usr/share
-	fi
-}
diff --git a/sys-apps/gawk/gawk-3.1.4-r4.ebuild b/sys-apps/gawk/gawk-3.1.4-r4.ebuild
deleted file mode 100644
index a49c43611bce..000000000000
--- a/sys-apps/gawk/gawk-3.1.4-r4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.4-r4.ebuild,v 1.15 2005/10/03 12:03:16 hardave Exp $
-
-inherit eutils toolchain-funcs
-
-XML_PATCH=patch_3.1.4__xml_20040920
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.gz
-	xml? ( http://home1.vr-web.de/~Juergen.Kahrs/${XML_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls build xml"
-
-RDEPEND="xml? ( dev-libs/expat )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SXML=${WORKDIR}/xmlgawk
-SFFS=${WORKDIR}/filefuncs
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Copy filefuncs module's source over ...
-	cp -pPR "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-disable-DFA.patch #78227
-	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
-	epatch "${FILESDIR}"/${P}-nextc.patch #fedora
-	epatch "${FILESDIR}"/${P}-uplow.patch #fedora
-	# support for dec compiler.
-	[[ $(tc-getCC) == "ccc" ]] && epatch "${FILESDIR}"/${PN}-3.1.2-dec-alpha-compiler.diff
-
-	if use xml ; then
-		mkdir "${SXML}"
-		cp -pPR "${S}"/* "${SXML}"/
-		cd "${SXML}"
-		EPATCH_OPTS="-p2 -g0" epatch "${DISTDIR}"/${XML_PATCH} #57857
-	fi
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-flonum.patch #fedora
-}
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		$(use_enable nls) \
-		--enable-switch \
-		|| die
-	emake || die "emake failed"
-	if use xml ; then
-		cd "${SXML}"
-		econf $(use_enable nls) || die
-		emake || die "xmlgawk make failed"
-	fi
-
-	cd "${SFFS}"
-	emake AWKINCDIR="${S}" CC=$(tc-getCC) || die "filefuncs emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	if use xml ; then
-		newbin "${SXML}"/gawk xmlgawk || die "xmlgawk failed"
-		insinto /usr/include/awk
-		doins "${SXML}"/xml_puller.h || die "xml inc failed"
-	fi
-	if ! use userland_Darwin ; then
-		cd "${SFFS}"
-		make \
-			DESTDIR="${D}" \
-			AWKINCDIR="${S}" \
-			LIBDIR="$(get_libdir)" \
-			install \
-			|| die "filefuncs install failed"
-	fi
-
-	dodir /usr/bin
-	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
-	# (p)gawk-${PV} ...  Also make sure that /bin/(p)gawk is a symlink
-	# to /bin/(p)gawk-${PV}.
-	local binpath x
-	for x in gawk pgawk igawk ; do
-		[[ ${x} == "gawk" ]] \
-			&& binpath="/bin" \
-			|| binpath="/usr/bin"
-
-		if [[ -f ${D}/bin/${x} && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x} "${D}"/${binpath}/${x}-${PV}
-		elif [[ -f ${D}/bin/${x}- && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x}- "${D}"/${binpath}/${x}-${PV}
-		elif [[ ${binpath} == "/usr/bin" && -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x}-${PV} "${D}"/${binpath}/${x}-${PV}
-		fi
-
-		rm -f "${D}"/bin/${x}
-		dosym ${x}-${PV} ${binpath}/${x}
-		[[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x}
-	done
-
-	rm -f "${D}"/bin/awk
-	dodir /usr/bin
-	# Compat symlinks
-	dosym /bin/gawk-${PV} /usr/bin/gawk
-	dosym gawk-${PV} /bin/awk
-	dosym /bin/gawk-${PV} /usr/bin/awk
-	[[ ${USERLAND} != "GNU" ]] && rm -f "${D}"/{,usr/}bin/awk{,-${PV}}
-
-	# Install headers
-	insinto /usr/include/awk
-	doins "${S}"/*.h || die "ins headers failed"
-	# We do not want 'acconfig.h' in there ...
-	rm -f "${D}"/usr/include/awk/acconfig.h
-
-	if ! use build ; then
-		cd "${S}"
-		rm -f "${D}"/usr/share/man/man1/pgawk.1
-		dosym gawk.1.gz /usr/share/man/man1/pgawk.1.gz
-		[[ ${USERLAND} == "GNU" ]] && dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -r "${D}"/usr/share
-	fi
-}
diff --git a/sys-apps/gawk/gawk-3.1.5.ebuild b/sys-apps/gawk/gawk-3.1.5.ebuild
deleted file mode 100644
index e2dfb6d5ec5e..000000000000
--- a/sys-apps/gawk/gawk-3.1.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-3.1.5.ebuild,v 1.18 2006/04/11 05:11:50 vapier Exp $
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="http://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls build"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-SFFS=${WORKDIR}/filefuncs
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Copy filefuncs module's source over ...
-	cp -pPR "${FILESDIR}"/filefuncs "${SFFS}" || die "cp failed"
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-core.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${PN}-3.1.3-getpgrp_void.patch #fedora
-	# support for dec compiler.
-	[[ $(tc-getCC) == "ccc" ]] && epatch "${FILESDIR}"/${PN}-3.1.2-dec-alpha-compiler.diff
-}
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		--libexec='$(libdir)/misc' \
-		$(use_enable nls) \
-		--enable-switch \
-		|| die
-	emake || die "emake failed"
-
-	cd "${SFFS}"
-	emake CC=$(tc-getCC) || die "filefuncs emake failed"
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die "install failed"
-	cd "${SFFS}"
-	make LIBDIR="$(get_libdir)" install || die "filefuncs install failed"
-
-	dodir /usr/bin
-	# In some rare cases, (p)gawk gets installed as (p)gawk- and not
-	# (p)gawk-${PV} ...  Also make sure that /bin/(p)gawk is a symlink
-	# to /bin/(p)gawk-${PV}.
-	local binpath x
-	for x in gawk pgawk igawk ; do
-		[[ ${x} == "gawk" ]] \
-			&& binpath="/bin" \
-			|| binpath="/usr/bin"
-
-		if [[ -f ${D}/bin/${x} && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x} "${D}"/${binpath}/${x}-${PV}
-		elif [[ -f ${D}/bin/${x}- && ! -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x}- "${D}"/${binpath}/${x}-${PV}
-		elif [[ ${binpath} == "/usr/bin" && -f ${D}/bin/${x}-${PV} ]] ; then
-			mv -f "${D}"/bin/${x}-${PV} "${D}"/${binpath}/${x}-${PV}
-		fi
-
-		rm -f "${D}"/bin/${x}
-		dosym ${x}-${PV} ${binpath}/${x}
-		[[ ${binpath} == "/usr/bin" ]] && dosym /usr/bin/${x}-${PV} /bin/${x}
-	done
-
-	rm -f "${D}"/bin/awk
-	dodir /usr/bin
-	# Compat symlinks
-	dosym /bin/gawk-${PV} /usr/bin/gawk
-	dosym gawk-${PV} /bin/awk
-	dosym /bin/gawk-${PV} /usr/bin/awk
-	[[ ${USERLAND} != "GNU" ]] && rm -f "${D}"/{,usr/}bin/awk{,-${PV}}
-
-	# Install headers
-	insinto /usr/include/awk
-	doins "${S}"/*.h || die "ins headers failed"
-	# We do not want 'acconfig.h' in there ...
-	rm -f "${D}"/usr/include/awk/acconfig.h
-
-	if ! use build ; then
-		cd "${S}"
-		rm -f "${D}"/usr/share/man/man1/pgawk.1
-		dosym gawk.1.gz /usr/share/man/man1/pgawk.1.gz
-		[[ ${USERLAND} == "GNU" ]] && dosym gawk.1.gz /usr/share/man/man1/awk.1.gz
-		dodoc AUTHORS ChangeLog FUTURES LIMITATIONS NEWS PROBLEMS POSIX.STD README
-		docinto README_d
-		dodoc README_d/*
-		docinto awklib
-		dodoc awklib/ChangeLog
-		docinto pc
-		dodoc pc/ChangeLog
-		docinto posix
-		dodoc posix/ChangeLog
-	else
-		rm -r "${D}"/usr/share
-	fi
-}