New tarball, Updateed URLs for package refresh information

(Portage version: 2.0.51-r15)

5 files changed, 23 insertions, 14 deletions

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 216aff1a878a..1c9955e0c90f 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -14,8 +14,8 @@ MD5 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
 MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
 MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
-MD5 5da58f4c092827dc8d7caabfe74873f3 apache-1.3.33-r1.ebuild 8389
-MD5 5ad42483dd3e11f7d26f8803ee3103f9 apache-2.0.52-r3.ebuild 11513
+MD5 0fba3c96dfbfc0a5c0633d58429f1302 apache-1.3.33-r1.ebuild 8631
+MD5 cae90359f2db62aaf374edc3e4bc7e6f apache-2.0.52-r3.ebuild 11546
 MD5 8b12871dd74fcd3f4fdf451c9d8c259e files/00_apache_manual.conf 781
 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328
 MD5 37d2c4ea8e1a6725deaca42b6aa22c69 files/apache-1.3.27_db4_gentoo.patch 1006
@@ -52,8 +52,8 @@ MD5 59a6ba7dcde461f5350af41e6aff92b1 files/robots.txt 342
 MD5 d3626a1e31a675c60d066c111d552adf files/suexec.pam 59
 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149
 MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
-MD5 79c0867c4eda5d77cafe6eecbfbe6c11 files/digest-apache-1.3.33-r1 286
-MD5 29617c95470cf855d7425ab7e26230d6 files/digest-apache-2.0.52-r3 150
+MD5 50210f78375e8db82dab7e575bcf1266 files/digest-apache-1.3.33-r1 286
+MD5 49d97edfd02ec824cb3d7f26d80886be files/digest-apache-2.0.52-r3 150
 MD5 3d94c56af17136b6c408f076c32e0362 files/2.0.49/40_mod_ssl.conf 3213
 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053
 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index cb8e7dca520a..1668e2985e95 100644
--- a/net-www/apache/apache-1.3.33-r1.ebuild
+++ b/net-www/apache/apache-1.3.33-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.6 2005/02/08 04:45:45 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.7 2005/02/13 02:21:32 vericgar Exp $
 
 inherit eutils fixheadtails
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050207"
+GENTOO_PATCHSTAMP="20050212"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 # The mod_ssl archive is only for providing the EAPI patch in here.
@@ -24,7 +24,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
-IUSE="doc ssl pam lingerd no-suexec static-modules"
+IUSE="doc ssl pam lingerd no-suexec static-modules apache2"
 
 DEPEND="dev-lang/perl
 		>=sys-libs/db-1.85-r1
@@ -250,7 +250,15 @@ pkg_postinst() {
 		einfo "if it exists. You must remove the old configuration first"
 		einfo
 		einfo "For more information, see"
-		einfo "        http://dev.gentoo.org/~vericgar/package-refresh.txt"
+		einfo "  http://dev.gentoo.org/~vericgar/doc/apache-package-refresh.html"
+		einfo
+	fi
+
+	if use apache2 ; then
+		ewarn "You have apache2 in USE. Any modules that you"
+		ewarn "install may depend on apache-2.* instead of"
+		ewarn "apache-1*. It's recommended that you remove"
+		ewarn "apache2 from USE."
 	fi
 
 
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index 5cd203d6f4c1..951fd347472f 100644
--- a/net-www/apache/apache-2.0.52-r3.ebuild
+++ b/net-www/apache/apache-2.0.52-r3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.7 2005/02/08 04:45:45 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.8 2005/02/13 02:21:32 vericgar Exp $
 
 inherit eutils gnuconfig
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050207"
+GENTOO_PATCHSTAMP="20050212"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 DESCRIPTION="The Apache Web Server, Version 2.0.x"
@@ -272,7 +272,7 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	if has_version '=net-www/apache-1*' ; then
+	if has_version '=net-www/apache-1*' || ! use apache2 ; then
 		ewarn
 		ewarn "Please add the 'apache2' flag to your USE variable and (re)install"
 		ewarn "any additional DSO modules you may wish to use with Apache-2.x."
@@ -308,7 +308,8 @@ pkg_postinst() {
 		einfo "You should also at this time rebuild all your modules"
 		einfo
 		einfo "For more information, see"
-		einfo "        http://dev.gentoo.org/~vericgar/package-refresh.txt"
+		einfo "    http://dev.gentoo.org/~vericgar/doc/apache-package-refresh.html"
+		einfo
 	fi
 }
 
diff --git a/net-www/apache/files/digest-apache-1.3.33-r1 b/net-www/apache/files/digest-apache-1.3.33-r1
index 2a56cd3495ed..4a3dec976547 100644
--- a/net-www/apache/files/digest-apache-1.3.33-r1
+++ b/net-www/apache/files/digest-apache-1.3.33-r1
@@ -1,4 +1,4 @@
 MD5 3dfd2c3778f37a2dfc22b97417a61407 apache_1.3.33.tar.gz 2468567
 MD5 cdfdf1f576f77768c90825b43b462405 mod_ssl-2.8.22-1.3.33.tar.gz 754606
 MD5 6401015bafad4f44fdf8a9a1795d9258 lingerd-0.94.tar.gz 33938
-MD5 c087dec21281cee640613d39ca2f7860 gentoo-apache-1.3.33-r1-20050207.tar.bz2 27182
+MD5 d64d825cd256aab114f0e5d0b5264714 gentoo-apache-1.3.33-r1-20050212.tar.bz2 27193
diff --git a/net-www/apache/files/digest-apache-2.0.52-r3 b/net-www/apache/files/digest-apache-2.0.52-r3
index 3bfce8568c56..dbb1d542e012 100644
--- a/net-www/apache/files/digest-apache-2.0.52-r3
+++ b/net-www/apache/files/digest-apache-2.0.52-r3
@@ -1,2 +1,2 @@
 MD5 0e1b47c53921a1fc8fb006effdb3bf1c httpd-2.0.52.tar.bz2 5187776
-MD5 b266e05181caedc1176ab87b08be845e gentoo-apache-2.0.52-r3-20050207.tar.bz2 62241
+MD5 6a77570c5bd07fe6b3c3b4f7ab1ad5d6 gentoo-apache-2.0.52-r3-20050212.tar.bz2 62284