Moving net-www/mod_auth_mysql to www-apache/mod_auth_mysql (#81244).

10 files changed, 0 insertions, 575 deletions

diff --git a/net-www/mod_auth_mysql/ChangeLog b/net-www/mod_auth_mysql/ChangeLog
deleted file mode 100644
index 60870094005e..000000000000
--- a/net-www/mod_auth_mysql/ChangeLog
+++ /dev/null
@@ -1,127 +0,0 @@
-# ChangeLog for net-www/mod_auth_mysql
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.27 2007/06/14 20:58:50 phreak Exp $
-
- 07 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
-  -files/12_mod_auth_mysql.conf, -files/mod_auth_mysql.patch, metadata.xml,
-  -mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild:
-  Ebuild cleanup, set mysql as herd too.
-
-  14 Jun 2007; Christian Heim <phreak@gentoo.org>
-  files/12_mod_auth_mysql.conf:
-  Document "AuthBasicAuthoritative Off" in the configuration examples.
-
-  13 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
-  +files/12_mod_auth_mysql.conf, -files/2.8.1/12_mod_auth_mysql.conf,
-  mod_auth_mysql-3.0.0-r1.ebuild, mod_auth_mysql-3.0.0-r2.ebuild:
-  Cleanup.
-
-*mod_auth_mysql-3.0.0-r2 (09 Jan 2007)
-
-  09 Jan 2007; Christian Heim <phreak@gentoo.org>
-  +files/mod_auth_mysql-3.0.0-apache-2.2.patch,
-  +files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch,
-  +mod_auth_mysql-3.0.0-r2.ebuild:
-  Revision bump, including a fix for =net-www/apache-2.2* (hopefully fixing
-  #128501).
-
-  23 Nov 2006; Francesco Riosa <vivo@gentoo.org>
-  mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild:
-  dev-db/mysql => virtual/mysql
-
-*mod_auth_mysql-3.0.0-r1 (05 Jun 2006)
-
-  05 Jun 2006; Benedikt Böhm <hollow@gentoo.org>
-  -mod_auth_mysql-2.8.1.ebuild, +mod_auth_mysql-3.0.0-r1.ebuild:
-  fix #132391
-
-  04 Jun 2006; Michael Stewart <vericgar@gentoo.org>
-  -mod_auth_mysql-2.0.0_pre20030510.ebuild:
-  Remove old-style ebuilds
-
-  10 Dec 2005; Simon Stelling <blubb@gentoo.org>
-  mod_auth_mysql-3.0.0.ebuild:
-  stable on amd64
-
-  23 Oct 2005; Mark Loeser <halcy0n@gentoo.org> mod_auth_mysql-3.0.0.ebuild:
-  Stable on x86; bug #106448
-
-*mod_auth_mysql-3.0.0 (12 Aug 2005)
-
-  12 Aug 2005; Christian Parpart <trapni@gentoo.org>
-  +mod_auth_mysql-3.0.0.ebuild:
-  version bump
-
-  06 May 2005; Sven Wegener <swegener@gentoo.org>
-  mod_auth_mysql-2.0.0_pre20030510.ebuild:
-  Removed * postfix from <, <=, >= and > dependencies.
-
-  25 Mar 2005; <blubb@gentoo.org> mod_auth_mysql-2.8.1.ebuild:
-  added ~amd64
-
-  17 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
-  -mod_auth_mysql-1.11.ebuild, mod_auth_mysql-2.8.1.ebuild,
-  -mod_auth_mysql-20030510-r1.ebuild, -mod_auth_mysql-20030510-r2.ebuild,
-  -mod_auth_mysql-20030510.ebuild:
-  cleanup
-
-  07 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
-  mod_auth_mysql-20030510.ebuild:
-  Fixed IUSE
-
-*mod_auth_mysql-2.0.0_pre20030510 (01 Feb 2005)
-
-  01 Feb 2005; Michael Stewart <vericgar@gentoo.org>
-  +mod_auth_mysql-2.0.0_pre20030510.ebuild:
-  Copied 20030510-r2 to 2.0.0_pre2030510 to fix bug #79678
-
-  22 Jan 2005; Christian Parpart <trapni@gentoo.org> 
-  mod_auth_mysql-2.8.1.ebuild:
-  apache herd package refresh - version bump to 2.8.1
-
-  25 Jun 2004; Aron Griffis <agriffis@gentoo.org>
-  mod_auth_mysql-20030510.ebuild:
-  QA - fix use invocation
-
-  20 Jun 2004; Chuck Short <zul@gentoo.org> mod_auth_mysql-1.11.ebuild,
-  mod_auth_mysql-20030510-r1.ebuild, mod_auth_mysql-20030510-r2.ebuild,
-  mod_auth_mysql-20030510.ebuild:
-  Ebuild clean up.
-
-  03 Jun 2004; Chuck Short <zul@gentoo.org> metadata.xml,
-  mod_auth_mysql-20030510-r1.ebuild, mod_auth_mysql-20030510-r2.ebuild,
-  mod_auth_mysql-20030510.ebuild, files/mod_auth_mysql.patch:
-  Added metadata.xml.
-  Added patch closes #52865.
-  -r2 marked stable.
-
-  22 Apr 2004; Chuck Short <zul@gentoo.org> mod_auth_mysql-20030510-r2.ebuild:
-  Installation of apache1 and apache2 modules. Closes #40265.
-
-  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
-  mod_auth_mysql-1.11.ebuild, mod_auth_mysql-20030510-r1.ebuild,
-  mod_auth_mysql-20030510-r2.ebuild, mod_auth_mysql-20030510.ebuild:
-  fix tail -1 issue and copyright headers
-
-*mod_auth_mysql-20030510-r2 (01 Oct 2003)
-
-  01 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
-  mod_auth_mysql-20030510-r2.ebuild:
-  fix bug #11254
-
-*mod_auth_mysql-20030510-r1 (08 Sep 2003)
-
-  08 Sep 2003; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
-  mod_auth_mysql-20030510-r1.ebuild:
-  complete bug #11254
-
-*mod_auth_mysql-20030510 (25 May 2003)
-
-  25 May 2003; Robin Johnson <robbat2@gentoo.org>
-  mod_auth_mysql-20030510.ebuild: 
-  Version bump, slight fixes to ebuild for updated version.
-
-*mod_auth_mysql-1.11 (28 Nov 2002)
-
-  28 Nov 2002; Donny Davies <woodchip@gentoo.org> :
-  Initial import; created by me.
diff --git a/net-www/mod_auth_mysql/Manifest b/net-www/mod_auth_mysql/Manifest
deleted file mode 100644
index e67a7b4a61cf..000000000000
--- a/net-www/mod_auth_mysql/Manifest
+++ /dev/null
@@ -1,45 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 12_mod_auth_mysql.conf 3885 RMD160 c63d36137bb6467f3538d9ab596b98a186492dc8 SHA1 c9c279f5bbbe211a2699b6187ea1441e48a06440 SHA256 0dfbbca6d2e2c635471e43a526bd14881170295f2f193a4ce2c3460d2548e6ca
-MD5 0bde08bf0f0d76fcea52d0a26c5cd372 files/12_mod_auth_mysql.conf 3885
-RMD160 c63d36137bb6467f3538d9ab596b98a186492dc8 files/12_mod_auth_mysql.conf 3885
-SHA256 0dfbbca6d2e2c635471e43a526bd14881170295f2f193a4ce2c3460d2548e6ca files/12_mod_auth_mysql.conf 3885
-AUX mod_auth_mysql-3.0.0-apache-2.2.patch 5919 RMD160 e478e80251f790b2cf26e66ed3c58a73cd7cd9e0 SHA1 809938d6e15d0eb2daef31876fba41632e641e0e SHA256 ff8ec4537ea365cc365adaf5118165e5f655fdc6d5359f2200ccce2c96d836ff
-MD5 946b8d5a75359850b36293194db5d634 files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
-RMD160 e478e80251f790b2cf26e66ed3c58a73cd7cd9e0 files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
-SHA256 ff8ec4537ea365cc365adaf5118165e5f655fdc6d5359f2200ccce2c96d836ff files/mod_auth_mysql-3.0.0-apache-2.2.patch 5919
-AUX mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686 RMD160 08b2912658033b725f21ef4dc1a784fbf21d4daa SHA1 42778fbee4fd313837f21eddbcf8c1ffd90fafd4 SHA256 c4a056b01b6bdd8aab1e37d9e7bf6e621cab1b9de49bccaae197a343f6ee4370
-MD5 3d91692af8b78ef37bc5343194d1ab2c files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
-RMD160 08b2912658033b725f21ef4dc1a784fbf21d4daa files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
-SHA256 c4a056b01b6bdd8aab1e37d9e7bf6e621cab1b9de49bccaae197a343f6ee4370 files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch 1686
-DIST mod_auth_mysql-3.0.0.tar.gz 19257 RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 SHA1 885dd0bfc64210d32e6705fdb10b2c0ca831a27c SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4
-EBUILD mod_auth_mysql-3.0.0-r1.ebuild 1145 RMD160 51c64dacffa9050a7352bd7103e37cfed251434d SHA1 4c295ada5aa1f23dd6ff569492de1f3c9fcc4309 SHA256 69f87a20e03b4d79cda852bbb16f470c977484c79a5c7b43d031092dad472c28
-MD5 34e14dcd6acaf7ac799539aef74f0307 mod_auth_mysql-3.0.0-r1.ebuild 1145
-RMD160 51c64dacffa9050a7352bd7103e37cfed251434d mod_auth_mysql-3.0.0-r1.ebuild 1145
-SHA256 69f87a20e03b4d79cda852bbb16f470c977484c79a5c7b43d031092dad472c28 mod_auth_mysql-3.0.0-r1.ebuild 1145
-EBUILD mod_auth_mysql-3.0.0-r2.ebuild 1335 RMD160 60af0dff928527bb825833cc388fc16a284603b4 SHA1 038286de5954011c63712aa09b93e0fbc6124cc3 SHA256 7601d2ace0e471ec88eddeeec8f9e15b2ee9c74fe402f2569d6d294c68bc567a
-MD5 5654bbfe2e3d04c9fbf27c7b68e85d2d mod_auth_mysql-3.0.0-r2.ebuild 1335
-RMD160 60af0dff928527bb825833cc388fc16a284603b4 mod_auth_mysql-3.0.0-r2.ebuild 1335
-SHA256 7601d2ace0e471ec88eddeeec8f9e15b2ee9c74fe402f2569d6d294c68bc567a mod_auth_mysql-3.0.0-r2.ebuild 1335
-MISC ChangeLog 4393 RMD160 7fa9bb6725a8978387427c33aa88d391e2589127 SHA1 c207ac72a8ded96ab42625a6af51104fa0c8f984 SHA256 71a20cd6e4ade50dd775b49f4c0ba4ca21e49df41a49716637090ea5ba957cf8
-MD5 74be7e5a91a9d11f1764da1fc17c1f0b ChangeLog 4393
-RMD160 7fa9bb6725a8978387427c33aa88d391e2589127 ChangeLog 4393
-SHA256 71a20cd6e4ade50dd775b49f4c0ba4ca21e49df41a49716637090ea5ba957cf8 ChangeLog 4393
-MISC metadata.xml 180 RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b SHA1 d3170a92499dc385c738add0d516d840e74b6415 SHA256 325b6e1d31edfdcaf7d563f03276382d77e6edf58d8f7d653086b7e726792c51
-MD5 b821e26d622d74f6ce77d24ef5fed492 metadata.xml 180
-RMD160 b762599c4a9e042758cf4e58cf968d0dfaf37c8b metadata.xml 180
-SHA256 325b6e1d31edfdcaf7d563f03276382d77e6edf58d8f7d653086b7e726792c51 metadata.xml 180
-MD5 cf735f899a63217e7f240b412e718a2c files/digest-mod_auth_mysql-3.0.0-r1 259
-RMD160 20e33e33c83e428507b0a94b824aac39c2c989d1 files/digest-mod_auth_mysql-3.0.0-r1 259
-SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/digest-mod_auth_mysql-3.0.0-r1 259
-MD5 cf735f899a63217e7f240b412e718a2c files/digest-mod_auth_mysql-3.0.0-r2 259
-RMD160 20e33e33c83e428507b0a94b824aac39c2c989d1 files/digest-mod_auth_mysql-3.0.0-r2 259
-SHA256 7fb0f2919dde6fe5282ca3665ce7672d0cce01a2f0c414ad0d1c8c9e9d119df1 files/digest-mod_auth_mysql-3.0.0-r2 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGcawayuNVb5qfaOYRAoJAAJ4onk9c4T7TSkpcv3AFvbMkc+lrcgCfWC0e
-NGzRLRze+D47IIgbM5BtWt8=
-=dKb/
------END PGP SIGNATURE-----
diff --git a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf b/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf
deleted file mode 100644
index bd4908794b47..000000000000
--- a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf
+++ /dev/null
@@ -1,137 +0,0 @@
-<IfDefine AUTH_MYSQL>
-	<IfModule !mod_auth_mysql.c>
-		LoadModule mysql_auth_module	modules/mod_auth_mysql.so
-	</IfModule>
-</IfDefine>
-
-<IfModule mod_auth_mysql.c>
-# mod_auth_mysql can be used to limit access to documents by checking
-# data in a MySQL database.
-
-# This will enable user-based MySQL authentication of everything
-# within /home/httpd.  You'll need to do the following as the MySQL
-# root user beforehand:
-#
-#    CREATE DATABASE auth;
-#    USE auth;
-#    CREATE TABLE users (
-#      user_name CHAR(30) NOT NULL,
-#      user_passwd CHAR(20) NOT NULL,
-#      PRIMARY KEY (user_name)
-#    );
-#    GRANT SELECT
-#      ON auth.users
-#      TO authuser@localhost
-#      IDENTIFIED BY 'PaSsW0Rd';
-#
-#    INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'));
-#
-#<Directory /home/httpd>
-#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#	# the following line:
-#	#AuthBasicAuthoritative Off
-#	AuthName "MySQL authenticated zone"
-#	AuthType Basic
-#
-#	AuthMySQLUser authuser
-#	AuthMySQLPassword PaSsW0Rd
-#	AuthMySQLDB auth
-#	AuthMySQLUserTable users
-#	AuthMySQLNameField user_name
-#	AuthMySQLPasswordField user_passwd
-#
-#	require valid-user
-#</Directory>
-
-# This will enable group-based MySQL authentication of everything
-# within /home/httpd.  You'll need to do the following as the MySQL
-# root user beforehand:
-#
-#    CREATE DATABASE auth;
-#    USE auth;
-#    CREATE TABLE users (
-#      user_name CHAR(30) NOT NULL,
-#      user_passwd CHAR(20) NOT NULL,
-#      user_group CHAR(20) NOT NULL,
-#      PRIMARY KEY (user_name)
-#    );
-#    GRANT SELECT
-#      ON auth.users
-#      TO authuser@localhost
-#      IDENTIFIED BY 'PaSsW0Rd';
-#
-#    INSERT INTO users VALUES ('testuser',  ENCRYPT('testpass'), 'user');
-#    INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'), 'admin');
-#
-#<Directory /home/httpd>
-#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#	# the following line:
-#	#AuthBasicAuthoritative Off
-#	AuthName "MySQL group authenticated zone"
-#	AuthType Basic
-#
-#	AuthMySQLUser authuser
-#	AuthMySQLPassword PaSsW0Rd
-#	AuthMySQLDB auth
-#	AuthMySQLUserTable users
-#	AuthMySQLNameField user_name
-#	AuthMySQLPasswordField user_passwd
-#	AuthMySQLGroupField user_group
-#
-#	require group admin
-#</Directory>
-
-# Like the above this enables group-based MySQL authentication of
-# everything within /home/httpd, but this configuration allows users to
-# belong to more than one group.  You'll need to do the following as
-# the MySQL root user beforehand:
-#
-#    CREATE DATABASE auth;
-#    USE auth;
-#    CREATE TABLE users (
-#      user_name CHAR(30) NOT NULL,
-#      user_passwd CHAR(20) NOT NULL,
-#      PRIMARY KEY (user_name)
-#    );
-#    CREATE TABLE groups (
-#      user_name CHAR(30) NOT NULL,
-#      user_group CHAR(20) NOT NULL,
-#      PRIMARY KEY (user_name, user_group)
-#    );
-#    GRANT SELECT
-#      ON auth.users
-#      TO authuser@localhost
-#      IDENTIFIED BY 'PaSsW0Rd';
-#    GRANT SELECT
-#      ON auth.groups
-#      TO authuser@localhost
-#      IDENTIFIED BY 'PaSsW0Rd';
-#
-#    INSERT INTO users VALUES ('testuser',  ENCRYPT('testpass'));
-#    INSERT INTO groups VALUES ('testuser', 'user');
-#    INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'));
-#    INSERT INTO groups VALUES ('testadmin', 'admin');
-#    INSERT INTO groups VALUES ('testadmin', 'user');
-#
-#<Directory /home/httpd>
-#	# If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#	# the following line:
-#	#AuthBasicAuthoritative Off
-#	AuthName "MySQL group authenticated zone"
-#	AuthType Basic
-#
-#	AuthMySQLUser authuser
-#	AuthMySQLPassword PaSsW0Rd
-#	AuthMySQLDB auth
-#	AuthMySQLUserTable users
-#	AuthMySQLNameField user_name
-#	AuthMySQLPasswordField user_passwd
-#	AuthMySQLGroupTable groups
-#	AuthMySQLGroupField user_group
-#
-#	require group user
-#</Directory>
-
-</IfModule>
-
-# vim: syntax=apache
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1
deleted file mode 100644
index b841d6624e79..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9ffde3dabeddf32de50bf75597c809e mod_auth_mysql-3.0.0.tar.gz 19257
-RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 mod_auth_mysql-3.0.0.tar.gz 19257
-SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4 mod_auth_mysql-3.0.0.tar.gz 19257
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2
deleted file mode 100644
index b841d6624e79..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-3.0.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a9ffde3dabeddf32de50bf75597c809e mod_auth_mysql-3.0.0.tar.gz 19257
-RMD160 ef68d6ec7c99c4059a38ba74f41c22e2f88f3863 mod_auth_mysql-3.0.0.tar.gz 19257
-SHA256 56da2e386583548f2fd9976101633f028d5d4649b46f428ff1d0dd1639efbad4 mod_auth_mysql-3.0.0.tar.gz 19257
diff --git a/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch b/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
deleted file mode 100644
index 30881f878d23..000000000000
--- a/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-apache-2.2.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
-===================================================================
---- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
-+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
-@@ -206,7 +206,7 @@
-   #define SNPRINTF apr_snprintf
-   #define PSTRDUP apr_pstrdup
-   #define PSTRNDUP apr_pstrndup
--  #define STRCAT ap_pstrcat
-+  #define STRCAT apr_pstrcat
-   #define POOL apr_pool_t
-   #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
-   #include "ap_compat.h"
-@@ -237,7 +237,7 @@
-   #define SNPRINTF ap_snprintf
-   #define PSTRDUP ap_pstrdup
-   #define PSTRNDUP ap_pstrndup
--  #define STRCAT ap_pstrcat
-+  #define STRCAT apr_pstrcat
-   #define POOL pool
-   #include <stdlib.h>
-   #include "ap_sha1.h"
-@@ -589,87 +589,87 @@ static void * create_mysql_auth_dir_conf
- static
- command_rec mysql_auth_cmds[] = {
- 	AP_INIT_TAKE1("AuthMySQLHost", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlhost),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlhost),
- 	OR_AUTHCFG, "mysql server host name"),
- 
- 	AP_INIT_TAKE1("AuthMySQLPort", ap_set_int_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlport),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlport),
- 	OR_AUTHCFG, "mysql server port number"),
- 
- 	AP_INIT_TAKE1("AuthMySQLSocket", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlsocket),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlsocket),
- 	OR_AUTHCFG, "mysql server socket path"),
- 
- 	AP_INIT_TAKE1("AuthMySQLUser", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqluser),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqluser),
- 	OR_AUTHCFG, "mysql server user name"),
- 
- 	AP_INIT_TAKE1("AuthMySQLPassword", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlpasswd),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlpasswd),
- 	OR_AUTHCFG, "mysql server user password"),
- 
- 	AP_INIT_TAKE1("AuthMySQLDB", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlDB),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlDB),
- 	OR_AUTHCFG, "mysql database name"),
- 
- 	AP_INIT_TAKE1("AuthMySQLUserTable", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlpwtable),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlpwtable),
- 	OR_AUTHCFG, "mysql user table name"),
- 
- 	AP_INIT_TAKE1("AuthMySQLGroupTable", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlgrptable),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlgrptable),
- 	OR_AUTHCFG, "mysql group table name"),
- 
- 	AP_INIT_TAKE1("AuthMySQLNameField", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlNameField),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlNameField),
- 	OR_AUTHCFG, "mysql User ID field name within User table"),
- 
- 	AP_INIT_TAKE1("AuthMySQLGroupField", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupField),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupField),
- 	OR_AUTHCFG, "mysql Group field name within table"),
- 
- 	AP_INIT_TAKE1("AuthMySQLGroupUserNameField", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupUserNameField),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupUserNameField),
- 	OR_AUTHCFG, "mysql User ID field name within Group table"),
- 
- 	AP_INIT_TAKE1("AuthMySQLPasswordField", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlPasswordField),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlPasswordField),
- 	OR_AUTHCFG, "mysql Password field name within table"),
- 
- 	AP_INIT_TAKE1("AuthMySQLPwEncryption", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEncryptionField),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEncryptionField),
- 	OR_AUTHCFG, "mysql password encryption method"),
- 
- 	AP_INIT_TAKE1("AuthMySQLSaltField", ap_set_string_slot,
--	(void*) APR_XtOffsetOf(mysql_auth_config_rec, mysqlSaltField),
-+	(void*) APR_OFFSETOF(mysql_auth_config_rec, mysqlSaltField),
- 	OR_AUTHCFG, "mysql salfe field name within table"),
- 
- /*	AP_INIT_FLAG("AuthMySQLKeepAlive", ap_set_flag_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlKeepAlive),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlKeepAlive),
- 	OR_AUTHCFG, "mysql connection kept open across requests if On"),
- */
- 	AP_INIT_FLAG("AuthMySQLAuthoritative", ap_set_flag_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlAuthoritative),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlAuthoritative),
- 	OR_AUTHCFG, "mysql lookup is authoritative if On"),
- 
- 	AP_INIT_FLAG("AuthMySQLNoPasswd", ap_set_flag_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlNoPasswd),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlNoPasswd),
- 	OR_AUTHCFG, "If On, only check if user exists; ignore password"),
- 
- 	AP_INIT_FLAG("AuthMySQLEnable", ap_set_flag_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlEnable),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlEnable),
- 	OR_AUTHCFG, "enable mysql authorization"),
- 
- 	AP_INIT_TAKE1("AuthMySQLUserCondition", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlUserCondition),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlUserCondition),
- 	OR_AUTHCFG, "condition to add to user where-clause"),
- 
- 	AP_INIT_TAKE1("AuthMySQLGroupCondition", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlGroupCondition),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlGroupCondition),
- 	OR_AUTHCFG, "condition to add to group where-clause"),
- 
- 	AP_INIT_TAKE1("AuthMySQLCharacterSet", ap_set_string_slot,
--	(void *) APR_XtOffsetOf(mysql_auth_config_rec, mysqlCharacterSet),
-+	(void *) APR_OFFSETOF(mysql_auth_config_rec, mysqlCharacterSet),
- 	OR_AUTHCFG, "mysql character set to be used"),
- 
-   { NULL }
diff --git a/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch b/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
deleted file mode 100644
index e7f6eb31ef3f..000000000000
--- a/net-www/mod_auth_mysql/files/mod_auth_mysql-3.0.0-htpasswd2-auth-style.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: mod_auth_mysql-3.0.0/mod_auth_mysql.c
-===================================================================
---- mod_auth_mysql-3.0.0.orig/mod_auth_mysql.c
-+++ mod_auth_mysql-3.0.0/mod_auth_mysql.c
-@@ -288,6 +288,7 @@ static short pw_crypted(POOL * pool, con
- static short pw_aes(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
- #endif
- static short pw_sha1(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
-+static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
- static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt);
- 
- static char * format_remote_host(request_rec * r, char ** parm);
-@@ -318,7 +319,8 @@ static encryption encryptions[] = {{"cry
- #if _AES
- 					   {"aes", SALT_REQUIRED, pw_aes},
- #endif
--					   {"sha1", NO_SALT, pw_sha1}};
-+					   {"sha1", NO_SALT, pw_sha1},
-+					   {"apr", NO_SALT, pw_apr}};
- typedef struct {		/* User formatting patterns */
-   char pattern;			/* Pattern to match */
-   char * (*func)(request_rec * r, char ** parm);
-@@ -856,6 +858,12 @@ static short pw_sha1(POOL * pool, const 
-   return  strcasecmp(bin2hex(pool, scrambled_sent_pw, enc_len), real_pw) == 0;
- }
- 
-+/* checks passwords from htpasswd */
-+static short pw_apr(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
-+  /* apr_password_validate will do the job */
-+  return apr_password_validate(sent_pw, real_pw) == APR_SUCCESS;
-+}
-+
- /* checks plain text passwords */
- static short pw_plain(POOL * pool, const char * real_pw, const char * sent_pw, const char * salt) {
-   return strcmp(real_pw, sent_pw) == 0;
diff --git a/net-www/mod_auth_mysql/metadata.xml b/net-www/mod_auth_mysql/metadata.xml
deleted file mode 100644
index 1bd30cf25759..000000000000
--- a/net-www/mod_auth_mysql/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>apache</herd>
-	<herd>mysql</herd>
-</pkgmetadata>
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild
deleted file mode 100644
index 3685e54444a3..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild,v 1.4 2007/01/13 20:25:36 chtekk Exp $
-
-inherit apache-module
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database."
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-
-DEPEND="virtual/mysql
-		sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
-APACHE1_MOD_CONF="12_mod_auth_mysql"
-APACHE1_MOD_DEFINE="AUTH_MYSQL"
-
-APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
-APACHE2_MOD_CONF="12_mod_auth_mysql"
-APACHE2_MOD_DEFINE="AUTH_MYSQL"
-
-DOCFILES="README"
-
-need_apache
-
-pkg_postinst() {
-	if ! useq apache2 ; then
-		elog "With regard to bug #132391 the behaviour of ${PN}"
-		elog "has changed for Apache-1.3.XX."
-		elog
-		elog "You now need to enable ${PN} in your .htaccess"
-		elog "files explicitely using:"
-		elog
-		elog "  AuthMySQLEnable On"
-	fi
-}
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
deleted file mode 100644
index c7f85cb6bf56..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.2 2007/01/13 20:25:36 chtekk Exp $
-
-inherit apache-module eutils
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database."
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-
-DEPEND="virtual/mysql
-		sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
-APACHE1_MOD_CONF="12_mod_auth_mysql"
-APACHE1_MOD_DEFINE="AUTH_MYSQL"
-
-APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
-APACHE2_MOD_CONF="12_mod_auth_mysql"
-APACHE2_MOD_DEFINE="AUTH_MYSQL"
-
-DOCFILES="README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-apache-2.2.patch"
-	EPATCH_OPTS="-d ${S} -p1" epatch "${FILESDIR}/${P}-htpasswd2-auth-style.patch"
-}
-
-pkg_postinst() {
-	if ! useq apache2 ; then
-		elog "With regard to bug #132391 the behaviour of ${PN}"
-		elog "has changed for Apache-1.3.XX."
-		elog
-		elog "You now need to enable ${PN} in your .htaccess"
-		elog "files explicitely using:"
-		elog
-		elog "  AuthMySQLEnable On"
-	fi
-}