Drop www-server herd as discussed in gentoo-dev ML. Drop old.

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 8 insertions, 145 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index a667087dcbd4..15bf09c7711d 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,10 @@
 # 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.30 2012/03/18 18:00:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.31 2012/03/21 11:33:43 pacho Exp $
+
+  21 Mar 2012; Pacho Ramos <pacho@gentoo.org> -monkeyd-0.32.0.ebuild,
+  -monkeyd-0.9.1.ebuild, metadata.xml:
+  Drop www-server herd as discussed in gentoo-dev ML. Drop old.
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> monkeyd-0.9.1.ebuild,
   monkeyd-0.31.0.ebuild, monkeyd-0.32.0.ebuild, monkeyd-0.33.0.ebuild:
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index bf4811e274e0..a40624fba8f0 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-0.32.0.ebuild b/www-servers/monkeyd/monkeyd-0.32.0.ebuild
deleted file mode 100644
index 1f7f5082185c..000000000000
--- a/www-servers/monkeyd/monkeyd-0.32.0.ebuild
+++ /dev/null
@@ -1,68 +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-0.32.0.ebuild,v 1.2 2012/03/18 18:00:00 armin76 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:4}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~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, it is broken as is anyway and the
-	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
-	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}"
-}
-
-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.init.d monkeyd
-	newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-0.9.1.ebuild b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
deleted file mode 100644
index de235264abf4..000000000000
--- a/www-servers/monkeyd/monkeyd-0.9.1.ebuild
+++ /dev/null
@@ -1,75 +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-0.9.1.ebuild,v 1.11 2012/03/18 18:00:00 armin76 Exp $
-
-inherit eutils toolchain-funcs depend.php
-
-WEBROOT=/var/www/localhost
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="fast, efficient, (REALLY) small, and easy to configure web server"
-HOMEPAGE="http://monkeyd.sourceforge.net/"
-SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ppc x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/monkeyd-dont-strip-configure.patch"
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-}
-
-src_compile() {
-	# monkey has it's own funky script ... cant use econf
-	env STRIP=true \
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--cgibin=${WEBROOT}/cgi-bin \
-		--sysconfdir=/etc/${PN} \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--lang=en \
-		|| die
-	# Don't install the banana script, it is broken as is anyway and the
-	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
-	sed -i '/install -m 755 bin\/banana/d' Makefile
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make \
-		PREFIX="${D}"/usr \
-		BINDIR="${D}"/usr/bin \
-		CGIBIN="${D}"${WEBROOT}/cgi-bin \
-		SYSCONFDIR="${D}"/etc/${PN} \
-		DATADIR="${D}"${WEBROOT}/htdocs \
-		LOGDIR="${D}"/var/log/${PN} \
-		install \
-		|| die "make install failed"
-
-	if use php ; then
-		dosed '/^#AddScript application\/x-httpd-php/s:^#::' /etc/monkeyd/monkey.conf
-		dosed 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' /etc/monkeyd/monkey.conf
-	fi
-
-	[[ -e ${WEBROOT}/htdocs/index.html ]] && \
-		mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html
-
-	dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf
-	newinitd "${FILESDIR}"/monkeyd.init.d monkeyd
-	newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd
-	dodoc README MODULES *.txt
-}