Fix logic for mpm detection. Fixes bug 104242

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 999f6654203a3480ca59701df2b98c8312e5af6e..8641d94de7be5a67aae6b2153d20074ef2ce9d9a 100644 (file)
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -17,7 +17,7 @@ MD5 4076cfc82dfd527b50eba2a0dd479c8f apache-1.3.33-r6.ebuild 7104
 MD5 2ddaadd5674de61b49fbbb0bcf859036 apache-2.0.54-r30.ebuild 12945
 MD5 ba03c4e043789f82af1967df63f04e5c apache-2.0.54-r15.ebuild 12613
 MD5 34cae34ddca559e6a710d5c25989a344 ChangeLog 70524
-MD5 5c8d532b77f81bb37056d93a654ea2a3 apache-2.0.54-r31.ebuild 13203
+MD5 a37d05596f3586a5eec184d696840456 apache-2.0.54-r31.ebuild 13235
 MD5 902506a3b7bacb71ab46a904d0e6cbf0 apache-1.3.33-r12.ebuild 9033
 MD5 37f5ed6f2423381241b029e6685bcdd2 metadata.xml 493
 MD5 6984dca404209fbedd4492e8ffdd8298 apache-2.0.54-r9.ebuild 12609

diff --git a/net-www/apache/apache-2.0.54-r31.ebuild b/net-www/apache/apache-2.0.54-r31.ebuild
index 6b106c739a27824bc6af627dabf1a046032f7784..bfc65add0933598b560a1cce4d338daf6ff49640 100644 (file)
--- a/net-www/apache/apache-2.0.54-r31.ebuild
+++ b/net-www/apache/apache-2.0.54-r31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.1 2005/09/18 05:01:04 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.2 2005/09/18 06:24:37 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -380,7 +380,7 @@ try_mpm() {
                die "mpm to try not specified!"
        fi
 
-       if [ -n "${mpm}" ]; then
+       if [ "x${mpm}" != "x" -a "x${mpm}" != "x${nmpm}" ]; then
                mpm_die ${nmpm} ${mpm}
        fi