misc qa fixes - fix --as-needed (bug #248483)

(Portage version: 2.1.6.7/cvs/Linux i686)

3 files changed, 159 insertions, 2 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 387470083948..a0f9a8a0ec89 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.19 2008/10/21 19:30:54 bangert Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.20 2009/04/19 18:51:36 bangert Exp $
+
+*monkeyd-0.9.2-r1 (19 Apr 2009)
+
+  19 Apr 2009; Thilo Bangert <bangert@gentoo.org>
+  +files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserve
+  r.patch, +monkeyd-0.9.2-r1.ebuild:
+  misc qa fixes - fix --as-needed (bug #248483)
 
   21 Oct 2008; Thilo Bangert <bangert@gentoo.org>
   +files/monkeyd-dont-strip-configure.patch, monkeyd-0.9.1.ebuild,
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
new file mode 100644
index 000000000000..a265d329d09b
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch
@@ -0,0 +1,78 @@
+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.9.2-r1.ebuild b/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..59d386586264
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-0.9.2-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.1 2009/04/19 18:51:36 bangert Exp $
+
+EAPI="2"
+
+inherit toolchain-funcs eutils
+
+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[cgi] )"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+}