fix #130112 + cleanup

(Portage version: 2.1_rc3-r1)

5 files changed, 26 insertions, 27 deletions

diff --git a/net-www/mod_roaming/ChangeLog b/net-www/mod_roaming/ChangeLog
index aead2868ed66..d6320527e384 100644
--- a/net-www/mod_roaming/ChangeLog
+++ b/net-www/mod_roaming/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mod_roaming
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.11 2006/06/05 02:20:37 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/ChangeLog,v 1.12 2006/06/06 09:37:33 hollow Exp $
+
+  06 Jun 2006; Benedikt Böhm <hollow@gentoo.org> files/18_mod_roaming.conf,
+  -files/2.0.0-r1/18_mod_roaming.conf, -files/mod_roaming-register.patch,
+  mod_roaming-1.0.2.ebuild, mod_roaming-2.0.0-r1.ebuild:
+  fix #130112 + cleanup
 
   05 Jun 2006; Michael Stewart <vericgar@gentoo.org>
   -mod_roaming-2.0.0.ebuild:
diff --git a/net-www/mod_roaming/files/18_mod_roaming.conf b/net-www/mod_roaming/files/18_mod_roaming.conf
index e494e00775e0..237a881a2068 100644
--- a/net-www/mod_roaming/files/18_mod_roaming.conf
+++ b/net-www/mod_roaming/files/18_mod_roaming.conf
@@ -1,26 +1,18 @@
 <IfDefine ROAMING>
   <IfModule !mod_roaming.c>
-    LoadModule roaming_module    extramodules/mod_roaming.so
+    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 mod_roaming.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/digest-mod_roaming-1.0.2 b/net-www/mod_roaming/files/digest-mod_roaming-1.0.2
index 930230132da1..a1e49fefce46 100644
--- a/net-www/mod_roaming/files/digest-mod_roaming-1.0.2
+++ b/net-www/mod_roaming/files/digest-mod_roaming-1.0.2
@@ -1 +1,3 @@
 MD5 226c0ce2daf276072079590b5560f022 mod_roaming-1.0.2.tar.gz 9742
+RMD160 c4d27b082c7ccac5b352e35b88ad72bbd12d5810 mod_roaming-1.0.2.tar.gz 9742
+SHA256 acb473962f6091887fa2fd5265b4440ca1a95d38093d01d2a59deabfaac90dce mod_roaming-1.0.2.tar.gz 9742
diff --git a/net-www/mod_roaming/mod_roaming-1.0.2.ebuild b/net-www/mod_roaming/mod_roaming-1.0.2.ebuild
index 8557a57d4cbd..db5fe7117d09 100644
--- a/net-www/mod_roaming/mod_roaming-1.0.2.ebuild
+++ b/net-www/mod_roaming/mod_roaming-1.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-1.0.2.ebuild,v 1.3 2005/12/19 23:44:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-1.0.2.ebuild,v 1.4 2006/06/06 09:37:33 hollow Exp $
 
 inherit eutils apache-module
 
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 IUSE=""
 SLOT="0"
 
-APACHE1_MOD_CONF="2.0.0-r1/18_mod_roaming"
+APACHE1_MOD_CONF="18_mod_roaming"
 APACHE1_MOD_DEFINE="ROAMING"
 
 DOCFILES="CHANGES INSTALL LICENSE README"
diff --git a/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild b/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild
index 14e3cc2c6d67..b9c2886ac847 100644
--- a/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild
+++ b/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild,v 1.4 2005/09/18 21:54:41 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_roaming/mod_roaming-2.0.0-r1.ebuild,v 1.5 2006/06/06 09:37:33 hollow Exp $
 
 inherit eutils apache-module
 
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 IUSE=""
 SLOT="0"
 
-APACHE2_MOD_CONF="${PVR}/18_mod_roaming"
+APACHE2_MOD_CONF="18_mod_roaming"
 APACHE2_MOD_DEFINE="ROAMING"
 
 DOCFILES="CHANGES INSTALL LICENSE README"