Remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

6 files changed, 7 insertions, 366 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 102ff8b6772f..54220a2e479a 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2012/02/11 03:05:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.26 2012/02/11 03:07:39 radhermit Exp $
+
+  11 Feb 2012; Tim Harder <radhermit@gentoo.org> -monkeyd-0.9.2.ebuild,
+  -monkeyd-0.9.2-r1.ebuild,
+  -files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.p
+  atch, -monkeyd-0.21.0.ebuild, -monkeyd-0.30.0.ebuild:
+  Remove old.
 
 *monkeyd-0.32.0 (11 Feb 2012)
 
diff --git a/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch b/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch
deleted file mode 100644
index a265d329d09b..000000000000
--- a/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-improve hand-made buildsystem
- - fixes --as-needed link
- - fixes jobserver
- - fixes strip
-
-by bangert@gentoo.org
-diff -Naur monkey-0.9.2.orig/configure monkey-0.9.2/configure
---- monkey-0.9.2.orig/configure	2008-01-17 12:29:36.000000000 +0100
-+++ monkey-0.9.2/configure	2009-04-19 20:38:00.000000000 +0200
-@@ -251,7 +251,7 @@
- # Monkey HTTP Daemon: Makefile
- # ============================
- default:
--	@(cd src; make all)
-+	@(cd src; \$(MAKE) all)
- 	@echo  
- 	@echo  " Running Monkey :"
- 	@echo  " ----------------"
-@@ -261,9 +261,9 @@
- 	@echo  "  For more help use '-h' option."		
- 	@echo 
- clean:
--	@(cd src; make clean)
-+	@(cd src; \$(MAKE) clean)
- distclean:
--	@(cd src; make distclean)
-+	@(cd src; \$(MAKE) distclean)
- EOF
- }
- 
-@@ -280,14 +280,14 @@
- LOGDIR=${logdir}
- 
- default:
--	@(cd src; make all)
-+	@(cd src; \$(MAKE) all)
- clean:
--	@(cd src; make clean)
-+	@(cd src; \$(MAKE) clean)
- distclean:
--	@(cd src; make distclean)
-+	@(cd src; \$(MAKE) distclean)
- 
- install:
--	make -C src all
-+	\$(MAKE) -C src all
- 	install -d \$(BINDIR)
- 	install -d \$(CGIBIN)
- 	install -d \$(SYSCONFDIR) 
-@@ -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)
-@@ -334,9 +334,7 @@
- cat > src/Makefile<<EOF
- CC	= $CC
- DEFS	= $mod_defs
--CFLAGS	= \$(DEFS) -g -O2 -Wall
- INCDIR  = ./include
--LDFLAGS	= 
- DESTDIR	= ../bin/monkey
- LIBS	= -lpthread $mod_libs $MORE_LIBS
- OBJ	= monkey.o method.o mimetype.o request.o \\
-@@ -350,8 +348,7 @@
- 	$make_script
- 	
- ../bin/monkey: \$(OBJ)
--	\$(CC) \$(CFLAGS) \$(LIBS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj
--	$STRIP ../bin/monkey
-+	\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$(OBJ) $mod_obj \$(LIBS)
- 	
- clean:
- 	rm -rf *.o
diff --git a/www-servers/monkeyd/monkeyd-0.21.0.ebuild b/www-servers/monkeyd/monkeyd-0.21.0.ebuild
deleted file mode 100644
index 6deeb579f246..000000000000
--- a/www-servers/monkeyd/monkeyd-0.21.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.21.0.ebuild,v 1.1 2011/11/16 07:18:38 radhermit 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 ~sparc ~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.30.0.ebuild b/www-servers/monkeyd/monkeyd-0.30.0.ebuild
deleted file mode 100644
index bf4a94081e45..000000000000
--- a/www-servers/monkeyd/monkeyd-0.30.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.30.0.ebuild,v 1.1 2012/01/03 02:12:51 radhermit 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 ~sparc ~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.2-r1.ebuild b/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild
deleted file mode 100644
index 6d5bd132f30f..000000000000
--- a/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild,v 1.2 2009/04/20 08:09:58 bangert Exp $
-
-EAPI="2"
-
-inherit toolchain-funcs eutils 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 ~sparc ~x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.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"
-}
-
-src_configure() {
-	# monkey has it's own funky script ... cant use econf
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--cgibin=${WEBROOT}/cgi-bin \
-		--sysconfdir=/etc/${PN} \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--lang=en \
-		|| die
-}
-
-src_compile() {
-	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
-
-	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
-}
diff --git a/www-servers/monkeyd/monkeyd-0.9.2.ebuild b/www-servers/monkeyd/monkeyd-0.9.2.ebuild
deleted file mode 100644
index 33032113976e..000000000000
--- a/www-servers/monkeyd/monkeyd-0.9.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.2.ebuild,v 1.2 2008/10/21 19:30:54 bangert Exp $
-
-inherit 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 ~sparc ~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
-}