fix depend.apache usage wrt #208033; cleanup

(Portage version: 2.1.4)

5 files changed, 90 insertions, 129 deletions

diff --git a/www-apache/mod_auth_cookie_mysql2/ChangeLog b/www-apache/mod_auth_cookie_mysql2/ChangeLog
index b642e75ca5ee..d4b66be1e8d3 100644
--- a/www-apache/mod_auth_cookie_mysql2/ChangeLog
+++ b/www-apache/mod_auth_cookie_mysql2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_auth_cookie_mysql2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_cookie_mysql2/ChangeLog,v 1.4 2007/08/13 12:46:27 phreak Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_cookie_mysql2/ChangeLog,v 1.5 2008/01/29 16:08:00 hollow Exp $
+
+  29 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/55_mod_auth_cookie_mysql2.conf, -mod_auth_cookie_mysql2-0.7.ebuild,
+  mod_auth_cookie_mysql2-0.9a.ebuild:
+  fix depend.apache usage wrt #208033; cleanup
 
 *mod_auth_cookie_mysql2-0.9a (13 Aug 2007)
 
diff --git a/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf b/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf
index e860671288bd..0a9c5fe6b235 100644
--- a/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf
+++ b/www-apache/mod_auth_cookie_mysql2/files/55_mod_auth_cookie_mysql2.conf
@@ -1,97 +1,95 @@
 <IfDefine AUTH_COOKIE_MYSQL2>
-	<IfModule !mod_auth_cookie_mysql2.c>
-		LoadModule auth_cookie_mysql2_module    modules/mod_auth_cookie_mysql2.so
-	</IfModule>
-</IfDefine>
+LoadModule auth_cookie_mysql2_module modules/mod_auth_cookie_mysql2.so
+
+# MOD_AUTH_COOKIE_MYSQL Configuration section.
+# For more information look at the configuration section at
+# http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/#configuration
 
-<IfModule mod_auth_cookie_mysql2.c>
-	# MOD_AUTH_COOKIE_MYSQL Configuration section.
-	# For more information look at the configuration section at
-	# http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/#configuration
+# The MOD_AUTH_COOKIE_MYSQL2 directives must be inside of a <Directory>
+# block to work correctly!
+#<Directory "/var/www/localhost/">
+	# CookieAuth: Activates this module.
+	# REQUIRED: Yes
+	# Options: on|off
+	#CookieAuth
 
-	# The MOD_AUTH_COOKIE_MYSQL2 directives must be inside of a <Directory>
-	# block to work correctly!
-	#<Directory "/var/www/localhost/">
-		# CookieAuth: Activates this module.
-		# REQUIRED: Yes
-		# Options: on|off
-		#CookieAuth
+	# CookieAuth_DBhost: Hostname or IP of the host where MySQL is running on.
+	# REQUIRED: Yes
+	# Options: <hostname or IP>
+	#CookieAuth_DBhost
 
-		# CookieAuth_DBhost: Hostname or IP of the host where MySQL is running on.
-		# REQUIRED: Yes
-		# Options: <hostname or IP>
-		#CookieAuth_DBhost
+	# CookieAuth_DBName: Name of the MySQL database.
+	# REQUIRED: Yes
+	# Options: <dbname>
+	#CookieAuth_DBName
 
-		# CookieAuth_DBName: Name of the MySQL database.
-		# REQUIRED: Yes
-		# Options: <dbname>
-		#CookieAuth_DBName
+	# CookieAuth_DBTable: Table name in database.
+	# REQUIRED: Yes
+	# Options: <tbname>
+	#CookieAuth_DBTable
 
-		# CookieAuth_DBTable: Table name in database.
-		# REQUIRED: Yes
-		# Options: <tbname>
-		#CookieAuth_DBTable
+	# CookieAuth_DBUser: MySQL username with permissions to database and table.
+	# REQUIRED: Yes
+	# Options: <username>
+	#CookieAuth_DBUser
 
-		# CookieAuth_DBUser: MySQL username with permissions to database and table.
-		# REQUIRED: Yes
-		# Options: <username>
-		#CookieAuth_DBUser
+	# CookieAuth_DBPassword: password for user in CookieAuth_DBUser.
+	# REQUIRED: Yes
+	# Options: <password>
+	#CookieAuth_DBPassword
 
-		# CookieAuth_DBPassword: password for user in CookieAuth_DBUser.
-		# REQUIRED: Yes
-		# Options: <password>
-		#CookieAuth_DBPassword
+	# CookieAuth_UsernameField: Field in MySQL table where username of session is stored.
+	# This username is displayed as the "Remote Username" variable "REMOTE_USER" in Apache.
+	# REQUIRED: Yes
+	# Options: <fieldname>
+	#CookieAuth_UsernameField
 
-		# CookieAuth_UsernameField: Field in MySQL table where username of session is stored.
-		# This username is displayed as the "Remote Username" variable "REMOTE_USER" in Apache.
-		# REQUIRED: Yes
-		# Options: <fieldname>
-		#CookieAuth_UsernameField
+	# CookieAuth_SessnameField: Field in MySQL table where session name is stored. This is
+	# the name of the cookie!
+	# REQUIRED: Yes
+	# Options: <fieldname>
+	#CookieAuth_SessnameField
 
-		# CookieAuth_SessnameField: Field in MySQL table where session name is stored. This is
-		# the name of the cookie!
-		# REQUIRED: Yes
-		# Options: <fieldname>
-		#CookieAuth_SessnameField
+	# CookieAuth_SessvalField: Field in MySQL table where session value (this is the value
+	# which is compared with the cookie value) is stored.
+	# REQUIRED: Yes
+	# Options: <fieldname>
+	#CookieAuth_SessvalField
 
-		# CookieAuth_SessvalField: Field in MySQL table where session value (this is the value
-		# which is compared with the cookie value) is stored.
-		# REQUIRED: Yes
-		# Options: <fieldname>
-		#CookieAuth_SessvalField
+	# Cookie_Auth_CookieName: If this option is set, only the cookie with this name is searched.
+	# If it is not set, this module will search all cookies the browser sends and checks the name
+	# against the values in the field set with CookieAuth_SessvalField.
+	# REQUIRED: No
+	# Options: <name>
+	#CookieAuth_CookieName
 
-		# Cookie_Auth_CookieName: If this option is set, only the cookie with this name is searched.
-		# If it is not set, this module will search all cookies the browser sends and checks the name
-		# against the values in the field set with CookieAuth_SessvalField.
-		# REQUIRED: No
-		# Options: <name>
-		#CookieAuth_CookieName
+	# Cookie_Auth_ExpiryField: When this option is set, the current time of the webserver is
+	# compared against this field in the database. This value is in the format of a Unix
+	# timestamp (time in seconds since 01-01-1970)
+	# REQUIRED: No
+	# Options: <fieldname>
+	#CookieAuth_ExpiryField
 
-		# Cookie_Auth_ExpiryField: When this option is set, the current time of the webserver is
-		# compared against this field in the database. This value is in the format of a Unix
-		# timestamp (time in seconds since 01-01-1970)
-		# REQUIRED: No
-		# Options: <fieldname>
-		#CookieAuth_ExpiryField
+	# CookieAuth_RemoteIPField: When this option is set, the remote address of the connected
+	# client is checked against this field. Only when the remote IP and the stored IP are
+	# equal will the client be able to authorize.
+	# REQUIRED: No
+	# Options: <fieldname>
+	#CookieAuth_RemoteIPField
 
-		# CookieAuth_RemoteIPField: When this option is set, the remote address of the connected
-		# client is checked against this field. Only when the remote IP and the stored IP are
-		# equal will the client be able to authorize.
-		# REQUIRED: No
-		# Options: <fieldname>
-		#CookieAuth_RemoteIPField
+	# CookieAuth_FailureURL: Normally, when the authorization fails the client gets an
+	# "AUTHORIZATION REQUIRED" message from the webserver. With this option set you can
+	# redirect the client to another URL.
+	#
+	# WARNING: This is a normal redirect for the browser. If you want an internal
+	#          redirect where the browser doesn't see the URL it's been redirected to
+	#          you should use the ErrorDocument directive. Example:
+	#          "ErrorDocument 401 /some_error.html"
+	#
+	# REQUIRED: No
+	# Options: <url>
+	#CookieAuth_FailureURL
+#</Directory>
+</IfDefine>
 
-		# CookieAuth_FailureURL: Normally, when the authorization fails the client gets an
-		# "AUTHORIZATION REQUIRED" message from the webserver. With this option set you can
-		# redirect the client to another URL.
-		#
-		# WARNING: This is a normal redirect for the browser. If you want an internal
-		#          redirect where the browser doesn't see the URL it's been redirected to
-		#          you should use the ErrorDocument directive. Example:
-		#          "ErrorDocument 401 /some_error.html"
-		#
-		# REQUIRED: No
-		# Options: <url>
-		#CookieAuth_FailureURL
-	#</Directory>
-</IfModule>
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_cookie_mysql2/files/digest-mod_auth_cookie_mysql2-0.7 b/www-apache/mod_auth_cookie_mysql2/files/digest-mod_auth_cookie_mysql2-0.7
deleted file mode 100644
index db664d5e1695..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/files/digest-mod_auth_cookie_mysql2-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cb2869d2bff22f99d48bea11004a18eb mod_auth_cookie_mysql2_0.7.tar.gz 7954
-RMD160 216a2e14cf13e9c5f9913939649a4d7e7be9be7b mod_auth_cookie_mysql2_0.7.tar.gz 7954
-SHA256 f5aedec0b4873bce5eaf92d8b431ecfeb894dcfc75d148e42c5450abfc2989f5 mod_auth_cookie_mysql2_0.7.tar.gz 7954
diff --git a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.7.ebuild b/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.7.ebuild
deleted file mode 100644
index c02e202d58c0..000000000000
--- a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.7.ebuild,v 1.3 2007/01/15 15:23:25 chtekk Exp $
-
-inherit eutils apache-module
-
-KEYWORDS="~x86"
-
-DESCRIPTION="An Apache2 backend authentication module that uses cookies and MySQL."
-HOMEPAGE="http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/"
-SRC_URI="http://home.digithi.de/digithi/dev/mod_auth_cookie_mysql/${P/-/_}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/mysql"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/-/_}"
-
-APXS2_ARGS="-I/usr/include/mysql -lmysqlclient -lz -c ${PN}.c"
-
-APACHE2_MOD_CONF="55_${PN}"
-APACHE2_MOD_DEFINE="AUTH_COOKIE_MYSQL2"
-
-DOCFILES="README mod_auth_cookie_mysql.html"
-
-need_apache2
-
-pkg_postinst() {
-	ewarn
-	ewarn "There are a number of variables that need to be configured before"
-	ewarn "MOD_AUTH_COOKIE_MYSQL2 can work. After this package has finished"
-	ewarn "building, please go and modify the configuration file located at"
-	ewarn "${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
-	ewarn
-	ebeep 5
-	apache-module_pkg_postinst
-}
diff --git a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild b/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild
index 8bc56cc704e0..b2d5d46c6e96 100644
--- a/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild
+++ b/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild,v 1.1 2007/08/13 12:46:27 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_cookie_mysql2/mod_auth_cookie_mysql2-0.9a.ebuild,v 1.2 2008/01/29 16:08:00 hollow Exp $
 
 inherit eutils apache-module
 
@@ -32,7 +32,7 @@ pkg_postinst() {
 	ewarn "There are a number of variables that need to be configured before"
 	ewarn "MOD_AUTH_COOKIE_MYSQL2 can work. After this package has finished"
 	ewarn "building, please go and modify the configuration file located at"
-	ewarn "${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
+	ewarn "${APACHE_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf"
 	ewarn
 	ebeep 5
 	apache-module_pkg_postinst