fix dependencies for Apache-1*

19 files changed, 22 insertions, 408 deletions

diff --git a/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild b/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
index 31abbaf932a4..421a123ba381 100644
--- a/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
+++ b/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild,v 1.4 2002/10/04 06:19:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_contribs/mod_contribs-1.0.8-r1.ebuild,v 1.5 2002/11/29 11:42:42 woodchip Exp $
 
 # The mod_layout and mod_random that come in the archive are really old,
 # so I've replaced them with more current versions.
@@ -16,7 +16,7 @@ SRC_URI="http://www.apache.org/dist/httpd/contrib/modules/1.3/apache-contrib-${P
 	http://software.tangent.org/download/mod_layout-${mod_layout_ver}.tar.gz
 	http://software.tangent.org/download/mod_random-${mod_random_ver}.tar.gz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24"
+DEPEND="virtual/glibc =net-www/apache-1*"
 LICENSE="Apache-1.1"
 SLOT="0"
 
diff --git a/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild b/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild
index ad41be105789..4067bfdfa43c 100644
--- a/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild
+++ b/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild,v 1.4 2002/10/04 06:19:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_dav/mod_dav-1.0.3-r1.ebuild,v 1.5 2002/11/29 11:42:42 woodchip Exp $
 
 MY_V=${PV}-1.3.6
 
@@ -11,7 +11,7 @@ KEYWORDS="x86 sparc sparc64"
 S=${WORKDIR}/${PN}-${MY_V}
 SRC_URI="http://www.webdav.org/mod_dav/${PN}-${MY_V}.tar.gz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24"
+DEPEND="virtual/glibc =net-www/apache-1*"
 LICENSE="as-is"
 SLOT="0"
 
diff --git a/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild b/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild
index e44cec30e4e0..ac5ba78f5af6 100644
--- a/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild
+++ b/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild,v 1.4 2002/10/04 06:20:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_gzip/mod_gzip-1.3.19.1a-r1.ebuild,v 1.5 2002/11/29 11:42:42 woodchip Exp $
 
 DESCRIPTION="Apache module which acts as an Internet Content Accelerator"
 HOMEPAGE="http://www.remotecommunications.com/apache/mod_gzip/"
@@ -9,7 +9,7 @@ KEYWORDS="x86 sparc sparc64"
 S=${WORKDIR}/${P}
 SRC_URI="http://www.remotecommunications.com/apache/${PN}/src/${PV}/${PN}.c.gz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24 >=sys-libs/zlib-1.1.4"
+DEPEND="virtual/glibc =net-www/apache-1* >=sys-libs/zlib-1.1.4"
 LICENSE="Apache-1.1"
 SLOT="0"
 
diff --git a/net-www/mod_mp3/ChangeLog b/net-www/mod_mp3/ChangeLog
index 149d61b76bad..3026ca468bbb 100644
--- a/net-www/mod_mp3/ChangeLog
+++ b/net-www/mod_mp3/ChangeLog
@@ -1,29 +1,23 @@
 # ChangeLog for net-www/mod_mp3
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/ChangeLog,v 1.5 2002/11/01 10:03:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/ChangeLog,v 1.6 2002/11/29 11:42:42 woodchip Exp $
 
 *mod_mp3-0.39 (01 Nov 2002)
 
-  01 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
-  Version bump.
+  01 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> : Version bump.
 
 *mod_mp3-0.35-r2 (27 Aug 2002)
 
-  27 Aug 2002; Achim Gottinger <achim@gentoo.org> mod_mp3-0.35-r1.ebuild :
-
-  Added mysql support
+  27 Aug 2002; Achim Gottinger <achim@gentoo.org> : Added mysql support.
 
 *mod_mp3-0.35-r1 (4 May 2002)
 
-  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> mod_mp3-0.35-r1.ebuild :
-  Added KEYWORDS.
+  14 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> : Added KEYWORDS.
   
-  4 May 2002; Donny Davies <woodchip@gentoo.org> :
-
-  Added LICENSE, SLOT, clarify the pkg_postinst message.
+  4 May 2002; Donny Davies <woodchip@gentoo.org> : Added LICENSE,
+  SLOT, clarify the pkg_postinst message.
 
 *mod_mp3-0.35 (9 Apr 2002)
 
   9 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
   New package to go along with the rewritten apache ebuild.
diff --git a/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild b/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
index d49e3d520b8d..718f249a9354 100644
--- a/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild,v 1.4 2002/10/04 06:20:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r1.ebuild,v 1.5 2002/11/29 11:42:42 woodchip Exp $
 
 DESCRIPTION="Module for turning Apache into an MP3 or Ogg streaming server"
 HOMEPAGE="http://media.tangent.org/"
@@ -9,7 +9,7 @@ KEYWORDS="x86 sparc sparc64"
 S=${WORKDIR}/${P}
 SRC_URI="http://software.tangent.org/download/${P}.tar.gz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24 sys-devel/perl"
+DEPEND="virtual/glibc =net-www/apache-1* sys-devel/perl"
 LICENSE="as-is"
 SLOT="0"
 
diff --git a/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild b/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
index a188ad372764..74cc7e56dc29 100644
--- a/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild,v 1.3 2002/10/05 05:39:24 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.35-r2.ebuild,v 1.4 2002/11/29 11:42:42 woodchip Exp $
 
 IUSE="mysql"
 
@@ -11,7 +11,7 @@ KEYWORDS="x86"
 S=${WORKDIR}/${P}
 SRC_URI="http://software.tangent.org/download/${P}.tar.gz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24 sys-devel/perl
+DEPEND="virtual/glibc =net-www/apache-1* sys-devel/perl
 	mysql? ( >=dev-db/mysql-3.23.26 )"
 
 LICENSE="as-is"
diff --git a/net-www/mod_mp3/mod_mp3-0.39.ebuild b/net-www/mod_mp3/mod_mp3-0.39.ebuild
index 678527c6110c..4b4113ceb447 100644
--- a/net-www/mod_mp3/mod_mp3-0.39.ebuild
+++ b/net-www/mod_mp3/mod_mp3-0.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.1 2002/11/01 10:03:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_mp3/mod_mp3-0.39.ebuild,v 1.2 2002/11/29 11:42:42 woodchip Exp $
 
 IUSE="mysql postgres"
 
@@ -12,7 +12,7 @@ S=${WORKDIR}/${P}
 SRC_URI="http://software.tangent.org/download/${P}.tar.gz"
 
 DEPEND="virtual/glibc 
-	>=net-www/apache-1.3.24 
+	=net-www/apache-1*
 	sys-devel/perl
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	postgres? ( dev-db/postgresql )"
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.10 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.10
deleted file mode 100644
index 2e23236f8db5..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 11260700ab52fb7ff54a25f14052eed4 mod_ssl-2.8.10-1.3.26.tar.gz 753241
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.11 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.11
deleted file mode 100644
index d887223babe3..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f84bd971aa8db28f31ad6bab2e7acc2c mod_ssl-2.8.11-1.3.27.tar.gz 753416
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.8-r1 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.8-r1
deleted file mode 100644
index a66efcbff2ff..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a48e8b5878f221694983747e60973662 mod_ssl-2.8.8-1.3.24.tar.gz 752322
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.9 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.9
deleted file mode 100644
index f54951b9c020..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aad438a4eaeeee29ae74483f7afe9db0 mod_ssl-2.8.9-1.3.26.tar.gz 752613
diff --git a/net-www/mod_ssl/files/digest-mod_ssl-2.8.9-r1 b/net-www/mod_ssl/files/digest-mod_ssl-2.8.9-r1
deleted file mode 100644
index f54951b9c020..000000000000
--- a/net-www/mod_ssl/files/digest-mod_ssl-2.8.9-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aad438a4eaeeee29ae74483f7afe9db0 mod_ssl-2.8.9-1.3.26.tar.gz 752613
diff --git a/net-www/mod_ssl/mod_ssl-2.8.10.ebuild b/net-www/mod_ssl/mod_ssl-2.8.10.ebuild
deleted file mode 100644
index 68dc06fecbf5..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.10.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.10.ebuild,v 1.5 2002/10/04 06:20:08 vapier Exp $
-
-MY_P=${P}-1.3.26
-
-DESCRIPTION="An SSL module for the Apache Web server"
-HOMEPAGE="http://www.modssl.org"
-KEYWORDS="x86 ppc sparc sparc64"
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
-
-DEPEND="virtual/glibc =net-www/apache-1.3.26* >=dev-libs/openssl-0.9.6c"
-LICENSE="as-is"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# proper path to openssl
-	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
-	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
-		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
-}
-
-src_compile() {
-	SSL_BASE=SYSTEM \
-	./configure \
-		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe pkg.sslmod/libssl.so
-
-	exeinto /usr/lib/ssl/mod_ssl
-	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
-
-	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
-	mkdir -p ${D}/usr/share/doc/${PF}/html
-	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/ssl.default-vhost.conf
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_ssl.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-
-	cd ${ROOT}/etc/apache/conf/ssl
-	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
-	einfo "(Ignore any message from the yes command below)"
-	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libssl.so mod_ssl.c ssl_module \
-		define=SSL addconf=conf/addon-modules/mod_ssl.conf
-
-	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.11.ebuild b/net-www/mod_ssl/mod_ssl-2.8.11.ebuild
deleted file mode 100644
index 348eeb4e701f..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.11.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.11.ebuild,v 1.1 2002/10/10 19:38:50 vapier Exp $
-
-MY_P=${P}-1.3.27
-
-DESCRIPTION="An SSL module for the Apache Web server"
-HOMEPAGE="http://www.modssl.org"
-KEYWORDS="x86 ppc sparc sparc64"
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
-
-DEPEND="virtual/glibc =net-www/apache-1.3.27* >=dev-libs/openssl-0.9.6c"
-LICENSE="as-is"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# proper path to openssl
-	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
-	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
-		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
-}
-
-src_compile() {
-	SSL_BASE=SYSTEM \
-	./configure \
-		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe pkg.sslmod/libssl.so
-
-	exeinto /usr/lib/ssl/mod_ssl
-	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
-
-	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
-	mkdir -p ${D}/usr/share/doc/${PF}/html
-	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/ssl.default-vhost.conf
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_ssl.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-
-	cd ${ROOT}/etc/apache/conf/ssl
-	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
-	einfo "(Ignore any message from the yes command below)"
-	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libssl.so mod_ssl.c ssl_module \
-		define=SSL addconf=conf/addon-modules/mod_ssl.conf
-
-	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.12.ebuild b/net-www/mod_ssl/mod_ssl-2.8.12.ebuild
index 1bed5a95e1f6..cb3c9e7d08b0 100644
--- a/net-www/mod_ssl/mod_ssl-2.8.12.ebuild
+++ b/net-www/mod_ssl/mod_ssl-2.8.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.12.ebuild,v 1.1 2002/10/27 00:10:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.12.ebuild,v 1.2 2002/11/29 11:42:42 woodchip Exp $
 
 MY_P=${P}-1.3.27
 
@@ -11,7 +11,7 @@ KEYWORDS="x86 ppc sparc sparc64"
 S=${WORKDIR}/${MY_P}
 SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
 
-DEPEND="virtual/glibc =net-www/apache-1.3.27* >=dev-libs/openssl-0.9.6c"
+DEPEND="=net-www/apache-1* >=dev-libs/openssl-0.9.6c"
 LICENSE="as-is"
 SLOT="0"
 
diff --git a/net-www/mod_ssl/mod_ssl-2.8.8-r1.ebuild b/net-www/mod_ssl/mod_ssl-2.8.8-r1.ebuild
deleted file mode 100644
index 3ce2b265890e..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.8-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.8-r1.ebuild,v 1.4 2002/10/04 06:20:11 vapier Exp $
-
-MY_P=${P}-1.3.24
-
-DESCRIPTION="An SSL module for the Apache Web server"
-HOMEPAGE="http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
-
-DEPEND="virtual/glibc >=net-www/apache-1.3.24 >=dev-libs/openssl-0.9.6c"
-LICENSE="as-is"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# proper path to openssl
-	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
-	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
-		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
-}
-
-src_compile() {
-	SSL_BASE=SYSTEM \
-	./configure \
-		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe pkg.sslmod/libssl.so
-
-	exeinto /usr/lib/ssl/mod_ssl
-	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
-
-	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
-	mkdir -p ${D}/usr/share/doc/${PF}/html
-	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/ssl.default-vhost.conf
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_ssl.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-
-	cd ${ROOT}/etc/apache/conf/ssl
-	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
-	einfo "(Ignore any message from the yes command below)"
-	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libssl.so mod_ssl.c ssl_module \
-		define=SSL addconf=conf/addon-modules/mod_ssl.conf
-
-	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.9-r1.ebuild b/net-www/mod_ssl/mod_ssl-2.8.9-r1.ebuild
deleted file mode 100644
index 34659698e523..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.9-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.9-r1.ebuild,v 1.5 2002/10/04 06:20:16 vapier Exp $
-
-MY_P=${P}-1.3.26
-
-DESCRIPTION="An SSL module for the Apache Web server"
-HOMEPAGE="http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
-
-DEPEND="virtual/glibc =net-www/apache-1.3.26* >=dev-libs/openssl-0.9.6c"
-LICENSE="as-is"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# proper path to openssl
-	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
-	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
-		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
-}
-
-src_compile() {
-	SSL_BASE=SYSTEM \
-	./configure \
-		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe pkg.sslmod/libssl.so
-
-	exeinto /usr/lib/ssl/mod_ssl
-	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
-
-	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
-	mkdir -p ${D}/usr/share/doc/${PF}/html
-	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/ssl.default-vhost.conf
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_ssl.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-
-	cd ${ROOT}/etc/apache/conf/ssl
-	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
-	einfo "(Ignore any message from the yes command below)"
-	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libssl.so mod_ssl.c ssl_module \
-		define=SSL addconf=conf/addon-modules/mod_ssl.conf
-
-	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-www/mod_ssl/mod_ssl-2.8.9.ebuild b/net-www/mod_ssl/mod_ssl-2.8.9.ebuild
deleted file mode 100644
index 0c871200ab11..000000000000
--- a/net-www/mod_ssl/mod_ssl-2.8.9.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ssl/mod_ssl-2.8.9.ebuild,v 1.4 2002/10/04 06:20:18 vapier Exp $
-
-MY_P=${P}-1.3.26
-
-DESCRIPTION="An SSL module for the Apache Web server"
-HOMEPAGE="http://www.modssl.org"
-KEYWORDS="x86 sparc sparc64"
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="http://www.modssl.org/source/${MY_P}.tar.gz"
-
-DEPEND="virtual/glibc =net-www/apache-1.3.26 >=dev-libs/openssl-0.9.6c"
-LICENSE="as-is"
-SLOT="0"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	# proper path to openssl
-	cp pkg.contrib/cca.sh pkg.contrib/cca.sh.orig
-	sed -e 's%^\(openssl=\).*%\1"/usr/bin/openssl"%' \
-		pkg.contrib/cca.sh.orig > pkg.contrib/cca.sh
-}
-
-src_compile() {
-	SSL_BASE=SYSTEM \
-	./configure \
-		--with-apxs=/usr/sbin/apxs || die "bad ./configure"
-	make || die "compile problem"
-}
-
-src_install() {
-	exeinto /usr/lib/apache-extramodules
-	doexe pkg.sslmod/libssl.so
-
-	exeinto /usr/lib/ssl/mod_ssl
-	doexe pkg.contrib/*.sh ${FILESDIR}/gentestcrt.sh
-
-	dodoc ANNOUNCE CHANGES CREDITS LICENSE NEWS README*
-	mkdir -p ${D}/usr/share/doc/${PF}/html
-	cp -a pkg.ssldoc/* ${D}/usr/share/doc/${PF}/html
-
-	insinto /etc/apache/conf/vhosts
-	doins ${FILESDIR}/ssl.default-vhost.conf
-
-	insinto /etc/apache/conf/addon-modules
-	doins ${FILESDIR}/mod_ssl.conf
-}
-
-pkg_postinst() {
-	install -d -o root -g root -m0755 ${ROOT}/etc/apache/conf/ssl
-
-	einfo
-	einfo "Execute \"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
-	einfo "to have your apache.conf auto-updated for use with this module."
-	einfo "You should then edit your /etc/conf.d/apache file to suit."
-	einfo
-
-	cd ${ROOT}/etc/apache/conf/ssl
-	einfo "Generating self-signed test certificate in /etc/apache/conf/ssl..."
-	einfo "(Ignore any message from the yes command below)"
-	yes "" | ${ROOT}/usr/lib/ssl/mod_ssl/gentestcrt.sh >/dev/null 2>&1
-	einfo
-}
-
-pkg_config() {
-	${ROOT}/usr/sbin/apacheaddmod \
-		${ROOT}/etc/apache/conf/apache.conf \
-		extramodules/libssl.so mod_ssl.c ssl_module \
-		define=SSL addconf=conf/addon-modules/mod_ssl.conf
-
-	echo "Include  conf/vhosts/ssl.default-vhost.conf" \
-		>> ${ROOT}/etc/apache/conf/apache.conf
-}
diff --git a/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild b/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild
index 11f2eca51d69..6d782ded4484 100644
--- a/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild
+++ b/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild,v 1.4 2002/10/04 06:20:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_throttle/mod_throttle-3.1.2-r1.ebuild,v 1.5 2002/11/29 11:42:42 woodchip Exp $
 
 DESCRIPTION="Bandwidth and request throttling for Apache"
 HOMEPAGE="http://www.snert.com/Software/mod_throttle/"
@@ -10,7 +10,7 @@ MY_V="`echo ${PV} | sed -e 's:\.::g'`"
 S=${WORKDIR}/${P}
 SRC_URI="http://www.snert.com/Software/${PN}/${PN}${MY_V}.tgz"
 
-DEPEND="virtual/glibc >=net-www/apache-1.3.24"
+DEPEND="=net-www/apache-1*"
 LICENSE="as-is"
 SLOT="0"