cleanup

(Portage version: 2.0.51.16)

11 files changed, 16 insertions, 222 deletions

diff --git a/net-www/mod_auth_mysql/ChangeLog b/net-www/mod_auth_mysql/ChangeLog
index 31611fcf02c7..c920dd1809a5 100644
--- a/net-www/mod_auth_mysql/ChangeLog
+++ b/net-www/mod_auth_mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mod_auth_mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.14 2005/02/07 05:34:04 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.15 2005/02/17 14:27:38 hollow Exp $
+
+  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:
diff --git a/net-www/mod_auth_mysql/Manifest b/net-www/mod_auth_mysql/Manifest
index fe39899652f4..4e77b6c77e5f 100644
--- a/net-www/mod_auth_mysql/Manifest
+++ b/net-www/mod_auth_mysql/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a144242284dd083c67b55420fb799c05 ChangeLog 2246
+MD5 81acf2221a3cf125b815fd6b2eeeef13 ChangeLog 2476
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
-MD5 a3bbfc3e5a9cebb732a81b5fa20667f5 mod_auth_mysql-1.11.ebuild 935
-MD5 4076be0aa9f53b1d5027d16662f21309 mod_auth_mysql-2.8.1.ebuild 955
-MD5 41643b3eca1261d3fb283424e76ec683 mod_auth_mysql-20030510-r1.ebuild 1416
-MD5 ea0532e90f5517acabf683bbd587aff9 mod_auth_mysql-20030510-r2.ebuild 1500
-MD5 ac80c6c0aad9a293f57e56f33b6883e3 mod_auth_mysql-20030510.ebuild 1158
 MD5 fd8c8dd15bb4935e15f7e418cf69b296 mod_auth_mysql-2.0.0_pre20030510.ebuild 1508
+MD5 333040e9ac36d7abe38225bd8acd6ab6 mod_auth_mysql-2.8.1.ebuild 874
 MD5 01cc878ba30a6e2ad327de787e21a999 files/12_mod_auth_mysql.conf 3571
-MD5 3513e598048c0060eb3758c19c4e4c60 files/digest-mod_auth_mysql-1.11 77
+MD5 a9f56734948e06d5ed5f4b7eea9f6cd5 files/digest-mod_auth_mysql-2.0.0_pre20030510 61
 MD5 a6cfd8f7d972e23afa55e33bb478e1bc files/digest-mod_auth_mysql-2.8.1 71
-MD5 a9f56734948e06d5ed5f4b7eea9f6cd5 files/digest-mod_auth_mysql-20030510-r1 61
-MD5 a9f56734948e06d5ed5f4b7eea9f6cd5 files/digest-mod_auth_mysql-20030510-r2 61
 MD5 dd4f31c36839f4faadcf855915e348c3 files/mod_auth_mysql.patch 357
-MD5 a9f56734948e06d5ed5f4b7eea9f6cd5 files/digest-mod_auth_mysql-2.0.0_pre20030510 61
-MD5 a9f56734948e06d5ed5f4b7eea9f6cd5 files/digest-mod_auth_mysql-20030510 61
 MD5 d6baa28feeb088701ed677185d61b93d files/2.8.1/12_mod_auth_mysql.conf 3566
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCBv4LmPFBzbX68WERApHGAJ45lsJLpvAzXZIxQh9X7nD1fg9xBACgkWUj
-a/pC8NvwRoiqvIVL99bnTnA=
-=GfY1
------END PGP SIGNATURE-----
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-1.11 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-1.11
deleted file mode 100644
index 76e17c9d9ca9..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 612e92542015e5d176428edc28e2b2f1 mod_auth_mysql-1.11-gentoo.tar.bz2 7395
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510
deleted file mode 100644
index 7acd1a88ef08..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6646a117703b3704091e8f19f02e43e mod_auth_mysql.tgz 9953
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r1 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r1
deleted file mode 100644
index 7acd1a88ef08..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6646a117703b3704091e8f19f02e43e mod_auth_mysql.tgz 9953
diff --git a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r2 b/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r2
deleted file mode 100644
index 7acd1a88ef08..000000000000
--- a/net-www/mod_auth_mysql/files/digest-mod_auth_mysql-20030510-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6646a117703b3704091e8f19f02e43e mod_auth_mysql.tgz 9953
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-1.11.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-1.11.ebuild
deleted file mode 100644
index 95e1cf834383..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-1.11.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 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-1.11.ebuild,v 1.9 2005/01/22 04:19:38 trapni Exp $
-
-DESCRIPTION="Basic authentication for Apache2 using a MySQL database"
-HOMEPAGE="ftp://ftp.kciLink.com/pub/"
-
-SRC_URI="mirror://gentoo/mod_auth_mysql-1.11-gentoo.tar.bz2"
-DEPEND="=dev-db/mysql-3* =net-www/apache-2*"
-RDEPEND=""
-LICENSE="Apache-1.1"
-KEYWORDS="x86"
-IUSE=""
-SLOT="0"
-
-IUSE=""
-
-src_compile() {
-	apxs2 -c ${PN}.c -I/usr/include/mysql -Wl,-lmysqlclient || die
-}
-
-src_install() {
-	exeinto /usr/lib/apache2-extramodules
-	doexe .libs/${PN}.so
-	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/12_mod_auth_mysql.conf
-	cat mod_auth_mysql.c | tail -n +84 | head -n 101 \
-		| cut -c 4- > mod_auth_mysql.txt
-	dodoc ${FILESDIR}/12_mod_auth_mysql.conf \
-		mysql-group-auth.txt mod_auth_mysql.txt
-}
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-2.8.1.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-2.8.1.ebuild
index 8a5c081d67a4..1cb275af922f 100644
--- a/net-www/mod_auth_mysql/mod_auth_mysql-2.8.1.ebuild
+++ b/net-www/mod_auth_mysql/mod_auth_mysql-2.8.1.ebuild
@@ -1,34 +1,28 @@
 # Copyright 1999-2005 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-2.8.1.ebuild,v 1.1 2005/01/22 04:12:46 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-2.8.1.ebuild,v 1.2 2005/02/17 14:27:38 hollow Exp $
 
 inherit eutils apache-module
 
 DESCRIPTION="Basic authentication for Apache using a MySQL database"
 HOMEPAGE="http://modauthmysql.sourceforge.net/"
-
 SRC_URI="mirror://sourceforge/modauthmysql/${P}.tar.gz"
+
 DEPEND="dev-db/mysql"
-RDEPEND=""
 LICENSE="Apache-1.1"
 KEYWORDS="~x86"
 SLOT="0"
 
 BASE_CONFIG_PVR="2.8.1"
 
-# Dual Apache
-DOCFILES="README"
+APXS1_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
+APACHE1_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql"
+APACHE1_MOD_DEFINE="AUTH_MYSQL"
 
-# Apache 2.0
-APXS2_S="${S}"
 APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
 APACHE2_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql"
 APACHE2_MOD_DEFINE="AUTH_MYSQL"
 
-# Apache 1.x
-APXS1_S="${S}"
-APXS1_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c"
-APACHE1_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql"
-APACHE1_MOD_DEFINE="AUTH_MYSQL"
+DOCFILES="README"
 
 need_apache
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r1.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r1.ebuild
deleted file mode 100644
index cd9244025c7f..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2005 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-20030510-r1.ebuild,v 1.7 2005/01/22 04:19:38 trapni Exp $
-
-inherit eutils
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database"
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://sourceforge/modauthmysql/${PN}.tgz"
-DEPEND="dev-db/mysql
-		net-www/apache
-		apache2? ( >=net-www/apache-2* )"
-RDEPEND=""
-LICENSE="Apache-1.1"
-KEYWORDS="~x86"
-IUSE="apache2"
-SLOT="0"
-
-if use apache2 ; then
-	APXS="apxs2 -D APACHE2"
-	DESTDIR=/usr/lib/apache2-extramodules
-	CONFDIR=/etc/apache2/conf/modules.d
-else
-	APXS="apxs -D APACHE1"
-	DESTDIR=/usr/lib/apache-extramodules
-	CONFDIR=/etc/apache/conf/addon-modules
-fi
-
-src_compile() {
-	epatch ${FILESDIR}/mod_auth_mysql.patch || die
-	$APXS -c ${PN}.c -I/usr/include/mysql -lmysqlclient -lm -lz || die
-}
-
-src_install() {
-	exeinto $DESTDIR
-	doexe ${PN}.so
-	insinto ${CONFDIR}
-	doins ${FILESDIR}/mod_auth_mysql.conf
-	cat mod_auth_mysql.c | head -n81 \
-		| cut -c 4- > mod_auth_mysql.txt
-	dodoc ${FILESDIR}/mod_auth_mysql.conf \
-		README
-}
-
-pkg_postinst() {
-	if use apache2; then
-		einfo "Please add '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS setting"
-	else
-		einfo "Please add '-D AUTH_MYSQL' to your /etc/conf.d/apache APACHE_OPTS setting"
-	fi
-}
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r2.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r2.ebuild
deleted file mode 100644
index 425f92e0e39f..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-20030510-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 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-20030510-r2.ebuild,v 1.8 2005/01/22 04:19:38 trapni Exp $
-
-inherit eutils
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database"
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://sourceforge/modauthmysql/${PN}.tgz"
-DEPEND="dev-db/mysql
-		net-www/apache
-		apache2? ( >=net-www/apache-2* )"
-RDEPEND=""
-LICENSE="Apache-1.1"
-KEYWORDS="x86"
-IUSE="apache2"
-SLOT="0"
-
-if use apache2 ; then
-	APXS="apxs2 -D APACHE2"
-	DESTDIR=/usr/lib/apache2-extramodules
-	CONFDIR=/etc/apache2/conf/modules.d
-else
-	APXS="apxs -D APACHE1"
-	DESTDIR=/usr/lib/apache-extramodules
-	CONFDIR=/etc/apache/conf/addon-modules
-fi
-
-src_compile() {
-	epatch ${FILESDIR}/mod_auth_mysql.patch || die
-	$APXS -c ${PN}.c -I/usr/include/mysql -lmysqlclient -lm -lz || die
-}
-
-src_install() {
-	exeinto ${DESTDIR}
-	if use apache2 ; then
-		doexe .libs/${PN}.so
-	else
-		doexe ${PN}.so
-	fi
-	insinto ${CONFDIR}
-	doins ${FILESDIR}/12_mod_auth_mysql.conf
-	cat mod_auth_mysql.c | head -n 81 \
-		| cut -c 4- > mod_auth_mysql.txt
-	dodoc ${FILESDIR}/12_mod_auth_mysql.conf \
-		README mod_auth_mysql.txt
-}
-
-pkg_postinst() {
-	if use apache2; then
-		einfo "Please add '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS setting"
-	else
-		einfo "Please add '-D AUTH_MYSQL' to your /etc/conf.d/apache APACHE_OPTS setting"
-	fi
-}
diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-20030510.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-20030510.ebuild
deleted file mode 100644
index cd2f28ac6921..000000000000
--- a/net-www/mod_auth_mysql/mod_auth_mysql-20030510.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 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-20030510.ebuild,v 1.10 2005/02/07 05:34:04 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="Basic authentication for Apache using a MySQL database"
-HOMEPAGE="http://modauthmysql.sourceforge.net/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://sourceforge/modauthmysql/${PN}.tgz"
-DEPEND="dev-db/mysql =net-www/apache-2*"
-RDEPEND=""
-LICENSE="Apache-1.1"
-KEYWORDS="x86"
-IUSE="apache2"
-SLOT="0"
-
-if use apache2; then
-	APXS="apxs2 -D APACHE2"
-else
-	APXS="apxs -D APACHE1"
-fi
-
-src_compile() {
-	epatch ${FILESDIR}/mod_auth_mysql.patch || die
-	$APXS -c ${PN}.c -I/usr/include/mysql -lmysqlclient -lm -lz || die
-}
-
-src_install() {
-	exeinto /usr/lib/apache2-extramodules
-	doexe .libs/${PN}.so
-	insinto /etc/apache2/conf/modules.d
-	doins ${FILESDIR}/12_mod_auth_mysql.conf
-	cat mod_auth_mysql.c | head -n81 \
-		| cut -c 4- > mod_auth_mysql.txt
-	dodoc ${FILESDIR}/12_mod_auth_mysql.conf \
-		README
-}
-
-pkg_postinst() {
-	einfo "Please add '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS setting"
-}