version bump - bug #207306 - thanks Florian

Package-Manager: portage-2.1.4.4

4 files changed, 98 insertions, 16 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 3b7e089fdd98..60938366fc50 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.17 2007/02/23 19:39:50 bangert Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.18 2008/06/28 19:12:54 bangert Exp $
+
+*monkeyd-0.9.2 (28 Jun 2008)
+
+  28 Jun 2008; Thilo Bangert <bangert@gentoo.org> monkeyd-0.9.1.ebuild,
+  +monkeyd-0.9.2.ebuild:
+  version bump - bug #207306
 
   23 Feb 2007; Thilo Bangert <bangert@gentoo.org> monkeyd-0.9.1.ebuild:
   fix ROOT misuse
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index dd2a2b5d2f8e..e12bf48334ef 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,6 +1,8 @@
 AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574167bc11035297c1f784e9cb965edafba86e4 SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be305890b406d5074
 AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88a47edc7c75c8756718057f611c8f38fed803 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8
 DIST monkey-0.9.1.tar.gz 84389 RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db SHA1 e54b870c0f597cdfc164e800246ed8445ce6d5fc SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a
-EBUILD monkeyd-0.9.1.ebuild 2063 RMD160 7cd890ee49083d128ae83409624d62721e49bbf2 SHA1 05c4130f09d695876805f33729a9b7f6fc68a031 SHA256 41ac8c14b62abfcff3b072f5662e4e9e2ff1e463e640f43f83d20209b9717e09
-MISC ChangeLog 3809 RMD160 505c66a7788480f752a96ed1551e421bb760968b SHA1 a8f67808b8f87ed1bdfedae14c981a805c2461ce SHA256 40bccd207119178be8061178f23509da100ecf59d898c32ecce7c8c7b5684412
+DIST monkey-0.9.2.tar.gz 86289 RMD160 fa45e3ad01eb97d4c603dbb0e2b0e9529116ed1f SHA1 1f42b9b1dc925afb6895acaae2caab1a3d4e13e5 SHA256 0f36328dc7e1f0c21ef01351874b68d53cae3fecefe0a21fc98de24a80877a3b
+EBUILD monkeyd-0.9.1.ebuild 2083 RMD160 2e75e9611d9fb09641f118a83aad652d2918046c SHA1 c5ca126a664f154f67e7e271c85da7a768172641 SHA256 576c2a803902121a693f4a563895d64c6f414c54120183e9b17a6f23670b9041
+EBUILD monkeyd-0.9.2.ebuild 2086 RMD160 445f07331940d7eca9bbe5db2fab624aac7a4384 SHA1 c087c2d17091bb07ac140e6f054f892a2bc2a723 SHA256 bfee18a8a45f0a664f08cc04950bd1836987ff057792520e03af2c05c9388452
+MISC ChangeLog 3966 RMD160 ac32aea255c81f68b2387b11e1b28b9697786bda SHA1 051e83aec08caddb9441f812eb556ad13b8b1b2c SHA256 61d3a1aa94dbdd2b4f4e905f290249d1177c49f7a2e423904aa8ad4481823770
 MISC metadata.xml 164 RMD160 898ac97013b213230bb265ed2ace7751bc5421bc SHA1 555fbb8a11872e4109122cce6c44861b3bda173d SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa
diff --git a/www-servers/monkeyd/monkeyd-0.9.1.ebuild b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
index 42e94a526911..6e69f5775e88 100644
--- a/www-servers/monkeyd/monkeyd-0.9.1.ebuild
+++ b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1.ebuild,v 1.8 2007/02/23 19:39:50 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.9 2008/06/28 19:12:54 bangert Exp $
 
 inherit toolchain-funcs depend.php
 
@@ -26,7 +26,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
 }
 
@@ -50,12 +50,12 @@ src_compile() {
 
 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} \
+		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"
 
@@ -65,10 +65,10 @@ src_install() {
 	fi
 
 	[[ -e ${WEBROOT}/htdocs/index.html ]] && \
-		mv ${D}${WEBROOT}/htdocs/{index,index-monkey}.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
+	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
new file mode 100644
index 000000000000..4335d77af5f0
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-0.9.2.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2008/06/28 19:12: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}"
+	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
+}