bug #107467 , changing the has_version metadata hack (QA violation) so it doesn't get killed by upcoming portage changes (not saying it shouldn't be killed off, just that y'all remove it when you can, rather then a portage QA check nuking it on ya)

(Portage version: 1.524.2.76-cvs)

7 files changed, 61 insertions, 7 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 7cb3c237025b..385b7dc20111 100644
--- 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/mod_php-4.3.11-r1.ebuild b/dev-php/mod_php/mod_php-4.3.11-r1.ebuild
index 5c83161e8837..b785db41d5fb 100644
--- 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 4587560b9ebb..1231b7d57dd9 100644
--- 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 1a53a54fad4c..da51e0fdcdc0 100644
--- 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 e37ace4e35ce..0f90f43101e5 100644
--- 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 3f4f95ade2b7..eb6d76642347 100644
--- 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 ee50a2e7559f..ac84fb15a1a7 100644
--- 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=