magic cleanup

3 files changed, 45 insertions, 26 deletions

diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index 745da47caa78..fe314fb5a75d 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,13 +1,16 @@
 # ChangeLog for dev-php/mod_php
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.83 2003/06/12 10:24:04 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.84 2003/06/21 10:45:27 robbat2 Exp $
 
 *mod_php-4.3.2-r2 (10 June 2003)
 
-  12 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild:
+  21 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild:
+  Cleanup some of the magic, hopefully make it work better.
+
+  12 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild:
   syntax errors are bad.
 
-  10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild:
+  10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r2.ebuild:
   This is an extension of the fixes in 4.3.2-r1, but I'm uncertain if some of
   this magic is valid, so it is in a sepearate ebulid for now.
   A special note on the change of behavior depending on the Apache(s) you have installed:
@@ -17,7 +20,7 @@
 
 *mod_php-4.3.2-r1 (10 June 2003)
 
-  10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2.ebuild:
+  10 June 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.2-r1.ebuild:
   Try to fix bug #22352. mod_php is now SLOTed by the major version of Apache
   that you are building it for. This SHOULD enable you to have mod_php
   installed on both at the same time, but is is experimental at this time.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index e4f81f3ce73f..742f2fc39902 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -1,12 +1,12 @@
 MD5 136c8a948544ac163e93e4c45e46092c mod_php-4.3.2.ebuild 2740
 MD5 31e28f7f7df06e387c40cdad216265ab mod_php-4.3.1-r3.ebuild 2589
-MD5 3aee768c75fcedcdc9399ec3265bebd0 mod_php-4.3.2-r2.ebuild 3307
+MD5 a598f82b14c567027a504d2dffb45a98 mod_php-4.3.2-r2.ebuild 3595
 MD5 a00cd3eced04951a9aa6a5d38bd7f6b6 mod_php-4.3.1.ebuild 9225
 MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241
 MD5 171b138769aa006ffa4393144555cba3 mod_php-4.3.2-r1.ebuild 2676
 MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071
 MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634
-MD5 53cf504a1ce388a8cd583884ac247e6e ChangeLog 17786
+MD5 40c02365832f27e8d200a7851b4451e1 ChangeLog 17935
 MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135
 MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
 MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853
diff --git a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
index 43e452b367fc..1c2b4fbb0842 100644
--- a/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
+++ b/dev-php/mod_php/mod_php-4.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.2 2003/06/12 10:24:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/mod_php-4.3.2-r2.ebuild,v 1.3 2003/06/21 10:45:27 robbat2 Exp $
 
 inherit php eutils
 
@@ -15,32 +15,48 @@ DEPEND="${DEPEND}
 	>=net-www/apache-1.3.26-r2
 	apache2? ( >=net-www/apache-2.0.43-r1 ) "
 
-HAVE_APACHE1=
-HAVE_APACHE2=
-has_version '=net-www/apache-1*' && HAVE_APACHE1=1
-has_version '=net-www/apache-2*' && HAVE_APACHE2=1
 
-[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
-[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
-[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+detectapache() {
+	local domsg=
+	[ -n "$$" ] && domsg=1
+	HAVE_APACHE1=
+	HAVE_APACHE2=
+	has_version '=net-www/apache-1*' && HAVE_APACHE1=1
+	has_version '=net-www/apache-2*' && HAVE_APACHE2=1
 
-case "${APACHEVER}" in
-	1) einfo 'Apache1 only detected' ;;
-	2) einfo 'Apache2 only detected';;
+	[ -n "${HAVE_APACHE1}" ] && APACHEVER=1
+	[ -n "${HAVE_APACHE2}" ] && APACHEVER=2
+	[ -n "${HAVE_APACHE1}" ] && [ -n "${HAVE_APACHE2}" ] && APACHEVER='both'
+
+	case "${APACHEVER}" in
+	1) [ -n "${domsg}" ] && einfo 'Apache1 only detected' ;;
+	2) [ -n "${domsg}" ] && einfo 'Apache2 only detected';;
 	both) 
-	if [ "`use apache2`" ]; then
-		einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
-		APACHEVER=2
-	else
-		einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
-		APACHEVER=1
-	fi ;;
-	*) MSG="Unknown Apache version!"; eerror $MSG ; die $MSG ;;
-esac
+		if [ "`use apache2`" ]; then
+			[ -n "${domsg}" ] && einfo "Multiple Apache versions detected, using Apache2 (USE=apache2)"
+			APACHEVER=2
+		else
+			[ -n "${domsg}" ] && einfo 'Multiple Apache versions detected, using Apache1 (USE=-apache2)'
+			APACHEVER=1
+		fi ;;
+	*) if [ -n "${domsg}" ]; then
+			MSG="Unknown Apache version!"; eerror $MSG ; die $MSG
+	   else
+			APACHEVER=0
+	   fi; ;;
+	esac
+}
+
+detectapache
 
 SLOT="${APACHEVER}"
 [ "${APACHEVER}" -eq '2' ] && USE_APACHE2='2' || USE_APACHE2='' 
 
+src_unpack() {
+	detectapache domsg
+	php_src_unpack
+}
+
 src_compile() {
 	#no readline on server SAPI
 	myconf="${myconf} --without-readline"