Version bump (fixes bug #339100).

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

3 files changed, 92 insertions, 3 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 7f897eb0acc3..b0b18a9ee93a 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.21 2009/04/20 08:09:58 bangert Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.22 2011/11/16 07:18:38 radhermit Exp $
+
+*monkeyd-0.21.0 (16 Nov 2011)
+
+  16 Nov 2011; Tim Harder <radhermit@gentoo.org> +monkeyd-0.21.0.ebuild:
+  Version bump (fixes bug #339100).
 
   20 Apr 2009; Thilo Bangert <bangert@gentoo.org> monkeyd-0.9.2-r1:
   remove use-based dep on virtual again
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 70c0ebb5d9b4..a6d49ffbd7cb 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX monkeyd-0.9.2-honor-LDFLAGS-and-support--as-needed-and-fix-jobserver.patch 1890 RMD160 6d10bb69c4a63dc8a80b25039668262269953a03 SHA1 7fc8c6163818d6275c9afe9e24d28079a50491d8 SHA256 3134f3ccd32bc5411dec546737bf5aea28195516296c3bfb803b15d884a7d60d
 AUX monkeyd-dont-strip-configure.patch 570 RMD160 7ad63949856dcbde0bddbdcd7a64e31d0bcc5d9e SHA1 cf596e8d31540112693d0778dfdbb83e4faf281b SHA256 d273065df34464af7647d87df2f8c1a337c9d328a0e396b0fce3d196687b615d
 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.21.0.tar.gz 309499 RMD160 3ab8af155194e48dd88652288323840e93a7f9ed SHA1 7a22dcfac6e88b47ac4e238c3b24b37299c6d3d7 SHA256 ec395bc04b97fd25f663d6fcfb549d017f77e02b9753a17440c700c198f5d907
 DIST monkey-0.9.1.tar.gz 84389 RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db SHA1 e54b870c0f597cdfc164e800246ed8445ce6d5fc SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a
 DIST monkey-0.9.2.tar.gz 86289 RMD160 fa45e3ad01eb97d4c603dbb0e2b0e9529116ed1f SHA1 1f42b9b1dc925afb6895acaae2caab1a3d4e13e5 SHA256 0f36328dc7e1f0c21ef01351874b68d53cae3fecefe0a21fc98de24a80877a3b
+EBUILD monkeyd-0.21.0.ebuild 1864 RMD160 094aff7a8fc0d9c2c376c490736c0192744f9535 SHA1 db4ddb2df41c19ef142945eb4fd49cf09fe9d299 SHA256 33143eb890c7a8ac7c30d309048737da73f5119db24768d283c57eac6a63dcc8
 EBUILD monkeyd-0.9.1.ebuild 2148 RMD160 8eab471b83d18f386bdd19e2d89cffb01ad65c56 SHA1 cd9f8d3d13dbe28a73aa50266df0cb95870f90ff SHA256 5149fa4c5bbda17053f2042d383aaa64a6747f26a7c205759a219950bbf33251
 EBUILD monkeyd-0.9.2-r1.ebuild 2090 RMD160 7407cde3bc5cce98f6fb475e1fcdcaeeb40a6e81 SHA1 da0bebd911e83f4cc7d776d542d4ba45faedc660 SHA256 cef6ea62d91cc346af2fe7b6fd48d5393bb6f71693b8720d8263c48df2eace23
 EBUILD monkeyd-0.9.2.ebuild 2143 RMD160 5a14acba7de621af7d3c151bb9b41736685a34e3 SHA1 21a51bd64fcf712aa1fe2ad6246c70efed04f4b8 SHA256 d0b2975076604503b52a3806ba8ac34da71b1bc119e789668bcb415e83f3977b
-MISC ChangeLog 4503 RMD160 9652de51680fedb49520ef4d449730a29c23149b SHA1 05c221c1afd5903fe56bfc424be79bdf7dbb3fac SHA256 0033b89ac6ae087e6531a03e6c83ac347e5628b860b49ef5973bbb9ad8c7850c
+MISC ChangeLog 4646 RMD160 65a9bc5b2556015aeaafed85e62a2301066aa1d7 SHA1 936d2937c96b1ce623c428eb6b12792a2f327d69 SHA256 c07b35510d2ffa17bb2d295cc444cc25c3ddeecf020f2c0a3de7bb394bc889e2
 MISC metadata.xml 164 RMD160 898ac97013b213230bb265ed2ace7751bc5421bc SHA1 555fbb8a11872e4109122cce6c44861b3bda173d SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOw2PUAAoJEEqz6FtPBkyjw9gH/3zojXBWPrrPvwcFMxEO7MkD
+GAadkpUxALPYUM/ImMA2wAD2NV/Ym9vAii632SKi4PsjWOttJKIEU26mBEs8rVcf
+65/0BdoSAc+KG3V7qLnExVe8Lic0mRumv41hTvEPCLextVOm5rRJoHEQjym9FAuk
+GD0PYSXgWHoNPTCGu4lq5Feg9xJVXPs9yaxLQzw/aegQLZCgvXmSPSSLEQ9JodJL
+plcpVjg98mmTjGH5DNRpeho4FDtjIcAG5KzRezii7Qg9qQzgdJUDZBn9W+RRskyV
+z6Rz8YvgkJnuT6DQ41MaENh3+eK556QVSHc3fjnrtFUVBZ94HM0SpMK66BX82xI=
+=KYbb
+-----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-0.21.0.ebuild b/www-servers/monkeyd/monkeyd-0.21.0.ebuild
new file mode 100644
index 000000000000..6deeb579f246
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-0.21.0.ebuild
@@ -0,0 +1,68 @@
+# 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
+}