fix #130112 + cleanup

(Portage version: 2.1_rc3-r1)
 (Signed Manifest commit)

3 files changed, 30 insertions, 68 deletions

diff --git a/net-www/mod_roaming/Manifest b/net-www/mod_roaming/Manifest
index 5e353e5a7159..3fa6114486f2 100644
--- a/net-www/mod_roaming/Manifest
+++ b/net-www/mod_roaming/Manifest
@@ -1,36 +1,38 @@
-AUX 18_mod_roaming.conf 414 RMD160 376a4704b309db115151fb20b2aada7c4f8e291f SHA1 b8252b91063383d7b3f6758f2f2bd3dcf57e5b0d SHA256 02355b1fd5c1492a368530085da8817243803ef7268610f74a8d9d99842043b8
-MD5 6ccb5bfdbe8bfba614da810c60d0acee files/18_mod_roaming.conf 414
-RMD160 376a4704b309db115151fb20b2aada7c4f8e291f files/18_mod_roaming.conf 414
-SHA256 02355b1fd5c1492a368530085da8817243803ef7268610f74a8d9d99842043b8 files/18_mod_roaming.conf 414
-AUX 2.0.0-r1/18_mod_roaming.conf 413 RMD160 ce4418f1f63ba997c7aa207356f315b1129be094 SHA1 f4edde9e2586eded128de95682f726f9a50e089b SHA256 769f04055af2833064b0f52ced38e42292d2c6bd36e8c9c2173e23a00b09b46c
-MD5 39366ec603c2b484b4172523fba873b6 files/2.0.0-r1/18_mod_roaming.conf 413
-RMD160 ce4418f1f63ba997c7aa207356f315b1129be094 files/2.0.0-r1/18_mod_roaming.conf 413
-SHA256 769f04055af2833064b0f52ced38e42292d2c6bd36e8c9c2173e23a00b09b46c files/2.0.0-r1/18_mod_roaming.conf 413
-AUX mod_roaming-register.patch 761 RMD160 b79222eaa38af60eacc91575129ad21a35225da4 SHA1 54d0242bb110cca82503cf9b9c2c232c98bd109e SHA256 eeb36e95c946e2b5fade575131f113a19d20df3de939426fcf370ca42547dafe
-MD5 0c01fe5f077bd4d205041537b5ac85e1 files/mod_roaming-register.patch 761
-RMD160 b79222eaa38af60eacc91575129ad21a35225da4 files/mod_roaming-register.patch 761
-SHA256 eeb36e95c946e2b5fade575131f113a19d20df3de939426fcf370ca42547dafe files/mod_roaming-register.patch 761
-DIST mod_roaming-1.0.2.tar.gz 9742
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 18_mod_roaming.conf 410 RMD160 5d2c1b234cea009d261018026c3fab61f57be82e SHA1 0af45c6700b676c8df16e637039bcd8e5e88d86b SHA256 ffac9791f6a13a4360fed76480c2724c1a8acda41f99204c46ce3adbf9908fcf
+MD5 e94f983049d736cfa57be6e2a4e046b4 files/18_mod_roaming.conf 410
+RMD160 5d2c1b234cea009d261018026c3fab61f57be82e files/18_mod_roaming.conf 410
+SHA256 ffac9791f6a13a4360fed76480c2724c1a8acda41f99204c46ce3adbf9908fcf files/18_mod_roaming.conf 410
+DIST mod_roaming-1.0.2.tar.gz 9742 RMD160 c4d27b082c7ccac5b352e35b88ad72bbd12d5810 SHA1 5a58ae3d4a2f0d9dc3b74f26eec8db4efc7fc37c SHA256 acb473962f6091887fa2fd5265b4440ca1a95d38093d01d2a59deabfaac90dce
 DIST mod_roaming-2.0.0.tar.gz 9227 RMD160 b3220f30fbb41a01e3b25fd39811461974f909e9 SHA1 7213894a8168f7a9a1dbe0974b337121a96f6a24 SHA256 7b63e1a486bad5713cc1a8965d4eaf23474cf6614dec32cd76e69e670a7b20ac
-EBUILD mod_roaming-1.0.2.ebuild 690 RMD160 192d39aeb5fc59bcfbc547c433e174ea9074d7aa SHA1 a69a434cf7f2c65483df475adb7177cb12015f5a SHA256 458adcef024eaf7d6c4d290e76baa5c397fc2b351b36013f7377dc6b5de0c5f6
-MD5 200d553ad04ef5a11f6df39beb716b39 mod_roaming-1.0.2.ebuild 690
-RMD160 192d39aeb5fc59bcfbc547c433e174ea9074d7aa mod_roaming-1.0.2.ebuild 690
-SHA256 458adcef024eaf7d6c4d290e76baa5c397fc2b351b36013f7377dc6b5de0c5f6 mod_roaming-1.0.2.ebuild 690
-EBUILD mod_roaming-2.0.0-r1.ebuild 715 RMD160 2370dc51fa14b34a13bac7a2f901d1668cb29e5f SHA1 4bc52b7cd049bcad0cafb78f0c4de726b8c06ccb SHA256 87c306423b7d1c869f17edab5cd2e48620a1cae214ec1efbebbd6c3a68039ba6
-MD5 ad3de522a8fb07f9a45866eae9ae89dd mod_roaming-2.0.0-r1.ebuild 715
-RMD160 2370dc51fa14b34a13bac7a2f901d1668cb29e5f mod_roaming-2.0.0-r1.ebuild 715
-SHA256 87c306423b7d1c869f17edab5cd2e48620a1cae214ec1efbebbd6c3a68039ba6 mod_roaming-2.0.0-r1.ebuild 715
-MISC ChangeLog 1394 RMD160 dc84fb7ab33f27ce88c79253c12be69f2f0c0836 SHA1 d202944766bf1fb26066176a7515c7965ec92154 SHA256 260f1c7e11af6b758f9938a436a5ece28a1803107bb7dc5c97802ecb66bda798
-MD5 4a68d56052b2b907667a9cfc66f720ba ChangeLog 1394
-RMD160 dc84fb7ab33f27ce88c79253c12be69f2f0c0836 ChangeLog 1394
-SHA256 260f1c7e11af6b758f9938a436a5ece28a1803107bb7dc5c97802ecb66bda798 ChangeLog 1394
+EBUILD mod_roaming-1.0.2.ebuild 681 RMD160 5fd599debcb6750e489845cb93a02ba8d12cfac1 SHA1 46f7f582e75852ad38102e2656a61d83bb2f5090 SHA256 e2ea5caea7dad8cf94b758c6e6b8ab8299436d488c020202671c7245af92bb49
+MD5 b9ac8fd6bdbafc318980283ff6428651 mod_roaming-1.0.2.ebuild 681
+RMD160 5fd599debcb6750e489845cb93a02ba8d12cfac1 mod_roaming-1.0.2.ebuild 681
+SHA256 e2ea5caea7dad8cf94b758c6e6b8ab8299436d488c020202671c7245af92bb49 mod_roaming-1.0.2.ebuild 681
+EBUILD mod_roaming-2.0.0-r1.ebuild 706 RMD160 97b84c2aa2876ecfa3611554f7acb8a47c16ebcb SHA1 25d70efbfcfa9237b08692f5436673837062c716 SHA256 015312fccb4cf48403eff755d99f3a6ece5964a0fd696a683f4d47fcd6242543
+MD5 6b319f469339ebe854ad7a4aca3b6cef mod_roaming-2.0.0-r1.ebuild 706
+RMD160 97b84c2aa2876ecfa3611554f7acb8a47c16ebcb mod_roaming-2.0.0-r1.ebuild 706
+SHA256 015312fccb4cf48403eff755d99f3a6ece5964a0fd696a683f4d47fcd6242543 mod_roaming-2.0.0-r1.ebuild 706
+MISC ChangeLog 1625 RMD160 c2444b08f20ad085cb344c882d33847c8f7fb4e8 SHA1 ee654e3210496ae328610aaabfd255a75a853231 SHA256 a30fc391c0225f84225227a903347b1e821d4a4b703622048971a10295f8323e
+MD5 b6848f8d77fc0786afdaff30d0783491 ChangeLog 1625
+RMD160 c2444b08f20ad085cb344c882d33847c8f7fb4e8 ChangeLog 1625
+SHA256 a30fc391c0225f84225227a903347b1e821d4a4b703622048971a10295f8323e ChangeLog 1625
 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 25bf9970222aa6e8bcb2eb03f6687fc3 files/digest-mod_roaming-1.0.2 67
-RMD160 e7f2113491c64f1fbe33e62d8a912003413a6dee files/digest-mod_roaming-1.0.2 67
-SHA256 90acbf91d65ee12f4f1358d824f8f1b93c4498d7c3fe6c43c128b7b66b5124d3 files/digest-mod_roaming-1.0.2 67
+MD5 cdc3fd39689a09bafa658db7ce92cf41 files/digest-mod_roaming-1.0.2 247
+RMD160 154892536e48bf5ac418e667517577cfe9ef7f47 files/digest-mod_roaming-1.0.2 247
+SHA256 2c8787da062e3bc6586e3cde0ce1d2e3784fee6cb512a8ed4df4a55bd4d5582f files/digest-mod_roaming-1.0.2 247
 MD5 1af134b20fe244b75fbf72dfce0aaf17 files/digest-mod_roaming-2.0.0-r1 247
 RMD160 d31d2548d9ef396dca254b3d5df20b36b9f34d94 files/digest-mod_roaming-2.0.0-r1 247
 SHA256 f573fece8c23dc18a554bdc8480908bc805e6436eed48a0a025a65dd53744199 files/digest-mod_roaming-2.0.0-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEhU0GmPFBzbX68WERAl0lAJ9FPysL1vnP48+qd+l7SZPgcafmEgCfbNBr
+SRWoGjJ5oH7xikz4agQ9mpY=
+=VNkG
+-----END PGP SIGNATURE-----
diff --git a/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf b/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf
deleted file mode 100644
index c0001f93d2df..000000000000
--- a/net-www/mod_roaming/files/2.0.0-r1/18_mod_roaming.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<IfDefine ROAMING>
-  <IfModule !mod_roaming.c>
-    LoadModule roaming_module    modules/mod_roaming.so
-  </IfModule>
-</IfDefine>
-
-<IfModule roaming_module.c>
-	RoamingAlias /roaming /var/lib/mod_roaming
-	
-	<Location /roaming>
-		AuthUserFile /var/lib/mod_roaming/roaming-htpasswd
-		AuthType Basic
-		AuthName "Roaming Access"
-		<Limit GET PUT MOVE DELETE>
-	  		require valid-user
-		</Limit>
-	</Location>
-</IfModule>
diff --git a/net-www/mod_roaming/files/mod_roaming-register.patch b/net-www/mod_roaming/files/mod_roaming-register.patch
deleted file mode 100644
index ef384c903e28..000000000000
--- a/net-www/mod_roaming/files/mod_roaming-register.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mod_roaming.c.orig	2002-09-05 11:49:43.000000000 -0400
-+++ mod_roaming.c	2002-09-05 11:51:00.000000000 -0400
-@@ -514,10 +514,19 @@
-     return OK;
- }
- 
-+static int roaming_init_handler(apr_pool_t *p, apr_pool_t *plog, 
-+				apr_pool_t *ptemp, server_rec *s)
-+{
-+    ap_add_version_component(p, "mod_roaming/2.0.0");
-+    return OK;
-+}
-+                                                     
-+
- /*
-  * Registers hooks at interesting points in the request handling process.
-  */
- static void roaming_register_hooks(apr_pool_t *p) {
-+        ap_hook_post_config(roaming_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
- 	ap_hook_translate_name(roaming_translate_name, NULL, NULL, APR_HOOK_MIDDLE);
- 	ap_hook_handler(roaming_handler, NULL, NULL, APR_HOOK_MIDDLE);
- }