bug #107467 , changing the has_version metadata hack (QA violation) so it doesn't...

Package-Manager: portage-1.524.2.76-cvs

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 7cb3c237025ba1c3dd795e3f67220c51c923f6de..385b7dc20111e13a2198a5866fe4046bd2604200 100644 (file)
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.274 2005/09/27 02:50:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.275 2005/10/01 09:15:46 ferringb Exp $
+
+  01 Oct 2005; Brian Harring <ferringb@gentoo.org> mod_php-4.3.11-r1.ebuild,
+  mod_php-4.3.11.ebuild, mod_php-4.4.0-r1.ebuild, mod_php-4.4.0-r2.ebuild, 
+  mod_php-4.4.0-r3.ebuild, mod_php-4.4.0.ebuild:
+  Adjusted the has_version hack so these ebuilds are still usable under upcoming
+  portage release.
+  
+  Do not duplicate the has_version trick in the tree, lest QA beats you to a pulp.
+  This code has an extremely short life span, it won't work under the next 
+  major portage version; further it *is* a kludge and cannot be implemented 
+  anywhere else in the tree without asking portage devs and QA (they'll 
+  tell you no, FYI).
 
   27 Sep 2005; Jason Wever <weeve@gentoo.org> mod_php-4.3.11-r1.ebuild,
   mod_php-4.4.0-r2.ebuild:

diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index bb1cfef8eb2bfb8def77026512886900974a6d87..e89b433d95450e19ac04ea22ec0cc34f45b7915e 100644 (file)
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,30 +1,28 @@
-MD5 5e2957dd3ea91c0a0ff04ca39b7d1e97 ChangeLog 47221
-MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
-MD5 151698471c967f2ee266891aaebd18ea mod_php-4.4.0.ebuild 6145
-MD5 5497fe36dda29f34ea7e35780683acd8 mod_php-4.4.0-r1.ebuild 6370
-MD5 5a33e096ad300770bf57535ea5347c7d mod_php-4.3.11-r1.ebuild 6929
-MD5 adf20bea2955fa8bb573026c733864b5 mod_php-4.3.11.ebuild 6196
-MD5 e14a443287ffc9c3e027bd2fedb2ecbc mod_php-4.4.0-r2.ebuild 6876
-MD5 344c2ed7ef423d32e92495a11a482ae0 mod_php-4.4.0-r3.ebuild 5912
+MD5 61a6dd89dbdfe7b9fd30ae8e1fb8fff5 ChangeLog 47860
+MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
+MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
 MD5 79ed63479c494aeb2ed0bc7f5c059fb9 files/70_mod_php.conf 1022
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
 MD5 225b57325cbdf582288a8796da9d72f5 files/digest-mod_php-4.3.11 287
-MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
 MD5 ce1f1b2a1e56cf4459b2cbfdcce6b03f files/digest-mod_php-4.3.11-r1 364
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0 285
+MD5 9b7f8c71395e9ac97dc87a48c9e4770d files/digest-mod_php-4.4.0-r1 285
 MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r2 362
 MD5 61c52577ff879166da224373e27ad11e files/digest-mod_php-4.4.0-r3 362
-MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
-MD5 a9b932952f12aa01a9f98a7fcbf32ed9 files/php4.3.11-pcre-security.patch 6031
-MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
 MD5 7515e9b1dc298a0fb1c12d35a58c265d files/mod_php-4.3.4-amd64hack.diff 1028
 MD5 3bf664b414787f8f3c1dcbda5750aef4 files/mod_php-4.3.5-apache1security.diff 425
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 cdec3284251432935f950c2d15a405b7 files/php-4.3.11-flash.patch 694
 MD5 b2aa5952d5c805b3e57a5a6bf0f0b8d0 files/php-4.3.11-gmp.patch 925
+MD5 47a031979331eeb527d0918d2c38cdbe files/php4.3.11-imap-symlink.diff 1238
+MD5 a9b932952f12aa01a9f98a7fcbf32ed9 files/php4.3.11-pcre-security.patch 6031
+MD5 4c86d8ed96f2bb38b94e826c1f028c80 files/php4.4.0-imap-symlink.diff 1238
 MD5 54a4ad0766f89185d7de2c6d07b07296 files/php4.4.0-pcre-security.patch 6177
 MD5 ad986b02a371b2fea3b4ae5060c9dc81 files/stdint.diff 358
 MD5 07529a6c32d73282c53d2936ed8ea9bd files/with-iodbc.diff 444
-MD5 158cb07377a3e2a0028947b0aeb505cb files/4.3.10-r1/70_mod_php.conf 1017
-MD5 389638f1d46b6c41cd4d87b471572f4b files/4.4.0-a1/70_mod_php.conf 484
-MD5 ee36e31632adb08b7abf70f78b5b2125 files/4.4.0-a2/70_mod_php.conf 485
-MD5 2dfe55aa49dbca0c3316e859f8bebcb1 files/4.3.11-r2/70_mod_php.conf 1125
+MD5 38fe937e954ab7109395cefa86fcd2d4 metadata.xml 384
+MD5 3e54c657a1b15632c17b7d2eea9f322a mod_php-4.3.11-r1.ebuild 7159
+MD5 56190a6344d0e907c007b55af5d4fca0 mod_php-4.3.11.ebuild 6423
+MD5 a3e29df002dbde1d18ab31334ed266ef mod_php-4.4.0-r1.ebuild 6597
+MD5 8d6457890ecaf1bd91d1e79982fb4b5d mod_php-4.4.0-r2.ebuild 7106
+MD5 9bd39caeebbda398724a83fedaa83ad0 mod_php-4.4.0-r3.ebuild 6141
+MD5 dacd61e1bba6292b852a354a22be284a mod_php-4.4.0.ebuild 6372

diff --git a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
index 5c83161e8837e6fd83ddf862dfbdfadead8c7f21..b785db41d5fb99f2ff52a5bc1f4b4d18a3875f4c 100644 (file)
--- a/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.16 2005/09/27 02:50:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11-r1.ebuild,v 1.17 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=

diff --git a/dev-php/mod_php/mod_php-4.3.11.ebuild b/dev-php/mod_php/mod_php-4.3.11.ebuild
index 4587560b9ebba0e582ea4a01760e87c9167ae82c..1231b7d57dd9f27c4917716bb57f501beaf3a4d6 100644 (file)
--- a/dev-php/mod_php/mod_php-4.3.11.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.11.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.18 2005/09/10 20:44:19 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.11.ebuild,v 1.19 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=

diff --git a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
index 1a53a54fad4c8f36c209031e702a903242c9bfd0..da51e0fdcdc061ca884be80af08174b5b482b5fe 100644 (file)
--- a/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0-r1.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r1.ebuild,v 1.7 2005/09/10 20:44:19 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r1.ebuild,v 1.8 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=

diff --git a/dev-php/mod_php/mod_php-4.4.0-r2.ebuild b/dev-php/mod_php/mod_php-4.4.0-r2.ebuild
index e37ace4e35ce5cf709fba0be515a551ec3541aae..0f90f43101e57fc409b5fbf455ee80793cca9ca6 100644 (file)
--- a/dev-php/mod_php/mod_php-4.4.0-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0-r2.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r2.ebuild,v 1.6 2005/09/27 02:50:34 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r2.ebuild,v 1.7 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=

diff --git a/dev-php/mod_php/mod_php-4.4.0-r3.ebuild b/dev-php/mod_php/mod_php-4.4.0-r3.ebuild
index 3f4f95ade2b7c23b0057dcdc352d15da693449bf..eb6d76642347164e85de4d577cb19a71284339a2 100644 (file)
--- a/dev-php/mod_php/mod_php-4.4.0-r3.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0-r3.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r3.ebuild,v 1.7 2005/09/21 19:26:18 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0-r3.ebuild,v 1.8 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=

diff --git a/dev-php/mod_php/mod_php-4.4.0.ebuild b/dev-php/mod_php/mod_php-4.4.0.ebuild
index ee50a2e7559fb72177e1a29dac22c88e14f7bc43..ac84fb15a1a7a90bdc9b756c6fd69c74d03809cb 100644 (file)
--- a/dev-php/mod_php/mod_php-4.4.0.ebuild
+++ b/dev-php/mod_php/mod_php-4.4.0.ebuild
@@ -1,12 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.17 2005/09/10 20:44:19 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.4.0.ebuild,v 1.18 2005/10/01 09:15:46 ferringb Exp $
 
 IUSE="apache2"
 
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 
 detectapache() {
+       # DO NOT REPLICATE THIS IN ANY OTHER PACKAGE WITHOUT PORTAGE DEVS PERMISSION
+       # IT IS BROKEN AND A TEMPORARY MEASURE!
+       # YOU'VE BEEN WARNED.
+       if [[ ${EBUILD_PHASE/depend} != ${EBUILD_PHASE} ]]; then
+               APACHEVER=1
+               return
+       fi
        local domsg=
        [ -n "$1" ] && domsg=1
        HAVE_APACHE1=