4 files changed, 6 insertions, 132 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 05d7aa725f36..4838c37fe5cf 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.34 2012/06/07 08:22:05 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.35 2012/06/07 08:25:21 blueness Exp $
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
+  -monkeyd-0.33.0-r1.ebuild, -files/monkeyd-dont-strip-configure.patch,
+  -files/monkeyd-fix-manpage-path.patch:
+  Cleanup, monkeyd-fix-manpage-path.patch accepted upstream
 
 *monkeyd-1.0.0 (07 Jun 2012)
 
diff --git a/www-servers/monkeyd/files/monkeyd-dont-strip-configure.patch b/www-servers/monkeyd/files/monkeyd-dont-strip-configure.patch
deleted file mode 100644
index 46c019adbeea..000000000000
--- a/www-servers/monkeyd/files/monkeyd-dont-strip-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2008-10-20 13:08:13.000000000 +0200
-+++ configure	2008-10-20 13:14:25.000000000 +0200
-@@ -296,7 +296,7 @@
- 	install -d \${DATADIR}/php
- 	install -d \${DATADIR}/docs
- 	install -d \${LOGDIR}
--	install -s -m 755 bin/monkey \$(BINDIR)
-+	install -m 755 bin/monkey \$(BINDIR)
- 	install -m 755 bin/banana \$(BINDIR)
- 	install -m 755 ./cgi-bin/* \$(CGIBIN)
- 	install -m 600 ./conf/*.* \$(SYSCONFDIR)
-@@ -351,7 +351,6 @@
- 	
- ../bin/monkey: \$(OBJ)
- 	\$(CC) \$(CFLAGS) \$(LIBS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj
--	$STRIP ../bin/monkey
- 	
- clean:
- 	rm -rf *.o
diff --git a/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch b/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch
deleted file mode 100644
index ecb20e720159..000000000000
--- a/www-servers/monkeyd/files/monkeyd-fix-manpage-path.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4817136af00893fd46a2993d79c7aeb9fafaa119 Mon Sep 17 00:00:00 2001
-From: Anthony G. Basile <blueness@gentoo.org>
-Date: Wed, 23 May 2012 10:53:10 -0400
-Subject: [PATCH] configure: fix #156, install man pages to the correct sections
-
-The current configure script installs the man pages banana.1, monkey.1
-and monkey-api.3 at the top level man dir, /usr/share/man, and not in
-the appropriate categories by FHS standards.  This fixes the issue.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- configure |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index ab02d30..d4e8956 100755
---- a/configure
-+++ b/configure
-@@ -347,7 +347,8 @@ distclean:
- install:
- 	\$(MAKE) -C src all
- 	install -d \$(BINDIR)
--	install -d \$(MANDIR)
-+	install -d \$(MANDIR)/man1
-+	install -d \$(MANDIR)/man3
- 	install -d \$(SYSCONFDIR)
- 	install -d \${SYSCONFDIR}/sites
- 	install -d \${SYSCONFDIR}/plugins
-@@ -362,7 +363,9 @@ install:
- $plgconf
- 	install -m 644 ./conf/sites/* \${SYSCONFDIR}/sites
- $plglist
--	install -m 644 ./man/* \$(MANDIR)
-+	install -m 644 ./man/banana.1 \$(MANDIR)/man1
-+	install -m 644 ./man/monkey.1 \$(MANDIR)/man1
-+	install -m 644 ./man/monkey-api.3 \$(MANDIR)/man3
- 	install -m 644 ./htdocs/*.* \$(DATADIR)
- 	install -m 644 ./htdocs/imgs/*.* \${DATADIR}/imgs
- 	$STRIP \$(BINDIR)/monkey
--- 
-1.7.3.4
-
diff --git a/www-servers/monkeyd/monkeyd-0.33.0-r1.ebuild b/www-servers/monkeyd/monkeyd-0.33.0-r1.ebuild
deleted file mode 100644
index 78b161f47d19..000000000000
--- a/www-servers/monkeyd/monkeyd-0.33.0-r1.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-0.33.0-r1.ebuild,v 1.1 2012/05/23 15:42:00 blueness Exp $
-
-EAPI="4"
-
-inherit eutils 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() {
-	epatch "${FILESDIR}/${PN}-fix-manpage-path.patch"
-
-	# 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
-}