Remove no-suexec USE-flag from 1.3 and 2.0 as it's broken and requires modification to configuration to get it working. Fixes bug 148082.

Package-Manager: portage-2.1.1_rc1-r2

10 files changed, 144 insertions, 101 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 5ee52e2c6b0f..84a1ccc832fb 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.498 2006/09/10 17:35:00 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.499 2006/09/20 05:11:34 vericgar Exp $
+
+  20 Sep 2006; Michael Stewart <vericgar@gentoo.org>
+  apache-1.3.34-r10.ebuild, apache-1.3.34-r11.ebuild,
+  apache-1.3.34-r14.ebuild, apache-1.3.37.ebuild, apache-2.0.54-r31.ebuild,
+  apache-2.0.58.ebuild, apache-2.0.58-r2.ebuild, apache-2.0.59.ebuild:
+  Remove no-suexec USE-flag from 1.3 and 2.0 as it's broken and requires
+  modification to configuration to get it working. Fixes bug 148082.
 
   10 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
   apache-2.2.3.ebuild:
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index 7edeb1a79868..0757afab1129 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -18,38 +18,38 @@ DIST httpd-2.2.3.tar.bz2 4905728 RMD160 291e093f48d980daba482140581a525ecbfae4d2
 DIST lingerd-0.94.tar.gz 33938 RMD160 2d7363b763a68c0c7acdadc23779929f4d02153f SHA1 25d32aca3f03fbc9273fca6491444d1920818a1c SHA256 632030f9c1b9e8f817ee19bad74988f3dce7f6ec617677ad5a522e8d491382a0
 DIST mod_ssl-2.8.25-1.3.34.tar.gz 820352 RMD160 90a3913d30c7f4d194907463125c90101005837a SHA1 150f726539d74c0d2af02e482be78bbcdb811395 SHA256 832b240157666efdbdfc1a2fd593ee4eebbc9441ec48ece8276660092b974d07
 DIST mod_ssl-2.8.28-1.3.37.tar.gz 820417 RMD160 6b12c0a52fe0fbb7b91221d1cb37f93fbe59bb11 SHA1 9db2a7240e499da2b99d0df9c1a6fbae0580ba0b SHA256 76437105b5b5593a7dbd8ee45af417233897dcaf910cbc337a68b0db24e35489
-EBUILD apache-1.3.34-r10.ebuild 8599 RMD160 4b5e97facb72e22ace14be8b17cf3edad7b60062 SHA1 536dcd26f727cc464aedfb991a2953181a19cf59 SHA256 4547fa9b81dccbc48a25e9a8b9e6015f013a888fc9edcbd0d188923f400b1e39
-MD5 bdec1ee877405a6fe6ee337483a74e2b apache-1.3.34-r10.ebuild 8599
-RMD160 4b5e97facb72e22ace14be8b17cf3edad7b60062 apache-1.3.34-r10.ebuild 8599
-SHA256 4547fa9b81dccbc48a25e9a8b9e6015f013a888fc9edcbd0d188923f400b1e39 apache-1.3.34-r10.ebuild 8599
-EBUILD apache-1.3.34-r11.ebuild 8746 RMD160 28279e4b6a3cdf2c66dae70d06be5f57b6213728 SHA1 5211e3b1c67b8d89ace6509eba82bb137a8c75ea SHA256 44c65ac2ba237be06bed2c1d505d547da240598903101011619f8d6b147c2c45
-MD5 880a47a48df4068fd928b48a57e40f7e apache-1.3.34-r11.ebuild 8746
-RMD160 28279e4b6a3cdf2c66dae70d06be5f57b6213728 apache-1.3.34-r11.ebuild 8746
-SHA256 44c65ac2ba237be06bed2c1d505d547da240598903101011619f8d6b147c2c45 apache-1.3.34-r11.ebuild 8746
-EBUILD apache-1.3.34-r14.ebuild 8743 RMD160 7be526889e714a93ad1e379851353ff9c9d76b80 SHA1 eb3b0d12a53e92547458eed2de9c4a39f7cc6c4a SHA256 ea84583e3ae8037257fff076cafdcca3504a51105bd834f659ce3cd343a8eeec
-MD5 41e31c58412d56aa69dc371ce4400fd9 apache-1.3.34-r14.ebuild 8743
-RMD160 7be526889e714a93ad1e379851353ff9c9d76b80 apache-1.3.34-r14.ebuild 8743
-SHA256 ea84583e3ae8037257fff076cafdcca3504a51105bd834f659ce3cd343a8eeec apache-1.3.34-r14.ebuild 8743
-EBUILD apache-1.3.37.ebuild 8917 RMD160 977a2ddc13198c86dfa50b3e1fe840e10c46c7ee SHA1 7362ed8afbaa52eb7e18b1f4dfc0ef66f3d0f285 SHA256 f1d68404eba9e693f7018deabe025856c72665def679b80eb1a66f1ed58fcacf
-MD5 c62dd4e68170d64a164c711e2f696b8a apache-1.3.37.ebuild 8917
-RMD160 977a2ddc13198c86dfa50b3e1fe840e10c46c7ee apache-1.3.37.ebuild 8917
-SHA256 f1d68404eba9e693f7018deabe025856c72665def679b80eb1a66f1ed58fcacf apache-1.3.37.ebuild 8917
-EBUILD apache-2.0.54-r31.ebuild 13386 RMD160 efa26be6cf032b3bd5fdb445fa0a47c01e6ee94e SHA1 a006a39f6d93fea80d89e10ffdb1bc1035ec5ebb SHA256 c674d1c6c5c7cba6f504e2e47eb7112f46078175d474654eaf67e15d9e7ff160
-MD5 477d93701a4872e5be29f52b2d167090 apache-2.0.54-r31.ebuild 13386
-RMD160 efa26be6cf032b3bd5fdb445fa0a47c01e6ee94e apache-2.0.54-r31.ebuild 13386
-SHA256 c674d1c6c5c7cba6f504e2e47eb7112f46078175d474654eaf67e15d9e7ff160 apache-2.0.54-r31.ebuild 13386
-EBUILD apache-2.0.58-r2.ebuild 13676 RMD160 1e656c6e6173dd7d62304980cb00718c4334b8fa SHA1 f8ffc11955e3975a55d81e2a4e248f4808c1ee83 SHA256 f32b07ca0854ac3cff00a647c863d18ec30f6bdd4d6a56f9cf383f293e93a5b3
-MD5 20ec5f476522546cc118da060dd9b6e6 apache-2.0.58-r2.ebuild 13676
-RMD160 1e656c6e6173dd7d62304980cb00718c4334b8fa apache-2.0.58-r2.ebuild 13676
-SHA256 f32b07ca0854ac3cff00a647c863d18ec30f6bdd4d6a56f9cf383f293e93a5b3 apache-2.0.58-r2.ebuild 13676
-EBUILD apache-2.0.58.ebuild 13599 RMD160 fca1674ba38dc306049ae6779d31cd6449267940 SHA1 4fe4428a7f23fa438f9358ab8ec13248251985e1 SHA256 4f3be0f5b5ff04da58afe58e96ba216c60c75c9cd96069a599a2290106857b00
-MD5 367db390cee080565b8e77b17faf2334 apache-2.0.58.ebuild 13599
-RMD160 fca1674ba38dc306049ae6779d31cd6449267940 apache-2.0.58.ebuild 13599
-SHA256 4f3be0f5b5ff04da58afe58e96ba216c60c75c9cd96069a599a2290106857b00 apache-2.0.58.ebuild 13599
-EBUILD apache-2.0.59.ebuild 13922 RMD160 cb81cc359e65d5e14a9e5389edc9ac0f2ba342bc SHA1 518da6431d3ff5c4ece62ce1ac0e6b087f89ee03 SHA256 add603bfe07e000358e1d68e46a1fe01f729f837c9c2e48e25774b46019226b6
-MD5 1c084ee94bd816c395da9fc1b07374c2 apache-2.0.59.ebuild 13922
-RMD160 cb81cc359e65d5e14a9e5389edc9ac0f2ba342bc apache-2.0.59.ebuild 13922
-SHA256 add603bfe07e000358e1d68e46a1fe01f729f837c9c2e48e25774b46019226b6 apache-2.0.59.ebuild 13922
+EBUILD apache-1.3.34-r10.ebuild 8736 RMD160 54bc1bfcb8e64eed044bf06eb755bc589119c064 SHA1 b5975bffedca5e1237820f36e869bd5832e19b2a SHA256 f7b86dcd487a55973e31f148a7e51fb4b097633dc46730d49f3f49420e1476c8
+MD5 d6411a62eda0981466975b843baa144c apache-1.3.34-r10.ebuild 8736
+RMD160 54bc1bfcb8e64eed044bf06eb755bc589119c064 apache-1.3.34-r10.ebuild 8736
+SHA256 f7b86dcd487a55973e31f148a7e51fb4b097633dc46730d49f3f49420e1476c8 apache-1.3.34-r10.ebuild 8736
+EBUILD apache-1.3.34-r11.ebuild 8882 RMD160 41107c1c082d9a536c6b7c90d4f0ea6afaa894db SHA1 2f28abb130f43273f5cdab43386ec30b42972ee4 SHA256 662bca160355459a183052990052044ef56a374dd9df43ad5fb32db3606f7c70
+MD5 9ae3e1033932d9f9dc8dbfbfaef2d5bb apache-1.3.34-r11.ebuild 8882
+RMD160 41107c1c082d9a536c6b7c90d4f0ea6afaa894db apache-1.3.34-r11.ebuild 8882
+SHA256 662bca160355459a183052990052044ef56a374dd9df43ad5fb32db3606f7c70 apache-1.3.34-r11.ebuild 8882
+EBUILD apache-1.3.34-r14.ebuild 8881 RMD160 c767e31dc07e4cf3e4b7becaf93f7b9e6f23381d SHA1 80e8486c27bfd7e88f5bd84694df5cf335f687d0 SHA256 7478ac2b3b00a51d74f2e7546e261d99ee25117ed125862f8444466dd7a1c2e5
+MD5 4d9a4455c72f20b675b19a7d5ecff4c7 apache-1.3.34-r14.ebuild 8881
+RMD160 c767e31dc07e4cf3e4b7becaf93f7b9e6f23381d apache-1.3.34-r14.ebuild 8881
+SHA256 7478ac2b3b00a51d74f2e7546e261d99ee25117ed125862f8444466dd7a1c2e5 apache-1.3.34-r14.ebuild 8881
+EBUILD apache-1.3.37.ebuild 9053 RMD160 d69ab0628df3af5e623440c3b8c3daf6a924fc82 SHA1 a39fbde646ae035dcf64645f380e85b21e2128db SHA256 87fa8da5883da8d0d1ad77ad7978051b61255eb4c20abc4cc7c52530d4787b13
+MD5 bdbbac828c5941aeea512ccca376cde5 apache-1.3.37.ebuild 9053
+RMD160 d69ab0628df3af5e623440c3b8c3daf6a924fc82 apache-1.3.37.ebuild 9053
+SHA256 87fa8da5883da8d0d1ad77ad7978051b61255eb4c20abc4cc7c52530d4787b13 apache-1.3.37.ebuild 9053
+EBUILD apache-2.0.54-r31.ebuild 13531 RMD160 d2c5162f30a80d1138839b45d7870122c42b52c1 SHA1 8e15efcff6a9dd5d7fc39e9d4d897c674fcd7c70 SHA256 d55ae988568eb8a6b48b84d696c3fd2a9ad598715bfafa240a937c958ee5bcb1
+MD5 14a6d5e53f28203e6ae728abafe5d521 apache-2.0.54-r31.ebuild 13531
+RMD160 d2c5162f30a80d1138839b45d7870122c42b52c1 apache-2.0.54-r31.ebuild 13531
+SHA256 d55ae988568eb8a6b48b84d696c3fd2a9ad598715bfafa240a937c958ee5bcb1 apache-2.0.54-r31.ebuild 13531
+EBUILD apache-2.0.58-r2.ebuild 13823 RMD160 89544f4f2c72e3201e7d597cbfeb41cc99c5c705 SHA1 e2d4fe68252153453c85c0315470cf98244f5d08 SHA256 fe8c445a032fa725ed1270b18ed12f28ce261b9f3de2d52f33dd9e37b78ecad7
+MD5 432e14d298b01e14fb26493f52f3faf5 apache-2.0.58-r2.ebuild 13823
+RMD160 89544f4f2c72e3201e7d597cbfeb41cc99c5c705 apache-2.0.58-r2.ebuild 13823
+SHA256 fe8c445a032fa725ed1270b18ed12f28ce261b9f3de2d52f33dd9e37b78ecad7 apache-2.0.58-r2.ebuild 13823
+EBUILD apache-2.0.58.ebuild 13744 RMD160 a6d9f7ab7374b9172e2305791c6e40bd39852576 SHA1 bd5cb7f677162a8f6a008f2f7d86e19a93aba901 SHA256 01008d6dd3283c582fb476ace5d8d229aa357ddc62d6a7a6f758ce764a9ae693
+MD5 838b96605f46629201c50f460b083eb6 apache-2.0.58.ebuild 13744
+RMD160 a6d9f7ab7374b9172e2305791c6e40bd39852576 apache-2.0.58.ebuild 13744
+SHA256 01008d6dd3283c582fb476ace5d8d229aa357ddc62d6a7a6f758ce764a9ae693 apache-2.0.58.ebuild 13744
+EBUILD apache-2.0.59.ebuild 14067 RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 SHA1 cb214610a19618a643225548460c540e062d2225 SHA256 8e28ec93914c9cbbc773f24810c2606494feb93366e503407bf44e09b87e526c
+MD5 e55308c6b2ff469c644ce70fe20ea3ad apache-2.0.59.ebuild 14067
+RMD160 46f7a4bd32e7be999927c0a746deed4e8ad520c0 apache-2.0.59.ebuild 14067
+SHA256 8e28ec93914c9cbbc773f24810c2606494feb93366e503407bf44e09b87e526c apache-2.0.59.ebuild 14067
 EBUILD apache-2.2.2-r1.ebuild 13898 RMD160 56a87cd0e2d2ad79995aad1084f5d980454b69af SHA1 bb05d0eba6be8d43aa8a1cd35ed5e1e74bd39629 SHA256 7611e65207fac0034d5755f8187ee4fa51d232f9f3c04353e299d5469a41a2f2
 MD5 864a1733d246ddd80cc19a37b074a228 apache-2.2.2-r1.ebuild 13898
 RMD160 56a87cd0e2d2ad79995aad1084f5d980454b69af apache-2.2.2-r1.ebuild 13898
@@ -58,10 +58,10 @@ EBUILD apache-2.2.3.ebuild 13978 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f
 MD5 63eb4103c9d36639f2893fefa0313dae apache-2.2.3.ebuild 13978
 RMD160 b606ac2f5fb0ba7ff0cbdd9c5e13547b212a8e2f apache-2.2.3.ebuild 13978
 SHA256 5108612084de298195dc646be0e3f0a09818f205c918b451ee142b08c00ab46d apache-2.2.3.ebuild 13978
-MISC ChangeLog 85008 RMD160 30db9a92d29ad61d52f7c73c0bdcfddc83cc65fa SHA1 2404738886e4af91e2889480023e101c18a768df SHA256 f1b4e7d5758115b5523a05b367823874dc8279f992264b07a84b62b7fc9bb823
-MD5 090dd8ab6f52538298f6f2a9fccac0a7 ChangeLog 85008
-RMD160 30db9a92d29ad61d52f7c73c0bdcfddc83cc65fa ChangeLog 85008
-SHA256 f1b4e7d5758115b5523a05b367823874dc8279f992264b07a84b62b7fc9bb823 ChangeLog 85008
+MISC ChangeLog 85405 RMD160 e39421827df744e5def1972d0ce3ab94ca8004f8 SHA1 49d449ffafd454d8354bec0362c62579269b4c96 SHA256 0dbf75382612c7e1d925963690f76c5beae092ed075af43cb3cc77f3ce7fca41
+MD5 d3ff541a26e86427a7cacc5b2ed9d763 ChangeLog 85405
+RMD160 e39421827df744e5def1972d0ce3ab94ca8004f8 ChangeLog 85405
+SHA256 0dbf75382612c7e1d925963690f76c5beae092ed075af43cb3cc77f3ce7fca41 ChangeLog 85405
 MISC metadata.xml 566 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc SHA1 cfaab8d65125c65cb5c66c37dd200f7b3586baf9 SHA256 9826f38d29b803e954faa6fafffc4d6f197bfcb0e14cc76af891c41081d948e2
 MD5 27c9cb37c510e08bb69df277229a03ea metadata.xml 566
 RMD160 8aad2cbb313fa91b77c6f4891f8d3483d1460adc metadata.xml 566
diff --git a/net-www/apache/apache-1.3.34-r10.ebuild b/net-www/apache/apache-1.3.34-r10.ebuild
index ae54ffa8c625..c13856c36d4c 100644
--- a/net-www/apache/apache-1.3.34-r10.ebuild
+++ b/net-www/apache/apache-1.3.34-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r10.ebuild,v 1.9 2006/07/21 03:36:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r10.ebuild,v 1.10 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils fixheadtails multilib
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
+IUSE="doc ssl pam lingerd static-modules selinux"
 
 DEPEND="dev-lang/perl
 		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
@@ -103,7 +103,10 @@ src_compile() {
 
 	select_modules_config || die "determining modules"
 
-	if ! useq no-suexec; then
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if ! useq no-suexec; then
 		myconf="${myconf}
 				--enable-suexec
 				--suexec-uidmin=1000 \
@@ -113,7 +116,7 @@ src_compile() {
 				--suexec-docroot=/var/www \
 				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--suexec-logfile=/var/log/apache/suexec_log"
-	fi
+#	fi
 
 	if useq ssl; then
 		myconf="${myconf} --enable-rule=EAPI"
@@ -151,10 +154,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
diff --git a/net-www/apache/apache-1.3.34-r11.ebuild b/net-www/apache/apache-1.3.34-r11.ebuild
index 6a2f330ac701..1e21f9322c49 100644
--- a/net-www/apache/apache-1.3.34-r11.ebuild
+++ b/net-www/apache/apache-1.3.34-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r11.ebuild,v 1.10 2006/07/21 03:36:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r11.ebuild,v 1.11 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils fixheadtails multilib
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
+IUSE="doc ssl pam lingerd static-modules selinux"
 
 DEPEND="dev-lang/perl
 		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
@@ -108,7 +108,10 @@ src_compile() {
 
 	select_modules_config || die "determining modules"
 
-	if ! useq no-suexec; then
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if ! useq no-suexec; then
 		myconf="${myconf}
 				--enable-suexec
 				--suexec-uidmin=1000 \
@@ -118,7 +121,7 @@ src_compile() {
 				--suexec-docroot=/var/www \
 				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--suexec-logfile=/var/log/apache/suexec_log"
-	fi
+#	fi
 
 	if useq ssl; then
 		myconf="${myconf} --enable-rule=EAPI"
@@ -156,10 +159,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
diff --git a/net-www/apache/apache-1.3.34-r14.ebuild b/net-www/apache/apache-1.3.34-r14.ebuild
index 5c9d54709738..396212f923a5 100644
--- a/net-www/apache/apache-1.3.34-r14.ebuild
+++ b/net-www/apache/apache-1.3.34-r14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r14.ebuild,v 1.3 2006/09/08 21:33:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.34-r14.ebuild,v 1.4 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils fixheadtails multilib
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
+IUSE="doc ssl pam lingerd static-modules selinux"
 
 DEPEND="dev-lang/perl
 		|| ( sys-libs/gdbm ~sys-libs/db-1.85 )
@@ -108,7 +108,10 @@ src_compile() {
 
 	select_modules_config || die "determining modules"
 
-	if ! useq no-suexec; then
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if ! useq no-suexec; then
 		myconf="${myconf}
 				--enable-suexec
 				--suexec-uidmin=1000 \
@@ -118,7 +121,7 @@ src_compile() {
 				--suexec-docroot=/var/www \
 				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--suexec-logfile=/var/log/apache/suexec_log"
-	fi
+#	fi
 
 	if useq ssl; then
 		myconf="${myconf} --enable-rule=EAPI"
@@ -156,10 +159,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
diff --git a/net-www/apache/apache-1.3.37.ebuild b/net-www/apache/apache-1.3.37.ebuild
index 42dbd97f3b56..e2d6d6edc86e 100644
--- a/net-www/apache/apache-1.3.37.ebuild
+++ b/net-www/apache/apache-1.3.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.3 2006/09/02 15:49:47 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.37.ebuild,v 1.4 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils fixheadtails multilib
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://apache/httpd/apache_${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc ssl pam lingerd no-suexec static-modules selinux"
+IUSE="doc ssl pam lingerd static-modules selinux"
 
 DEPEND="dev-lang/perl
 		sys-libs/gdbm
@@ -114,7 +114,10 @@ src_compile() {
 
 	select_modules_config || die "determining modules"
 
-	if ! useq no-suexec; then
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if ! useq no-suexec; then
 		myconf="${myconf}
 				--enable-suexec
 				--suexec-uidmin=1000 \
@@ -124,7 +127,7 @@ src_compile() {
 				--suexec-docroot=/var/www \
 				--suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--suexec-logfile=/var/log/apache/suexec_log"
-	fi
+#	fi
 
 	if useq ssl; then
 		myconf="${myconf} --enable-rule=EAPI"
@@ -162,10 +165,10 @@ src_install() {
 	dodoc ABOUT_APACHE Announcement INSTALL LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache/lib
diff --git a/net-www/apache/apache-2.0.54-r31.ebuild b/net-www/apache/apache-2.0.54-r31.ebuild
index 6b44d855596b..808265572217 100644
--- 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-2006 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.21 2006/07/21 03:36:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.54-r31.ebuild,v 1.22 2006/09/20 05:11:34 vericgar Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
+IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
 	|| ( ~dev-libs/apr-0.9.12 ~dev-libs/apr-0.9.7 ~dev-libs/apr-0.9.6 )
@@ -127,9 +127,12 @@ src_compile() {
 	# and the glibc (pthread) source
 	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
 
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
 		myconf="${myconf}
 				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--with-suexec-logfile=/var/log/apache2/suexec_log \
@@ -141,7 +144,7 @@ src_compile() {
 				--with-suexec-gidmin=100 \
 				--with-suexec-umask=077 \
 				--enable-suexec=shared"
-	fi
+#	fi
 
 	# common confopts
 	myconf="${myconf} \
@@ -190,10 +193,10 @@ src_install () {
 	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
@@ -247,7 +250,8 @@ src_install () {
 	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
 	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
 	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
+#	useq no-suexec || 
+	mv -v usr/sbin/suexec usr/sbin/suexec2
 
 	# do the man pages
 	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
@@ -256,7 +260,9 @@ src_install () {
 	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
 		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
 	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+	#useq no-suexec || 
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
 	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
 	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
 
diff --git a/net-www/apache/apache-2.0.58-r2.ebuild b/net-www/apache/apache-2.0.58-r2.ebuild
index 7edf2e3fe2d0..ffd246859dc1 100644
--- a/net-www/apache/apache-2.0.58-r2.ebuild
+++ b/net-www/apache/apache-2.0.58-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58-r2.ebuild,v 1.5 2006/09/08 21:33:40 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58-r2.ebuild,v 1.6 2006/09/20 05:11:34 vericgar Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
+IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
 	~dev-libs/apr-0.9.12
@@ -131,9 +131,12 @@ src_compile() {
 	# and the glibc (pthread) source
 	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
 
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
 		myconf="${myconf}
 				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--with-suexec-logfile=/var/log/apache2/suexec_log \
@@ -145,7 +148,7 @@ src_compile() {
 				--with-suexec-gidmin=100 \
 				--with-suexec-umask=077 \
 				--enable-suexec=shared"
-	fi
+#	fi
 
 	# common confopts
 	myconf="${myconf} \
@@ -194,10 +197,10 @@ src_install () {
 	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
@@ -251,7 +254,8 @@ src_install () {
 	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
 	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
 	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
+#	useq no-suexec || 
+	mv -v usr/sbin/suexec usr/sbin/suexec2
 
 	# do the man pages
 	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
@@ -260,7 +264,9 @@ src_install () {
 	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
 		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
 	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+	#useq no-suexec || 
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
 	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
 	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
 
diff --git a/net-www/apache/apache-2.0.58.ebuild b/net-www/apache/apache-2.0.58.ebuild
index b3313b09985e..24ffe61eb3e3 100644
--- a/net-www/apache/apache-2.0.58.ebuild
+++ b/net-www/apache/apache-2.0.58.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58.ebuild,v 1.10 2006/07/21 03:36:06 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.58.ebuild,v 1.11 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
+IUSE="apache2 debug doc ldap mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
 	~dev-libs/apr-0.9.12
@@ -129,9 +129,12 @@ src_compile() {
 	# and the glibc (pthread) source
 	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
 
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
 		myconf="${myconf}
 				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--with-suexec-logfile=/var/log/apache2/suexec_log \
@@ -143,7 +146,7 @@ src_compile() {
 				--with-suexec-gidmin=100 \
 				--with-suexec-umask=077 \
 				--enable-suexec=shared"
-	fi
+#	fi
 
 	# common confopts
 	myconf="${myconf} \
@@ -192,10 +195,10 @@ src_install () {
 	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
@@ -249,7 +252,8 @@ src_install () {
 	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
 	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
 	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
+#	useq no-suexec || 
+	mv -v usr/sbin/suexec usr/sbin/suexec2
 
 	# do the man pages
 	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
@@ -258,7 +262,9 @@ src_install () {
 	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
 		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
 	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+	#useq no-suexec || 
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
 	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
 	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8
 
diff --git a/net-www/apache/apache-2.0.59.ebuild b/net-www/apache/apache-2.0.59.ebuild
index d8d6f9dfac14..275c0ef427a9 100644
--- a/net-www/apache/apache-2.0.59.ebuild
+++ b/net-www/apache/apache-2.0.59.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.1 2006/07/30 05:14:55 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.59.ebuild,v 1.2 2006/09/20 05:11:35 vericgar Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker no-suexec ssl static-modules threads selinux"
+IUSE="apache2 debug doc ldap mpm-itk mpm-leader mpm-peruser mpm-prefork mpm-threadpool mpm-worker ssl static-modules threads selinux"
 
 RDEPEND="dev-lang/perl
 	~dev-libs/apr-0.9.12
@@ -138,9 +138,12 @@ src_compile() {
 	# and the glibc (pthread) source
 	echo 'ac_cv_func_sem_open=${ac_cv_func_sem_open=no}' >> ${S}/config.cache
 
-	if useq no-suexec; then
-		myconf="${myconf} --disable-suexec"
-	else
+# no more USE=no-suexec because of bug 148082
+# see the 2.2 ebuilds for how this can be done cleanly with a working system
+# "out of the box"
+#	if useq no-suexec; then
+#		myconf="${myconf} --disable-suexec"
+#	else
 		myconf="${myconf}
 				--with-suexec-safepath="/usr/local/bin:/usr/bin:/bin" \
 				--with-suexec-logfile=/var/log/apache2/suexec_log \
@@ -152,7 +155,7 @@ src_compile() {
 				--with-suexec-gidmin=100 \
 				--with-suexec-umask=077 \
 				--enable-suexec=shared"
-	fi
+#	fi
 
 	# common confopts
 	myconf="${myconf} \
@@ -201,10 +204,10 @@ src_install () {
 	dodoc ABOUT_APACHE CHANGES INSTALL LAYOUT LICENSE README* ${GENTOO_PATCHDIR}/docs/robots.txt
 
 	# protect the suexec binary
-	if ! useq no-suexec; then
+#	if ! useq no-suexec; then
 		fowners root:apache /usr/sbin/suexec
 		fperms 4710 /usr/sbin/suexec
-	fi
+#	fi
 
 	# apxs needs this to pickup the right lib for install
 	dosym /usr/$(get_libdir) /usr/$(get_libdir)/apache2/lib
@@ -258,7 +261,8 @@ src_install () {
 	mv -v usr/sbin/list_hooks.pl usr/sbin/list_hooks2.pl
 	mv -v usr/sbin/logresolve.pl usr/sbin/logresolve2.pl
 	useq ssl && mv -v usr/sbin/ab-ssl usr/sbin/ab2-ssl
-	useq no-suexec || mv -v usr/sbin/suexec usr/sbin/suexec2
+#	useq no-suexec || 
+	mv -v usr/sbin/suexec usr/sbin/suexec2
 
 	# do the man pages
 	for i in htdigest.1 htpasswd.1 dbmmanage.1; do
@@ -267,7 +271,9 @@ src_install () {
 	for i in ab.8 apxs.8 logresolve.8 rotatelogs.8; do
 		mv -v usr/share/man/man8/${i} usr/share/man/man8/${i/./2.}
 	done
-	useq no-suexec || mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+	#useq no-suexec || 
+	mv -v usr/share/man/man8/suexec.8 usr/share/man/man8/suexec2.8
+
 	mv -v usr/share/man/man8/apachectl.8 usr/share/man/man8/apache2ctl.8
 	mv -v usr/share/man/man8/httpd.8 usr/share/man/man8/apache2.8