Cleanup.

Package-Manager: portage-2.1.2_rc4-r8

3 files changed, 24 insertions, 18 deletions

diff --git a/www-apache/mod_suphp/ChangeLog b/www-apache/mod_suphp/ChangeLog
index d87d2b9f4d75..6539ca29c51c 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.11 2006/11/29 05:22:18 vericgar Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_suphp/ChangeLog,v 1.12 2007/01/15 19:20:06 chtekk Exp $
+
+  15 Jan 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/suphp-apache22-compat.patch, -files/suphp-mod_userdir.patch,
+  metadata.xml, -mod_suphp-0.6.1-r1.ebuild, -mod_suphp-0.6.1-r2.ebuild,
+  mod_suphp-0.6.2.ebuild:
+  Cleanup.
 
 *mod_suphp-0.6.2 (29 Nov 2006)
 
diff --git a/www-apache/mod_suphp/metadata.xml b/www-apache/mod_suphp/metadata.xml
index 8f398d815b6c..a1f5ceff2352 100644
--- a/www-apache/mod_suphp/metadata.xml
+++ b/www-apache/mod_suphp/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>apache</herd>
 	<maintainer>
-  		<email>apache-bugs@gentoo.org</email>
+		<email>apache-bugs@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild
index 8a7bfee8a548..622cf250097c 100644
--- a/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild
+++ b/www-apache/mod_suphp/mod_suphp-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/11/29 05:22:18 vericgar Exp $
+# $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
 
@@ -8,14 +8,14 @@ MY_P="${P/mod_/}"
 
 SETIDMODES="mode-force mode-owner mode-paranoid"
 
-DESCRIPTION="A PHP wrapper for Apache."
+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"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="checkpath ${SETIDMODES}"
 SLOT="0"
+IUSE="checkpath ${SETIDMODES}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -27,22 +27,22 @@ APXS2_S="${S}/src/apache2"
 APACHE2_MOD_CONF="70_${PN}"
 APACHE2_MOD_DEFINE="SUPHP"
 
-need_apache 2.x
+need_apache2
 
 pkg_setup() {
 	modecnt=0
-	for mode in ${SETIDMODES}; do
-		if use ${mode}; then
-			if [[ ${modecnt} -eq 0 ]]; then
+	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
+			elif [[ ${modecnt} -ge 1 ]] ; then
 				die "You can only select ONE mode in your USE flags!"
 			fi
 		fi
 	done
 
-	if [[ ${modecnt} -eq 0 ]]; then
+	if [[ ${modecnt} -eq 0 ]] ; then
 		ewarn
 		ewarn "No mode selected, defaulting to paranoid!"
 		ewarn
@@ -71,7 +71,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	local myargs=
+	local myargs=""
 	use checkpath || myargs="${myargs} --disable-checkpath"
 
 	myargs="${myargs} \
@@ -101,8 +101,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	# make suphp setuid
-	chmod 4755 /usr/sbin/suphp
+	# Make the suphp binary setuid
+	chmod 4755 "${ROOT}"/usr/sbin/suphp
 
 	apache-module_pkg_postinst
 }