fix #191640; cleanup

Package-Manager: portage-2.1.3.9

6 files changed, 23 insertions, 135 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index 0c76b58b1138..533900f38fb3 100644
--- a/www-apache/mod_suphp/ChangeLog
+++ b/www-apache/mod_suphp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_suphp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.14 2007/09/09 07:34:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.15 2007/09/20 06:35:31 hollow Exp $
+
+*mod_suphp-0.6.2-r3 (20 Sep 2007)
+
+  20 Sep 2007; Benedikt Böhm <hollow@gentoo.org> -mod_suphp-0.6.2.ebuild,
+  -mod_suphp-0.6.2-r2.ebuild, +mod_suphp-0.6.2-r3.ebuild:
+  fix #191640; cleanup
 
 *mod_suphp-0.6.2-r2 (09 Sep 2007)
 
diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index a958ae836fad..fd6bd8acc037 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -18,35 +18,28 @@ EBUILD mod_suphp-0.6.2-r1.ebuild 2757 RMD160 cd7544024b5db1179db5eb05199775c88da
 MD5 b38b931702a317e4899ced56276c96c0 mod_suphp-0.6.2-r1.ebuild 2757
 RMD160 cd7544024b5db1179db5eb05199775c88da06acd mod_suphp-0.6.2-r1.ebuild 2757
 SHA256 e25628eacf5ba8dd9a912b95ef94ed71335984c693c1cfeda00e0a9ab857f30f mod_suphp-0.6.2-r1.ebuild 2757
-EBUILD mod_suphp-0.6.2-r2.ebuild 2775 RMD160 768a87a62d920b7e46d505ec6b5fb6af1ca3f417 SHA1 da8224f2d146bd77733c754425817ca629728720 SHA256 e667e4a0b4ea46f6b572b31970325fa5eb2435313fc527e27125b3be6f56f720
-MD5 0eed0e03faf6e78cd24f8253881caa40 mod_suphp-0.6.2-r2.ebuild 2775
-RMD160 768a87a62d920b7e46d505ec6b5fb6af1ca3f417 mod_suphp-0.6.2-r2.ebuild 2775
-SHA256 e667e4a0b4ea46f6b572b31970325fa5eb2435313fc527e27125b3be6f56f720 mod_suphp-0.6.2-r2.ebuild 2775
-EBUILD mod_suphp-0.6.2.ebuild 2719 RMD160 e39796c766df6151098c1457e4aadbce7eac5435 SHA1 79f61a1dd6e3d9128a69595f50cac2c2eee6b012 SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e
-MD5 b37391f5e14f12f3311fb0715403a4ed mod_suphp-0.6.2.ebuild 2719
-RMD160 e39796c766df6151098c1457e4aadbce7eac5435 mod_suphp-0.6.2.ebuild 2719
-SHA256 f3f991b24e31817fef02fefd6b10c2ff4fb06c54a00d6dff7ebaf5f9c269f60e mod_suphp-0.6.2.ebuild 2719
-MISC ChangeLog 2440 RMD160 bcb410780d5cd2615eb1a37d31fdaad212cd6df6 SHA1 417c69cd342980d7843bea5c4997395f5b7296a8 SHA256 0c793a503f569366ebb918c0e379e09d84da4241fd92e0cc940f19914d303d74
-MD5 9212bc4613ba301f04862f02b39c4e7c ChangeLog 2440
-RMD160 bcb410780d5cd2615eb1a37d31fdaad212cd6df6 ChangeLog 2440
-SHA256 0c793a503f569366ebb918c0e379e09d84da4241fd92e0cc940f19914d303d74 ChangeLog 2440
+EBUILD mod_suphp-0.6.2-r3.ebuild 2793 RMD160 97798cf2dec8033cdfa07780c1f54e4087ffcd9f SHA1 207e1a3e3c77f764168d39b43587cfdbd1dc803a SHA256 edd3c03c817ae0cbe75761432c39aa13d39d653bf1626930fe8967bbc0636855
+MD5 e14744a48713bb0d29973e7e8ef9cdf0 mod_suphp-0.6.2-r3.ebuild 2793
+RMD160 97798cf2dec8033cdfa07780c1f54e4087ffcd9f mod_suphp-0.6.2-r3.ebuild 2793
+SHA256 edd3c03c817ae0cbe75761432c39aa13d39d653bf1626930fe8967bbc0636855 mod_suphp-0.6.2-r3.ebuild 2793
+MISC ChangeLog 2632 RMD160 f8245023fd863856c19b02b23f649654d3d21f38 SHA1 c4d80e4347975f633e886ea0d8da3fb7d3bb41b8 SHA256 234b4c7fdb906f4589220bef011a8fbd4fb561472ac72304bab1253a5bb5015b
+MD5 eb8381a33da24b1b17117a6ff1a01849 ChangeLog 2632
+RMD160 f8245023fd863856c19b02b23f649654d3d21f38 ChangeLog 2632
+SHA256 234b4c7fdb906f4589220bef011a8fbd4fb561472ac72304bab1253a5bb5015b ChangeLog 2632
 MISC metadata.xml 229 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 SHA1 92fdbcb6a85ece96506733ad67a5e4e74a58a529 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d
 MD5 17bfbf436c6d4afc4dea019597d048d1 metadata.xml 229
 RMD160 bb816bd761846ad578f8c1521a1f1ec6297410f4 metadata.xml 229
 SHA256 8e1aafc5385805d45759406a60df79f0ce88aa1df1a58d44b596405d64c9226d metadata.xml 229
-MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2 235
-RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2 235
-SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2 235
 MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2-r1 235
 RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2-r1 235
 SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2-r1 235
-MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2-r2 235
-RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2-r2 235
-SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2-r2 235
+MD5 7f9d140384540bad41b6f073efbc2fb3 files/digest-mod_suphp-0.6.2-r3 235
+RMD160 51b68629cdbc429e670350bce536fb38062d84bc files/digest-mod_suphp-0.6.2-r3 235
+SHA256 fd48db267dabf6a98dd56da51bbd59d42877c187302952276a20cd315b42f255 files/digest-mod_suphp-0.6.2-r3 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG46IDmPFBzbX68WERAtM6AJ9hyONvc0RLHXKw0rmgjihofDPNZwCfWeJQ
-Ht7r819C1eEMsjww+Vl9yUM=
-=FGdP
+iD8DBQFG8hS8mPFBzbX68WERAnc7AJ0d9/nG1al0gb3HsHWUu8FU2L8ZJgCfTQ6L
+sHzkv5y5NxRpT+QBCNLgM0M=
+=mdjE
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r2 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r2
deleted file mode 100644
index 4090dfae7750..000000000000
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 06ca9e592a5c6dd3dcb9360c958369c1 suphp-0.6.2.tar.gz 372228
-RMD160 6cafc7ef9bb261ee34bed08976a5e4a929f25a73 suphp-0.6.2.tar.gz 372228
-SHA256 1bb9c6af84bb901c8a39611354e49e5bcd79185eb37b02878dc0840facf0ccfc suphp-0.6.2.tar.gz 372228
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r3
index 4090dfae7750..4090dfae7750 100644
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2
+++ b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.2-r3
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2-r2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
index e8f4bd7621df..9947f770fb0f 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.2-r2.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r2.ebuild,v 1.1 2007/09/09 07:34:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2-r3.ebuild,v 1.1 2007/09/20 06:35:31 hollow Exp $
 
 inherit apache-module autotools eutils
 
@@ -88,7 +88,7 @@ src_compile() {
 			--with-apache-user=${SUPHP_APACHEUSER} \
 			--with-logfile=${SUPHP_LOGFILE} \
 			--with-apxs=${APXS2} \
-			--with-apr=/usr"
+			--with-apr=/usr/bin/$(apr_config)"
 	econf ${myargs} || die "econf failed"
 
 	emake || die "make failed"
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild
deleted file mode 100644
index 622cf250097c..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild,v 1.2 2007/01/15 19:20:07 chtekk Exp $
-
-inherit apache-module eutils
-
-MY_P="${P/mod_/}"
-
-SETIDMODES="mode-force mode-owner mode-paranoid"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DESCRIPTION="A PHP wrapper for Apache2."
-HOMEPAGE="http://www.suphp.org/"
-SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="checkpath ${SETIDMODES}"
-
-S="${WORKDIR}/${MY_P}"
-
-APXS1_S="${S}/src/apache"
-APACHE1_MOD_CONF="70_${PN}"
-APACHE1_MOD_DEFINE="SUPHP"
-
-APXS2_S="${S}/src/apache2"
-APACHE2_MOD_CONF="70_${PN}"
-APACHE2_MOD_DEFINE="SUPHP"
-
-need_apache2
-
-pkg_setup() {
-	modecnt=0
-	for mode in ${SETIDMODES} ; do
-		if use ${mode} ; then
-			if [[ ${modecnt} -eq 0 ]] ; then
-				SUPHP_SETIDMODE=${mode/mode-}
-				let modecnt++
-			elif [[ ${modecnt} -ge 1 ]] ; then
-				die "You can only select ONE mode in your USE flags!"
-			fi
-		fi
-	done
-
-	if [[ ${modecnt} -eq 0 ]] ; then
-		ewarn
-		ewarn "No mode selected, defaulting to paranoid!"
-		ewarn
-		ewarn "If you want to choose another mode, put mode-force OR mode-owner"
-		ewarn "into your USE flags and run emerge again."
-		ewarn
-		SUPHP_SETIDMODE=paranoid
-	fi
-
-	einfo
-	einfo "Using ${SUPHP_SETIDMODE/mode-} mode"
-	einfo
-	einfo "You can manipulate several configure options of this"
-	einfo "ebuild through environment variables:"
-	einfo
-	einfo "SUPHP_MINUID: Minimum UID, which is allowed to run scripts (default: 1000)"
-	einfo "SUPHP_MINGID: Minimum GID, which is allowed to run scripts (default: 100)"
-	einfo "SUPHP_APACHEUSER: Name of the user Apache is running as (default: apache)"
-	einfo "SUPHP_LOGFILE: Path to suPHP logfile (default: /var/log/apache2/suphp_log)"
-	einfo
-
-	: ${SUPHP_MINUID:=1000}
-	: ${SUPHP_MINGID:=100}
-	: ${SUPHP_APACHEUSER:="apache"}
-	: ${SUPHP_LOGFILE:="/var/log/apache2/suphp_log"}
-}
-
-src_compile() {
-	local myargs=""
-	use checkpath || myargs="${myargs} --disable-checkpath"
-
-	myargs="${myargs} \
-			--with-setid-mode=${SUPHP_SETIDMODE} \
-	        --with-min-uid=${SUPHP_MINUID} \
-	        --with-min-gid=${SUPHP_MINGID} \
-	        --with-apache-user=${SUPHP_APACHEUSER} \
-	        --with-logfile=${SUPHP_LOGFILE} \
-	        --with-apxs=${APXS2} \
-			--with-apr=/usr"
-	econf ${myargs} || die "econf failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	apache-module_src_install
-	dosbin src/suphp
-
-	dodoc ChangeLog doc/CONFIG
-
-	docinto apache
-	dodoc doc/apache/CONFIG doc/apache/INSTALL
-
-	insinto /etc
-	doins "${FILESDIR}/suphp.conf"
-}
-
-pkg_postinst() {
-	# Make the suphp binary setuid
-	chmod 4755 "${ROOT}"/usr/sbin/suphp
-
-	apache-module_pkg_postinst
-}