summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-09-02 14:48:10 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-09-02 14:48:10 +0000
commit585d868089329398e399e2a57c6c68bb4029e470 (patch)
treedcae0f7538b47664598d8e0e9c43aa3e7135424d
parentalpha stable wrt #190775, thanks to Tobias Klausmann for testing (diff)
downloadgentoo-2-585d868089329398e399e2a57c6c68bb4029e470.tar.gz
gentoo-2-585d868089329398e399e2a57c6c68bb4029e470.tar.bz2
gentoo-2-585d868089329398e399e2a57c6c68bb4029e470.zip
fix #190966
(Portage version: 2.1.3.7)
-rw-r--r--www-servers/apache/ChangeLog8
-rw-r--r--www-servers/apache/apache-2.0.59-r5.ebuild5
2 files changed, 6 insertions, 7 deletions
diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 7e1e3b531761..e21bff844072 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,14 +1,14 @@
# ChangeLog for www-servers/apache
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.14 2007/09/02 14:03:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.15 2007/09/02 14:48:10 hollow Exp $
+
+ 02 Sep 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.0.59-r5.ebuild:
+ fix #190966
02 Sep 2007; nixnut <nixnut@gentoo.org> apache-2.0.59-r5.ebuild,
apache-2.2.4-r12.ebuild:
Stable on ppc wrt bug 190331
- 02 Sep 2007; Benedikt Böhm <hollow@gentoo.org> apache-2.0.59-r5.ebuild:
- fix #190966
-
31 Aug 2007; Christoph Mende <angelos@gentoo.org> apache-2.2.4-r12.ebuild:
Stable on amd64 wrt bug #190331
diff --git a/www-servers/apache/apache-2.0.59-r5.ebuild b/www-servers/apache/apache-2.0.59-r5.ebuild
index 715cf9962ab2..1abfa9430b49 100644
--- a/www-servers/apache/apache-2.0.59-r5.ebuild
+++ b/www-servers/apache/apache-2.0.59-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r5.ebuild,v 1.4 2007/09/02 14:03:27 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.0.59-r5.ebuild,v 1.5 2007/09/02 14:48:10 hollow Exp $
inherit eutils flag-o-matic gnuconfig multilib
@@ -32,8 +32,6 @@ RDEPEND="dev-lang/perl
!mips? ( ldap? ( =net-nds/openldap-2* ) )"
DEPEND="${RDEPEND}
>=sys-devel/autoconf-2.59-r4"
-PDEPEND="${PDEPEND}
- app-admin/apache-tools"
S="${WORKDIR}/httpd-${PV}"
@@ -79,6 +77,7 @@ src_unpack() {
|| die "sed failed"
EPATCH_SUFFIX="patch"
+ EPATCH_EXCLUDE="03_all_gentoo-apache-tools.patch"
epatch ${GENTOO_PATCHDIR}/patches/[0-8]* || die "internal ebuild error"
# security patches are version based