Remove older verions, drop virtual/httpd-php to dev-lang/php since it pulls in apache

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

4 files changed, 10 insertions, 153 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 5ce2b7317eaf..a90d7b0ae0d8 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.50 2012/11/21 11:02:51 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.51 2013/01/05 21:47:02 blueness Exp $
+
+  05 Jan 2013; Anthony G. Basile <blueness@gentoo.org> -monkeyd-1.0.1-r1.ebuild,
+  -monkeyd-1.0.1.ebuild, monkeyd-1.1.1.ebuild:
+  Remove older verions, drop virtual/httpd-php to dev-lang/php since it pulls in
+  apache
 
   21 Nov 2012; Agostino Sarubbo <ago@gentoo.org> monkeyd-1.1.1.ebuild:
   Stable for x86, wrt bug #439346
diff --git a/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
deleted file mode 100644
index 338b3ceff807..000000000000
--- a/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild,v 1.2 2012/08/08 12:35:24 blueness Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs depend.php multilib
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBROOT="/var/www/localhost"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
-}
-
-src_configure() {
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-
-	#move htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${D}"${WEBROOT}/htdocs \
-		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${D}"${WEBROOT}/htdocs
-
-	keepdir \
-		/var/log/monkeyd \
-		${WEBROOT}/htdocs
-}
diff --git a/www-servers/monkeyd/monkeyd-1.0.1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1.ebuild
deleted file mode 100644
index 437dd4df2ab0..000000000000
--- a/www-servers/monkeyd/monkeyd-1.0.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.1.ebuild,v 1.6 2012/08/01 15:57:03 blueness Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs depend.php multilib
-
-WEBROOT="/var/www/localhost"
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
-}
-
-src_configure() {
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-
-	# Don't install the banana script man page
-	rm "${S}"/man/banana.1
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
-	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-1.1.1.ebuild b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
index 158baa783ee2..2604cbcf8c03 100644
--- a/www-servers/monkeyd/monkeyd-1.1.1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.1.1.ebuild,v 1.5 2012/11/21 11:02:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.1.1.ebuild,v 1.6 2013/01/05 21:47:02 blueness Exp $
 
 EAPI="4"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~mips ppc ppc64 x86"
 IUSE="php"
 
-RDEPEND="php? ( virtual/httpd-php )"
+RDEPEND="php? ( dev-lang/php )"
 
 S="${WORKDIR}/${MY_P}"