Updated patchball.

Package-Manager: portage-2.0.51.16

6 files changed, 32 insertions, 15 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 5b07a16b4f07..e0d8cc1e0e5c 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.317 2005/02/05 09:03:20 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.318 2005/02/18 03:27:29 beu Exp $
+
+  18 Feb 2005; Elfyn McBratney <beu@gentoo.org> apache-1.3.33-r1.ebuild,
+  apache-2.0.52-r3.ebuild:
+  Updated patchball (apachectl now exits with an error if lynx is not installed).
 
   05 Feb 2005; Christian Parpart <trapni@gentoo.org>
   apache-1.3.33-r1.ebuild, apache-2.0.52-r3.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 4be90df15360..62ca3bd7079c 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,4 +1,7 @@
-MD5 18c85760a4f9afd7c233734e165e34d0 ChangeLog 53891
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 039b3ce87c24e835eace635753e27abb ChangeLog 54071
 MD5 784b3e3150529826ac47e99ec3514f90 apache-1.3.29-r2.ebuild 7178
 MD5 f35b6a00cbfa7ddd39face3420cd4fc6 apache-1.3.31-r1.ebuild 6739
 MD5 9a5242011f95057c3afabf1cc3973f11 apache-1.3.31-r2.ebuild 6864
@@ -6,16 +9,16 @@ MD5 85c356965e12f6c785c887ddf6844714 apache-1.3.31-r3.ebuild 6872
 MD5 d039a8316ffde50c2331f0d446623147 apache-1.3.31.ebuild 6693
 MD5 eb0434ac86c30471d86c92872015e42d apache-1.3.32-r1.ebuild 6607
 MD5 cd6aff6c1515610209f5e62e56ea47f8 apache-1.3.32.ebuild 6616
+MD5 9d86817814cf5b4a4a3624d7603ef16a apache-1.3.33-r1.ebuild 8704
 MD5 a6568a1f276ed27458ab61fb5897bca2 apache-1.3.33.ebuild 6851
 MD5 511fffcacde823eaf727f0984568106b apache-2.0.50.ebuild 12905
 MD5 6f88208cb336bbe5da0a50b08b1e6390 apache-2.0.51-r1.ebuild 12840
 MD5 451d45c9613e9ed7ee770085a8e28ef8 apache-2.0.51.ebuild 12831
 MD5 625b80716912a469762650ef8480fde5 apache-2.0.52-r1.ebuild 12893
+MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
+MD5 44ca3ddc33aa951ebdbe602b7ae48131 apache-2.0.52-r3.ebuild 11643
 MD5 b1af5f9fb89636fb427805dfe9a3621c apache-2.0.52.ebuild 12834
 MD5 a419841198cd6a94b9dcf2e07f3c15b7 metadata.xml 617
-MD5 0bc87f432d6353df99d4ca1192dbb607 apache-2.0.52-r2.ebuild 12298
-MD5 9aee4237ebce9eb5c6ac51e350dbfcdd apache-1.3.33-r1.ebuild 8631
-MD5 4601a12ecb9ef5440edd327524d0f545 apache-2.0.52-r3.ebuild 11554
 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
@@ -40,20 +43,20 @@ MD5 8cc0834ac7a8afa694ddb3f9f9be2cc8 files/digest-apache-1.3.31-r3 139
 MD5 da8dfe2134d7e30dc95e77e0c5f472e1 files/digest-apache-1.3.32 212
 MD5 c560ade7dafffbfdd05ec6deb125280b files/digest-apache-1.3.32-r1 215
 MD5 189cfb35b6320ae3ab57a32dbadd18f2 files/digest-apache-1.3.33 212
+MD5 975bf0a5232f78d45ab4d3c8dca2ac8f files/digest-apache-1.3.33-r1 286
 MD5 cb82ab66045d6f309af686c0206fc3c0 files/digest-apache-2.0.50 201
 MD5 69d40992fa9301ce3198a0115fa1f31c files/digest-apache-2.0.51 137
 MD5 0eb9067bb4f2c2495069deaa9d7fce1b files/digest-apache-2.0.51-r1 140
 MD5 baf37cd1bc61f76ac73edd301f52decb files/digest-apache-2.0.52 201
 MD5 44fc8ddc9a05a056d8a08e6d843c997c files/digest-apache-2.0.52-r1 204
+MD5 710e7291039a6cba132568e32daede8a files/digest-apache-2.0.52-r2 213
+MD5 891f842545098a8eca9fa61cb91f6f4b files/digest-apache-2.0.52-r3 150
 MD5 b9ff3534313dae1b8ac96df0e3e01373 files/httpd-2.0.48-ipv6.patch 865
 MD5 d52999376f67a872ee48cbae72db0160 files/httpd-2.0.49-cgi.patch 10319
 MD5 8cb4313e58d7bd5dc369eb92f75daa2b files/httpd-2.0.49-ipv6.patch 788
 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 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
@@ -92,3 +95,10 @@ MD5 30add456de1ed8fab4bc473a4afda161 files/patches/2.0.49-r1/04_ssl_makefile.pat
 MD5 21a6ee55341125140e40c0f48144277d files/patches/2.0.49-r1/Readme.PATCHES 507
 MD5 d52999376f67a872ee48cbae72db0160 files/patches/2.0.49-r2/01_gentoo_cgi.patch 10319
 MD5 5d45e2b46965e7c6866b259df4efe4b2 files/patches/2.0.50-r1/Readme.PATCHES 357
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCFWC7jUHll2nfF60RAiQSAJ0T4XDqsyiV6cVS8NmHw/1tSCk4iQCcD1KF
+5rcIqrqaUgCKH/KwJDaUaaU=
+=HSSw
+-----END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-1.3.33-r1.ebuild b/net-www/apache/apache-1.3.33-r1.ebuild
index 1668e2985e95..2ed662bd15d0 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.7 2005/02/13 02:21:32 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.33-r1.ebuild,v 1.8 2005/02/18 03:27:29 beu Exp $
 
 inherit eutils fixheadtails
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050212"
+GENTOO_PATCHSTAMP="20050218"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 # The mod_ssl archive is only for providing the EAPI patch in here.
@@ -19,6 +19,7 @@ HOMEPAGE="http://httpd.apache.org"
 SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 		ssl? ( ftp://ftp.modssl.org/source/mod_ssl-${mod_ssl_ver}-${PV}.tar.gz )
 		lingerd? ( http://images.iagora.com/media/software/lingerd/lingerd-${lingerd_ver}.tar.gz )
+		http://dev.gentoo.org/~beu/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
 		mirror://gentoo/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
 
 LICENSE="Apache-2.0"
diff --git a/net-www/apache/apache-2.0.52-r3.ebuild b/net-www/apache/apache-2.0.52-r3.ebuild
index ae2a015a764f..2eb4e4659ec3 100644
--- a/net-www/apache/apache-2.0.52-r3.ebuild
+++ b/net-www/apache/apache-2.0.52-r3.ebuild
@@ -1,18 +1,19 @@
 # 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.9 2005/02/13 05:00:13 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.52-r3.ebuild,v 1.10 2005/02/18 03:27:29 beu Exp $
 
 inherit eutils gnuconfig
 
 # latest gentoo apache files
 GENTOO_PATCHNAME="gentoo-apache-${PVR}"
-GENTOO_PATCHSTAMP="20050212"
+GENTOO_PATCHSTAMP="20050218"
 GENTOO_PATCHDIR="${WORKDIR}/${GENTOO_PATCHNAME}"
 
 DESCRIPTION="The Apache Web Server, Version 2.0.x"
 HOMEPAGE="http://httpd.apache.org/"
 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
-		mirror://gentoo/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
+	http://dev.gentoo.org/~beu/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2
+	mirror://gentoo/${GENTOO_PATCHNAME}-${GENTOO_PATCHSTAMP}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="2"
@@ -22,6 +23,7 @@ IUSE="apache2 doc ldap mpm-leader mpm-metux mpm-peruser mpm-prefork mpm-threadpo
 DEPEND="dev-lang/perl
 		=dev-libs/apr-0.9.5
 		=dev-libs/apr-util-0.9.5
+		dev-libs/expat
 		net-www/gentoo-webroot-default
 		app-misc/mime-types
 		sys-libs/zlib
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 4a3dec976547..356e7e523459 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 d64d825cd256aab114f0e5d0b5264714 gentoo-apache-1.3.33-r1-20050212.tar.bz2 27193
+MD5 8cb5da9fe4bc27a8cff9cdde55fcf477 gentoo-apache-1.3.33-r1-20050218.tar.bz2 27510
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 dbb1d542e012..c2b809deaa1f 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 6a77570c5bd07fe6b3c3b4f7ab1ad5d6 gentoo-apache-2.0.52-r3-20050212.tar.bz2 62284
+MD5 b96f47e2f4f1870660fba31dd64ffdb0 gentoo-apache-2.0.52-r3-20050218.tar.bz2 62505