Cleanup.

(Portage version: 2.1_rc1-r3)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 245 deletions

diff --git a/www-apache/mod_suphp/Manifest b/www-apache/mod_suphp/Manifest
index e226d43d3963..6469b78be363 100644
--- a/www-apache/mod_suphp/Manifest
+++ b/www-apache/mod_suphp/Manifest
@@ -10,34 +10,19 @@ AUX suphp.conf 905 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 SHA1 33d586b5
 MD5 4c2c4f6d464975c72a932c9eef2e3461 files/suphp.conf 905
 RMD160 a95a7ed6f3d135ea6ab6e6ecaa272b735a306f43 files/suphp.conf 905
 SHA256 8a1dd8bee95dc8ab599cdcca966a583e7fbde5c41b377aa208e1f60af54b6dd7 files/suphp.conf 905
-DIST suphp-0.6.0.tar.gz 247534 RMD160 953f3be08d7e33ff64e327ee34bb84639888aa5f SHA256 6fe1c15da4d4dbb96e02e5c4d8878ffc1d5dc25c4cc3bf4e1cfda93503c69077 size 247534
 DIST suphp-0.6.1.tar.gz 361372 RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 size 361372
-EBUILD mod_suphp-0.6.0.ebuild 2657 RMD160 ef803081dd2287063664797c711b62d3e867dbae SHA1 ae8a82f321f81e43f303837871fabb2bfc5564e4 SHA256 5e77a15ef1247d42e3195d0e5541b8fbed94bcca178b5fa2e8d11306d1fee54e size 2657
-MD5 f62afe22860416987a08d636401f9b67 mod_suphp-0.6.0.ebuild 2657
-RMD160 ef803081dd2287063664797c711b62d3e867dbae mod_suphp-0.6.0.ebuild 2657
-SHA256 5e77a15ef1247d42e3195d0e5541b8fbed94bcca178b5fa2e8d11306d1fee54e mod_suphp-0.6.0.ebuild 2657
-EBUILD mod_suphp-0.6.1-r1.ebuild 3027 RMD160 c1b5e0c54cb2290a3f173893dca599339c47a092 SHA1 7b5309ce2bd6e9ba9d7e0e4cb1c1e778097c261d SHA256 0075e34dcd5c88857f0f1ff771af72d56c24d5df85cc3c72adbb7b03f0eca48f size 3027
-MD5 0299f410e4fe1e5ad449a6b6535179c4 mod_suphp-0.6.1-r1.ebuild 3027
-RMD160 c1b5e0c54cb2290a3f173893dca599339c47a092 mod_suphp-0.6.1-r1.ebuild 3027
-SHA256 0075e34dcd5c88857f0f1ff771af72d56c24d5df85cc3c72adbb7b03f0eca48f mod_suphp-0.6.1-r1.ebuild 3027
-EBUILD mod_suphp-0.6.1.ebuild 2657 RMD160 2054485233c4cb06c694d18c98e958a3a66cd377 SHA1 b511b9715d62442fdaead7770789975075e9710c SHA256 d2af391aa553d2b61c306383b157687295289649371e586f58a31d08e2570d5c size 2657
-MD5 5bec0da0a33b4dc857481b56e0dfad51 mod_suphp-0.6.1.ebuild 2657
-RMD160 2054485233c4cb06c694d18c98e958a3a66cd377 mod_suphp-0.6.1.ebuild 2657
-SHA256 d2af391aa553d2b61c306383b157687295289649371e586f58a31d08e2570d5c mod_suphp-0.6.1.ebuild 2657
-MISC ChangeLog 1078 RMD160 acdc74870609e87181556d1f6447613c3f13426f SHA1 a73cdc6a99fec1780f52f29a390c6d1f354ff7da SHA256 ee16c12422285c0dd4cbe5442eaadb4c6892fa8edb42e48c649711a64c3ed753 size 1078
-MD5 09e62474a1c41c2584f2f0993586bd08 ChangeLog 1078
-RMD160 acdc74870609e87181556d1f6447613c3f13426f ChangeLog 1078
-SHA256 ee16c12422285c0dd4cbe5442eaadb4c6892fa8edb42e48c649711a64c3ed753 ChangeLog 1078
-MISC metadata.xml 226 RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e SHA1 fe9f7ce6f2281683065abb3255c8b731665c82ac SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 size 226
-MD5 7272d8b6d09e3e301b6a08aa9c912eb0 metadata.xml 226
-RMD160 d11ce73e47adf4b3d91309ec6489fded2f4d4e0e metadata.xml 226
-SHA256 376a327f91f69eb96f0c1b05cc1481dd7017a0570f631a03b1f6d14d58215ca8 metadata.xml 226
-MD5 20ed141234c6ec7123f9088296b6bc26 files/digest-mod_suphp-0.6.0 235
-RMD160 bcb6993133f35ca61b87740faa22ea7033a65dc2 files/digest-mod_suphp-0.6.0 235
-SHA256 d21b2818c61cc277ecf38dd9107d17a177ea5128d67b4ad8583c02dc2d862003 files/digest-mod_suphp-0.6.0 235
-MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1 235
-RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1 235
-SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1 235
+EBUILD mod_suphp-0.6.1-r1.ebuild 3039 RMD160 4d7557a630964940186f6cfba7e196333700a8a6 SHA1 dcff6c7a666e3ed14b8498cecad92ec64d6fb561 SHA256 aa7c84b42a46ac326a4eb28ee019591907e3e15b6d0cb69ca454226be36d2549 size 3039
+MD5 40e0ef2a4302366586436504d031fee3 mod_suphp-0.6.1-r1.ebuild 3039
+RMD160 4d7557a630964940186f6cfba7e196333700a8a6 mod_suphp-0.6.1-r1.ebuild 3039
+SHA256 aa7c84b42a46ac326a4eb28ee019591907e3e15b6d0cb69ca454226be36d2549 mod_suphp-0.6.1-r1.ebuild 3039
+MISC ChangeLog 1260 RMD160 84b520ea7fed40c07456b68ec4cd1224ae092e85 SHA1 9313181145d27b43e5e7211040567409d8e6d532 SHA256 e2542aedf7eebacefff48bad5417727d511c535ee06c65a19070f0a8100ba4d4 size 1260
+MD5 14240f0b9d29f72b6c2ca63f673ae7d0 ChangeLog 1260
+RMD160 84b520ea7fed40c07456b68ec4cd1224ae092e85 ChangeLog 1260
+SHA256 e2542aedf7eebacefff48bad5417727d511c535ee06c65a19070f0a8100ba4d4 ChangeLog 1260
+MISC metadata.xml 231 RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce SHA1 66b21c56c3a98e5a4b489dc000ff1d5956ab63d0 SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 size 231
+MD5 94cc9443fa6aead0b11dda55a10e117e metadata.xml 231
+RMD160 a4a252abe4fb2922d19ccc4952d0128c3ccefbce metadata.xml 231
+SHA256 79cc89f7b494dc5097d6dc5fedeb567e0dbc13e2adfcbe3f80082ad4625b38b3 metadata.xml 231
 MD5 e13102858fd8132c87bfc61e2d089691 files/digest-mod_suphp-0.6.1-r1 235
 RMD160 8faac9395fa8a523aab5d1d427fb92e7ca7bb933 files/digest-mod_suphp-0.6.1-r1 235
 SHA256 59a2c8876291b3a883b38e3840cd5fed86f7fc44d53ec2aece917411d7ea1617 files/digest-mod_suphp-0.6.1-r1 235
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
deleted file mode 100644
index 3be8cbc84378..000000000000
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fa89691101b9ebf18f4922b1382186c6 suphp-0.6.0.tar.gz 247534
-RMD160 953f3be08d7e33ff64e327ee34bb84639888aa5f suphp-0.6.0.tar.gz 247534
-SHA256 6fe1c15da4d4dbb96e02e5c4d8878ffc1d5dc25c4cc3bf4e1cfda93503c69077 suphp-0.6.0.tar.gz 247534
diff --git a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1 b/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
deleted file mode 100644
index 678c9c1d791b..000000000000
--- a/www-apache/mod_suphp/files/digest-mod_suphp-0.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7eb8ae29404392d9eb07c69d5242d716 suphp-0.6.1.tar.gz 361372
-RMD160 c4a77b32ab8ca7f263800c6a745e22cb13959adb suphp-0.6.1.tar.gz 361372
-SHA256 fd838e3ec24846db2733ee54117c84348c21a2c41990b7a51eadf1b1df041443 suphp-0.6.1.tar.gz 361372
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
deleted file mode 100644
index bb82b5fadb5d..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2006 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.0.ebuild,v 1.6 2006/03/09 20:03:09 chtekk Exp $
-
-inherit apache-module eutils
-
-MY_P=${P/mod_/}
-
-SETIDMODES="mode-force mode-owner mode-paranoid"
-
-DESCRIPTION="A PHP wrapper for Apache"
-HOMEPAGE="http://www.suphp.org"
-SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-IUSE="checkpath ${SETIDMODES}"
-SLOT="0"
-
-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
-	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}"
-
-	CFLAGS="$(apr-config --includes) $(apu-config --includes)" \
-	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 suphp setuid
-	chmod 4755 /usr/sbin/suphp
-}
diff --git a/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild b/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
deleted file mode 100644
index a32f09f1d900..000000000000
--- a/www-apache/mod_suphp/mod_suphp-0.6.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2006 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.1.ebuild,v 1.2 2006/03/09 20:03:09 chtekk Exp $
-
-inherit apache-module eutils
-
-MY_P=${P/mod_/}
-
-SETIDMODES="mode-force mode-owner mode-paranoid"
-
-DESCRIPTION="A PHP wrapper for Apache"
-HOMEPAGE="http://www.suphp.org"
-SRC_URI="http://www.suphp.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
-IUSE="checkpath ${SETIDMODES}"
-SLOT="0"
-
-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
-	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}"
-
-	CFLAGS="$(apr-config --includes) $(apu-config --includes)" \
-	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 suphp setuid
-	chmod 4755 /usr/sbin/suphp
-}