Cleanup.

(Portage version: 2.1.2_rc4-r8)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 69 deletions

diff --git a/net-www/mod_pcgi2/Manifest b/net-www/mod_pcgi2/Manifest
index 1b5be1f0b8d7..7cd6aab44a7f 100644
--- a/net-www/mod_pcgi2/Manifest
+++ b/net-www/mod_pcgi2/Manifest
@@ -1,28 +1,20 @@
-AUX 2.0.2/20_mod_pcgi.conf 263 RMD160 d68b9c004b23cbda38bbfd30f38257ecc645aa47 SHA1 d1d115f115572c2f8ec8f16c8a9ba0bd3233b951 SHA256 3fd0be4bb8abe7ce11c64de556b7f788ce65e12e73f7177d84f5be65026147d5
-MD5 072e429c5e95032f2875f7428d811281 files/2.0.2/20_mod_pcgi.conf 263
-RMD160 d68b9c004b23cbda38bbfd30f38257ecc645aa47 files/2.0.2/20_mod_pcgi.conf 263
-SHA256 3fd0be4bb8abe7ce11c64de556b7f788ce65e12e73f7177d84f5be65026147d5 files/2.0.2/20_mod_pcgi.conf 263
-AUX 20_mod_pcgi.conf 271 RMD160 8c056bff15c5e2e9000b6144533c01985fdf6d28 SHA1 98f2f868f243070b4e0cf8d68bfca5d017b0c302 SHA256 4d3434b85102fb4816056761c5db346e55392a91dee0176498810a9475b24c31
-MD5 247a6f4e65181d477578aaf0d9f381fa files/20_mod_pcgi.conf 271
-RMD160 8c056bff15c5e2e9000b6144533c01985fdf6d28 files/20_mod_pcgi.conf 271
-SHA256 4d3434b85102fb4816056761c5db346e55392a91dee0176498810a9475b24c31 files/20_mod_pcgi.conf 271
-AUX mod_pcgi2-2.0.1-macrofix.patch 1328 RMD160 5f1f846509cb1454777be1722f7faf3fa55fcba9 SHA1 b7a01401f4beea3b154273393d2e90eb9b5ba12e SHA256 ba355262e48848dde636dcd7039e0faac072b58cf3d5a28dee5f1d10811f519e
-MD5 1a8eca96144ae6ea1ca0fb9b099c66e8 files/mod_pcgi2-2.0.1-macrofix.patch 1328
-RMD160 5f1f846509cb1454777be1722f7faf3fa55fcba9 files/mod_pcgi2-2.0.1-macrofix.patch 1328
-SHA256 ba355262e48848dde636dcd7039e0faac072b58cf3d5a28dee5f1d10811f519e files/mod_pcgi2-2.0.1-macrofix.patch 1328
-DIST mod_pcgi2-2.0.2-src.tar.gz 32214
-EBUILD mod_pcgi2-2.0.2.ebuild 937 RMD160 266728a44e888b0bf0a11e6cb5f832e3cd2c9139 SHA1 25321605a3a3e30685aa3a7e78c8696837655fdb SHA256 a420a8e4e0b29f61c8ff38722c1fba7fd0dc675ab8fd3d3839e3c6698cca2854
-MD5 2a16cc9aeec3ef3a585a49b182bdbbef mod_pcgi2-2.0.2.ebuild 937
-RMD160 266728a44e888b0bf0a11e6cb5f832e3cd2c9139 mod_pcgi2-2.0.2.ebuild 937
-SHA256 a420a8e4e0b29f61c8ff38722c1fba7fd0dc675ab8fd3d3839e3c6698cca2854 mod_pcgi2-2.0.2.ebuild 937
-MISC ChangeLog 1986 RMD160 93d1c53ea0f41171048fd42cee66aa8dcfcaa496 SHA1 e96998547edf5def798d410a1ad8359aa357bb52 SHA256 422d4ca1b757d30b13a6968ea8c11424c2816bac0f44e8b5856434d4c1b42f0a
-MD5 48187e81af3d92101c30bd8e8aefaf9b ChangeLog 1986
-RMD160 93d1c53ea0f41171048fd42cee66aa8dcfcaa496 ChangeLog 1986
-SHA256 422d4ca1b757d30b13a6968ea8c11424c2816bac0f44e8b5856434d4c1b42f0a ChangeLog 1986
+AUX 20_mod_pcgi.conf 263 RMD160 d68b9c004b23cbda38bbfd30f38257ecc645aa47 SHA1 d1d115f115572c2f8ec8f16c8a9ba0bd3233b951 SHA256 3fd0be4bb8abe7ce11c64de556b7f788ce65e12e73f7177d84f5be65026147d5
+MD5 072e429c5e95032f2875f7428d811281 files/20_mod_pcgi.conf 263
+RMD160 d68b9c004b23cbda38bbfd30f38257ecc645aa47 files/20_mod_pcgi.conf 263
+SHA256 3fd0be4bb8abe7ce11c64de556b7f788ce65e12e73f7177d84f5be65026147d5 files/20_mod_pcgi.conf 263
+DIST mod_pcgi2-2.0.2-src.tar.gz 32214 RMD160 381a6c7a58e52babcc6ffe425673784ac3ce4821 SHA1 dd9c6b6a7c0c90655516601c104a96ee34c42a9f SHA256 853f8a02483774d3cf9f1861d467481086fc75cbd38f5e0a00c265574587a63e
+EBUILD mod_pcgi2-2.0.2.ebuild 920 RMD160 4c0c25b8974524188b0d581afe811f5660d7a0fe SHA1 575b77adb83c3909ce5ad4ae4cdb5c9033c8d9a5 SHA256 310c1705c2dbde102c344547a9aae04dc1dae50ecfa1cfaef2225088931292ac
+MD5 b58bf51cf82ea6c732c7ad479e4dea59 mod_pcgi2-2.0.2.ebuild 920
+RMD160 4c0c25b8974524188b0d581afe811f5660d7a0fe mod_pcgi2-2.0.2.ebuild 920
+SHA256 310c1705c2dbde102c344547a9aae04dc1dae50ecfa1cfaef2225088931292ac mod_pcgi2-2.0.2.ebuild 920
+MISC ChangeLog 2169 RMD160 88174a2cbb439c623639603393f88eee6c449704 SHA1 679638b64d0f7e0b546d8e3eff5315dee23cccbd SHA256 131b3505790446add2eed8563b058c6a1d510e4f0fd06e4739f6ed914fa7d25e
+MD5 0a000445c6e37531405b14367519586f ChangeLog 2169
+RMD160 88174a2cbb439c623639603393f88eee6c449704 ChangeLog 2169
+SHA256 131b3505790446add2eed8563b058c6a1d510e4f0fd06e4739f6ed914fa7d25e ChangeLog 2169
 MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8
 MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
 SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
-MD5 49f0dc2658376250f0258f45d9a1886c files/digest-mod_pcgi2-2.0.2 70
-RMD160 b6e29a71d62ac78655ef0daa26f8e5a412afc703 files/digest-mod_pcgi2-2.0.2 70
-SHA256 d87eea3dec748f9fdc4b2fa3b06e91004e7acc408b09b48aec05c2982ceb1489 files/digest-mod_pcgi2-2.0.2 70
+MD5 a648a395ec3c0f1695a6125830932554 files/digest-mod_pcgi2-2.0.2 256
+RMD160 ed789a16830f102bcf5a3b18a2e8feeecac84bbd files/digest-mod_pcgi2-2.0.2 256
+SHA256 dc63e53d1c3c39304f0c6505a46aa24c87d51c7b70d5d5aa1f78279f2a1493da files/digest-mod_pcgi2-2.0.2 256
diff --git a/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf b/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf
deleted file mode 100644
index 87214413c94a..000000000000
--- a/net-www/mod_pcgi2/files/2.0.2/20_mod_pcgi.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<IfDefine PCGI>
-	<IfModule !mod_pcgi2.c>
-		LoadModule pcgi2_module	modules/mod_pcgi2.so
-	</IfModule>
-</IfDefine>
-
-<IfModule mod_pcgi2.c>
-	# please see /usr/share/doc/mod_pcgi-*/README
-	# for details on the required apache directives
-</IfModule>
-
-# vim:ft=apache:
diff --git a/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch b/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch
deleted file mode 100644
index 5a3e17f6103a..000000000000
--- a/net-www/mod_pcgi2/files/mod_pcgi2-2.0.1-macrofix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur pcgi2.old/mod_pcgi2.c pcgi2/mod_pcgi2.c
---- pcgi2.old/mod_pcgi2.c	2002-05-08 05:15:01.000000000 -0700
-+++ pcgi2/mod_pcgi2.c	2003-10-28 23:02:33.000000000 -0800
-@@ -166,12 +166,12 @@
- 
- 
- /* Merge resource records */
--#define CREATE_pcgi_mergef(name, addr, maxsz) static void pcgi_merge_##name##(pcgiResource *r, pcgiResource *base, pcgiResource *overrides) \
-+#define CREATE_pcgi_mergef(name, addr, maxsz) static void pcgi_merge_##name(pcgiResource *r, pcgiResource *base, pcgiResource *overrides) \
- { \
--   if (overrides->##addr##[0]) { \
--      strncpy(r->##addr##, overrides->##addr##, maxsz); \
--   } else if (base->##addr##[0]) { \
--      strncpy(r->##addr##, base->##addr##, maxsz); \
-+   if (overrides->addr[0]) { \
-+      strncpy(r->addr, overrides->addr, maxsz); \
-+   } else if (base->addr[0]) { \
-+      strncpy(r->addr, base->addr, maxsz); \
-    } \
- }
- 
-@@ -314,9 +314,9 @@
- 
- 
- /* Parse command parameters */
--#define CREATE_pcgi_setf(name, addr, maxsz) static const char *pcgi_set_##name##(cmd_parms *parms, void *r, const char *arg) \
-+#define CREATE_pcgi_setf(name, addr, maxsz) static const char *pcgi_set_##name(cmd_parms *parms, void *r, const char *arg) \
- { \
--   strncpy(((pcgiResource *)r)->##addr##, arg, maxsz); \
-+   strncpy(((pcgiResource *)r)->addr, arg, maxsz); \
-    return NULL; \
- }
-