From ccd06522bc6b8c0d8028cd82ecb9dee10e9bdafb Mon Sep 17 00:00:00 2001 From: Christian Heim Date: Mon, 9 Apr 2007 11:03:44 +0000 Subject: [PATCH] Fixing the built_with_use for apache-2.0.59, since apache-2.0 only supports apr-0* for now. Thanks to Marijn for the bugreport and Jakub for the diff. Fixing #173750. Package-Manager: portage-2.1.2.3 --- net-www/apache/ChangeLog | 81 ++++++++++++++------------ net-www/apache/Manifest | 26 ++++++--- net-www/apache/apache-2.0.59-r2.ebuild | 4 +- 3 files changed, 63 insertions(+), 48 deletions(-) diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index e19f446ca71e..73ac7285c895 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-www/apache # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.512 2007/01/31 18:23:14 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.513 2007/04/09 11:03:44 phreak Exp $ + + 09 Apr 2007; Christian Heim apache-2.0.59-r2.ebuild: + Fixing the built_with_use for apache-2.0.59, since apache-2.0 only supports + apr-0* for now. Thanks to Marijn for the bugreport and Jakub for the diff. + Fixing #173750. 31 Jan 2007; Luca Longinotti -apache-2.2.3-r2.ebuild: Remove old 2.2 version. @@ -33,7 +38,7 @@ Adding EXTRA_ECONF to the ./configure usage (fixes #125798 - thanks to samLT ). - 09 Jan 2007; Bryan Østergaard + 09 Jan 2007; Bryan Østergaard -apache-1.3.34-r10.ebuild, -apache-1.3.34-r11.ebuild, -apache-2.0.54-r31.ebuild, -apache-2.0.58.ebuild, -apache-2.0.59.ebuild, -apache-2.2.2-r1.ebuild: @@ -81,7 +86,7 @@ apache-2.2.3.ebuild: Add ~x86-fbsd keyword. - 08 Sep 2006; Bryan Østergaard + 08 Sep 2006; Bryan Østergaard apache-1.3.34-r14.ebuild, apache-2.0.58-r2.ebuild: Stable on ia64. @@ -113,13 +118,13 @@ 30 Jul 2006; Michael Stewart +apache-2.0.59.ebuild: Version Bump - 29 Jul 2006; Bryan Østergaard + 29 Jul 2006; Bryan Østergaard apache-1.3.34-r14.ebuild, apache-2.0.58-r2.ebuild: Stable on alpha. *apache-1.3.37 (29 Jul 2006) - 29 Jul 2006; Bryan Østergaard +apache-1.3.37.ebuild: + 29 Jul 2006; Bryan Østergaard +apache-1.3.37.ebuild: Bump version, bug 141986. *apache-2.2.2-r1 (26 Jul 2006) @@ -176,7 +181,7 @@ *apache-1.3.34-r13 (05 Jun 2006) - 05 Jun 2006; Benedikt Böhm +apache-1.3.34-r13.ebuild: + 05 Jun 2006; Benedikt Böhm +apache-1.3.34-r13.ebuild: fix #112919 and #106455 05 Jun 2006; Michael Stewart @@ -222,7 +227,7 @@ 27 Apr 2006; Alec Warner Manifest: Fixing SHA256 digest, pass four - 22 Apr 2006; Diego Pettenò + 22 Apr 2006; Diego Pettenò apache-2.0.55-r2.ebuild: Add ~x86-fbsd keyword. @@ -279,7 +284,7 @@ apache-1.3.34-r11.ebuild: stable on amd64 wrt bug 118875 - 01 Feb 2006; Bryan Østergaard apache-2.0.55.ebuild: Stable on sparc wrt #117835 - 09 Jan 2006; Bryan Østergaard apache-1.3.34-r10.ebuild: @@ -379,7 +384,7 @@ apache-1.3.34-r1.ebuild, apache-1.3.34-r10.ebuild: Stable on hppa, ppc. See bug #109895. - 15 Dec 2005; Bryan Østergaard apache-2.0.54-r31.ebuild: Stable on sh. - 02 Oct 2005; Bryan Østergaard + 02 Oct 2005; Bryan Østergaard apache-1.3.33-r12.ebuild, apache-2.0.54-r31.ebuild: ia64 stable. - 24 Sep 2005; Bryan Østergaard + 24 Sep 2005; Bryan Østergaard apache-2.0.54-r31.ebuild: Fix link to apache-upgrading doc. - 24 Sep 2005; Bryan Østergaard + 24 Sep 2005; Bryan Østergaard apache-1.3.33-r12.ebuild, apache-2.0.54-r31.ebuild: Stable on alpha. @@ -482,7 +487,7 @@ +apache-1.3.33-r12.ebuild, +apache-2.0.54-r31.ebuild: Apache is now multilib aware - 18 Sep 2005; Bryan Østergaard + 18 Sep 2005; Bryan Østergaard apache-1.3.33-r6.ebuild: Stable on ia64, bug 104807. @@ -496,7 +501,7 @@ apache-2.0.54-r15.ebuild: stable on amd64 wrt bug 104807 - 15 Sep 2005; Bryan Østergaard + 15 Sep 2005; Bryan Østergaard apache-1.3.33-r6.ebuild, apache-2.0.54-r15.ebuild: Stable on alpha, bug 104807. @@ -593,7 +598,7 @@ 16 Jul 2005; Joseph Jezak apache-1.3.33-r1.ebuild: Marked ppc stable for bug #86052. - 13 Jul 2005; Bryan Østergaard + 13 Jul 2005; Bryan Østergaard apache-2.0.54-r8.ebuild: Stable on alpha + ia64, bug 98358. @@ -667,7 +672,7 @@ *apache-2.0.54-r11 (08 Jun 2005) - 08 Jun 2005; Bryan Østergaard + 08 Jun 2005; Bryan Østergaard +apache-2.0.54-r11.ebuild: Fix issue reported by Seemant Kulleen. @@ -715,11 +720,11 @@ 13 May 2005; Lars Weiler apache-2.0.54-r4.ebuild: Stable on ppc; bug #91737 (again). - 12 May 2005; Bryan Østergaard + 12 May 2005; Bryan Østergaard apache-2.0.54-r4.ebuild: Stable on ia64, bug 91737. - 12 May 2005; Bryan Østergaard + 12 May 2005; Bryan Østergaard apache-2.0.54-r4.ebuild: Stable on alpha, bug 91737. @@ -732,7 +737,7 @@ *apache-2.0.54-r5 (12 May 2005) *apache-2.0.54-r4 (12 May 2005) - 12 May 2005; Bryan Østergaard + 12 May 2005; Bryan Østergaard +apache-2.0.54-r4.ebuild, +apache-2.0.54-r5.ebuild: Fixed ebuilds, bug 92348 and bug 91737. @@ -750,7 +755,7 @@ Revision bumps to satisfy security bug #91737. 2.0.54-r2 is the (old-style) ebuild going stable, 2.0.54-r3 is the new-style ebuild. -r2 stable on x86. - 11 May 2005; Bryan Østergaard metadata.xml: + 11 May 2005; Bryan Østergaard metadata.xml: apache is a group effort so remove Hollow as maintainer. 10 May 2005; Elfyn McBratney : @@ -770,10 +775,10 @@ 09 May 2005; Aron Griffis apache-1.3.33-r1.ebuild: stable on ia64 #86052 - 06 May 2005; Bryan Østergaard apache-2.0.54.ebuild: + 06 May 2005; Bryan Østergaard apache-2.0.54.ebuild: Fix broken SRC_URI. - 05 May 2005; Bryan Østergaard + 05 May 2005; Bryan Østergaard apache-1.3.29-r2.ebuild, apache-1.3.33-r2.ebuild, apache-1.3.33-r4.ebuild, apache-2.0.50.ebuild, apache-2.0.52.ebuild, apache-2.0.52-r1.ebuild, apache-2.0.52-r3.ebuild, apache-2.0.53.ebuild, apache-2.0.54.ebuild: @@ -948,13 +953,13 @@ 23 Dec 2004; Stuart Herbert apache-2.0.52-r2.ebuild: Improvements for first-time installation of Apache - 15 Dec 2004; Bryan Østergaard : + 15 Dec 2004; Bryan Østergaard : Fix broken digest, bug 74531. - 14 Dec 2004; Bryan Østergaard apache-1.3.33.ebuild: + 14 Dec 2004; Bryan Østergaard apache-1.3.33.ebuild: Also fix src_uri in apache-1.x. - 14 Dec 2004; Bryan Østergaard + 14 Dec 2004; Bryan Østergaard apache-2.0.52-r1.ebuild: Use mirror://apache/.. in SRC_URI. @@ -985,7 +990,7 @@ 05 Nov 2004; Olivier Crete apache-2.0.52-r1.ebuild: Stable on x86 wrt security bug 70138 - 06 Nov 2004; Bryan Østergaard + 06 Nov 2004; Bryan Østergaard apache-2.0.52-r1.ebuild: Stable on alpha, bug 70138. @@ -1030,7 +1035,7 @@ -files/patches/2.0.50-r1/00_ssl_engine.patch: Removed old patches repoman was complaining about. - 30 Oct 2004; Bryan Østergaard apache-1.3.33.ebuild: + 30 Oct 2004; Bryan Østergaard apache-1.3.33.ebuild: Stable on alpha, bug 68564. 29 Oct 2004; Michael Hanselmann apache-1.3.33.ebuild: @@ -1052,7 +1057,7 @@ 29 Oct 2004; Stuart Herbert +apache-1.3.33.ebuild: Added masked ebuild, pending release of upstream's mod_ssl - 26 Oct 2004; Bryan Østergaard + 26 Oct 2004; Bryan Østergaard apache-1.3.32-r1.ebuild: Stable on alpha, bug 68564. @@ -1091,7 +1096,7 @@ 09 Oct 2004; apache-2.0.52.ebuild: stable ppc gsla: 66807 - 09 Oct 2004; Bryan Østergaard apache-2.0.52.ebuild: + 09 Oct 2004; Bryan Østergaard apache-2.0.52.ebuild: Stable on alpha, bug 66807. *apache-2.0.52 (08 Oct 2004) @@ -1102,7 +1107,7 @@ 23 Sep 2004; Olivier Crete apache-2.0.51-r1.ebuild: Stable on x86 wrt security bug #64804 - 22 Sep 2004; Bryan Østergaard + 22 Sep 2004; Bryan Østergaard apache-2.0.51-r1.ebuild: Stable on alpha, bug 64804. @@ -1126,7 +1131,7 @@ Added security patch from UPSTREAM for security issue CAN-2004-0811; thanks to chipig for the heads up - 17 Sep 2004; Bryan Østergaard,,, apache-2.0.51.ebuild: + 17 Sep 2004; Bryan Østergaard,,, apache-2.0.51.ebuild: Stable on alpha. 16 Sep 2004; Stephen P. Becker apache-2.0.51.ebuild: @@ -1208,7 +1213,7 @@ 08 Sep 2004; Joshua Kinard apache-2.0.50-r1.ebuild: Marked stable on mips. - 09 Sep 2004; Bryan Østergaard apache-2.0.50-r1.ebuild: + 09 Sep 2004; Bryan Østergaard apache-2.0.50-r1.ebuild: Stable on alpha, bug 62626. 08 Sep 2004; Olivier Crete apache-2.0.50-r1.ebuild: @@ -1302,7 +1307,7 @@ 04 Jul 2004; Michael Hanselmann apache-2.0.49-r4.ebuild: Stable on ppc. - 03 Jul 2004; Bryan Østergaard apache-2.0.49-r4.ebuild: + 03 Jul 2004; Bryan Østergaard apache-2.0.49-r4.ebuild: Stable on alpha, bug #55441. 02 Jul 2004; Gustavo Zacarias apache-2.0.49-r4.ebuild: @@ -1391,7 +1396,7 @@ 12 Jun 2004; Jason Wever apache-1.3.31-r2.ebuild: Stable on sparc wrt bug #53544. - 12 Jun 2004; Bryan Østergaard apache-1.3.31-r2.ebuild: + 12 Jun 2004; Bryan Østergaard apache-1.3.31-r2.ebuild: Stable on alpha, bug #53544. *apache-1.3.31-r2 (11 Jun 2004) @@ -1479,7 +1484,7 @@ apache-2.0.49-r3.ebuild: Marked stable on sparc and mips. - 02 Jun 2004; Bryan Østergaard apache-1.3.31-r1.ebuild, + 02 Jun 2004; Bryan Østergaard apache-1.3.31-r1.ebuild, apache-2.0.49-r3.ebuild: Stable on alpha, bug 51368. @@ -1530,7 +1535,7 @@ 25 May 2004; Chuck Short apache-2.0.49-r2.ebuild: Added static support for adding mod_ldap. - 24 May 2004; Bryan Østergaard apache-1.3.31.ebuild: + 24 May 2004; Bryan Østergaard apache-1.3.31.ebuild: Stable on alpha. 23 May 2004; Christian Birchinger apache-1.3.31.ebuild: diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 986c00e1cfb2..f1a1a15e5e57 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4 DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149 @@ -23,18 +26,18 @@ EBUILD apache-2.0.58-r2.ebuild 13828 RMD160 87aac30907ad616efd2c4189a21a60a16ea7 MD5 1d40058937031af0200d99f758192a8a apache-2.0.58-r2.ebuild 13828 RMD160 87aac30907ad616efd2c4189a21a60a16ea735c3 apache-2.0.58-r2.ebuild 13828 SHA256 5728037adca51f7107f60ba8cd0520615baee25e404554334d97c95eb93818f5 apache-2.0.58-r2.ebuild 13828 -EBUILD apache-2.0.59-r2.ebuild 14075 RMD160 35d63c84bee77751b495599debe2330511a72104 SHA1 3e4864f798fd0a47c806273da257de7f022d7b4d SHA256 c08a38382bd049f9d7658678759c69d9ed5ec93f3aa2d4be0e032baf71eb2dbd -MD5 5adefbd86f1167a791fe3e911c69b937 apache-2.0.59-r2.ebuild 14075 -RMD160 35d63c84bee77751b495599debe2330511a72104 apache-2.0.59-r2.ebuild 14075 -SHA256 c08a38382bd049f9d7658678759c69d9ed5ec93f3aa2d4be0e032baf71eb2dbd apache-2.0.59-r2.ebuild 14075 +EBUILD apache-2.0.59-r2.ebuild 14079 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3ecc32 SHA1 b22c2670b0ca1daec122e3315b915889961d8d1d SHA256 7f4d8e4095e0e785ebb2e9b73b3702494157dfbb6125d0ee98041eacc79b6378 +MD5 6dcdc4563ddbbc21f13ed8aa24f5242d apache-2.0.59-r2.ebuild 14079 +RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3ecc32 apache-2.0.59-r2.ebuild 14079 +SHA256 7f4d8e4095e0e785ebb2e9b73b3702494157dfbb6125d0ee98041eacc79b6378 apache-2.0.59-r2.ebuild 14079 EBUILD apache-2.2.4.ebuild 14160 RMD160 755d19fc194366cc311f3f1abd19c93aa69876d8 SHA1 5a933d0a23aca56e52cd9288ed40801d489f3015 SHA256 6716dc70779dd7b44a3f9618c7903c7185d9f1d8cff576b1fcec28b5c5c50d75 MD5 d4a6f219c512b7d2a7a2cad683d24d94 apache-2.2.4.ebuild 14160 RMD160 755d19fc194366cc311f3f1abd19c93aa69876d8 apache-2.2.4.ebuild 14160 SHA256 6716dc70779dd7b44a3f9618c7903c7185d9f1d8cff576b1fcec28b5c5c50d75 apache-2.2.4.ebuild 14160 -MISC ChangeLog 88130 RMD160 3f31f9b42a01ef62d41a3e3ed572003987186129 SHA1 b631ac8e25ba92ecc92258c99ecf1335393c6f11 SHA256 b70259c41329fab90f395f3d699c01867ae029f26ffdf07ddf7ffee043a49001 -MD5 8a7a373c0645d9a7d9a45df91d3bff2c ChangeLog 88130 -RMD160 3f31f9b42a01ef62d41a3e3ed572003987186129 ChangeLog 88130 -SHA256 b70259c41329fab90f395f3d699c01867ae029f26ffdf07ddf7ffee043a49001 ChangeLog 88130 +MISC ChangeLog 88453 RMD160 03ea3a7fb6991e7a99a8f5d4069f9dd5973ee92f SHA1 1dcdcda005d983e2bc891b38a9b82bb2e621f5aa SHA256 6cfdc6e18be9ed2a663bc5dbbe7a44f34750489ec4e212636ffb4f3ec8bf9e27 +MD5 8c9344ecdd4600575af32802f5ecf084 ChangeLog 88453 +RMD160 03ea3a7fb6991e7a99a8f5d4069f9dd5973ee92f ChangeLog 88453 +SHA256 6cfdc6e18be9ed2a663bc5dbbe7a44f34750489ec4e212636ffb4f3ec8bf9e27 ChangeLog 88453 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551 @@ -54,3 +57,10 @@ SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/di MD5 13fe4f2b1ea9abdd5a6d21b4fd951557 files/digest-apache-2.2.4 527 RMD160 2da3967ecb466b7b592acd289d45a246486017b3 files/digest-apache-2.2.4 527 SHA256 26585f0ead7cab908a161a06863837680a1c66fbf2fbd3a5eff27049ab17c4f2 files/digest-apache-2.2.4 527 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGGh2UyuNVb5qfaOYRAlPuAJ0bC/G9FJt2mOh4icD7wjPNnrXBJwCgrQGJ +G2E7i5koN08NVOwlkX8lzAY= +=piOW +-----END PGP SIGNATURE----- diff --git a/net-www/apache/apache-2.0.59-r2.ebuild b/net-www/apache/apache-2.0.59-r2.ebuild index 863b419792c1..9c733cf1e05e 100644 --- a/net-www/apache/apache-2.0.59-r2.ebuild +++ b/net-www/apache/apache-2.0.59-r2.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/net-www/apache/apache-2.0.59-r2.ebuild,v 1.3 2007/01/28 20:00:33 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.59-r2.ebuild,v 1.4 2007/04/09 11:03:44 phreak Exp $ inherit eutils flag-o-matic gnuconfig multilib @@ -37,7 +37,7 @@ S="${WORKDIR}/httpd-${PV}" big_fat_warnings() { - if use ldap && ! built_with_use 'dev-libs/apr-util' ldap; then + if use ldap && ! built_with_use '=dev-libs/apr-util-0*' ldap; then eerror "dev-libs/apr-util is missing LDAP support. For apache to have" eerror "ldap support, apr-util must be built with the ldap USE-flag" eerror "enabled." -- 2.26.2