Version bump.

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

3 files changed, 84 insertions, 9 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 994c144b8ee4..4b749178ea91 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.23 2012/01/03 02:12:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.24 2012/01/14 04:57:46 radhermit Exp $
+
+*monkeyd-0.31.0 (14 Jan 2012)
+
+  14 Jan 2012; Tim Harder <radhermit@gentoo.org> +monkeyd-0.31.0.ebuild:
+  Version bump.
 
 *monkeyd-0.30.0 (03 Jan 2012)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 8467e7d9b2f3..ec800767f0fc 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -7,23 +7,25 @@ AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574
 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.30.0.tar.gz 322177 RMD160 ea59133891211b32d82be8019afe57580ca9e236 SHA1 ef0e45934f16dec3c1975d593ce3dbdc1685d02c SHA256 4081b89e5cdf8f606694b65bc272527497392a9a170b12ffaa549c45ad4d52da
+DIST monkey-0.31.0.tar.gz 322931 RMD160 dcece1e034e76e115a48c2098f9c47ace6c50140 SHA1 fc1d978a2c6a062a45179de765d9d1448bc6ec9e SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
 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.30.0.ebuild 1864 RMD160 d3642f440e7a31a7f8c5d6015bcb2c39816b4948 SHA1 a9a3068a70e5f73c1937497e3b54a8959a415569 SHA256 06a1ec66114e3635ece7e776fca5e77c6bb2cc89f7138adb1bc66f48d7b4df04
+EBUILD monkeyd-0.31.0.ebuild 1864 RMD160 7062e26db90b61f9c9466230abd449641e10ee4b SHA1 efca4879d62d1b9102b5b750b40fb6ae0f24569f SHA256 b7181106622f7d76bae6c884c712d0e8eea95df737ad7f4e166b1a57c49c460e
 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 4767 RMD160 52d717a40ac5f622b2e691785026ccbfe7ab1c05 SHA1 befb89f31bc0724b475e7687b805073a5cf62560 SHA256 597fa9c98b3353ded7276ace649f4bc128a46cdf17026ed902c9120e216bebcf
+MISC ChangeLog 4888 RMD160 22f67ebc82c7c8dc306d3a5a3a6145fc530161d6 SHA1 c6052d6644c9c436455dc3b3d6bd088b1d65012c SHA256 48f1ce833e94772e66a22e65e6d2b78ca768418207f3f9453d9d823f86e39034
 MISC metadata.xml 164 RMD160 898ac97013b213230bb265ed2ace7751bc5421bc SHA1 555fbb8a11872e4109122cce6c44861b3bda173d SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPAmQpAAoJEEqz6FtPBkyjrZcH/38QMmN81vZXdJWGwJV+c6Oe
-h53eVsC29HtW9VHPiG8YPpiw6yVmfZt22qlRV2R6jh4/caGmiPZldDddz5QzB74R
-1w/Bph6Vp4zQJRu22Tw0Tjsqc6up/f8H7OqhfxEV2opPG+Pf5n6V+orC06UlHxuT
-S/NxLIxbPTDRNojPdLzJDT1EvSBiJBdru7KSZ7bVBRFNwlZx56/VnTpYMf1cZXPd
-/ysL2qD3jGqgFNQfHQDuWm8F4HNrDZgrgRBKatkCoGcwHQsRpPpukcP0mOnGGTaE
-os71In/Dse7jepeiP2pVlN3LMgPO9bQ2vJ7pg15N/+dIy1niTAuuz6Ghe+D4rxE=
-=9kPA
+iQEcBAEBCgAGBQJPEQtUAAoJEEqz6FtPBkyjuwIIAKRErGxAY/ycXJu/sUYO65m1
+aGJBAN6u2TaZ6WsTbQk10YdwGnzb3WBDlxvHue0EnkONxzSLv9HwSv1O7G4lFPOq
+VnUmwMbGg0N9o+kTz6zFccfS0/byzOsufoLejLlW5FPIGJS/gRjbMJWnacw6PoZ0
+NXOwxvJIdIWNWng9HeRPHfnjkpBeX5hOyJssZJ1s2nbegkY0BkaZU70kmBgMQtZv
+a3SOhf1ZGUIOOfC5Ttj5lJfTNovfkJ0olC7abEYLgVrhfvcOExeNnQzqQNMQXu8s
+qU+EpuXixUvhekeV4JaFOW7oSgOdsTg2O9sA4L5E30Y5SAoTf9ef2SqSHHaVTIk=
+=keLQ
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-0.31.0.ebuild b/www-servers/monkeyd/monkeyd-0.31.0.ebuild
new file mode 100644
index 000000000000..96df0c5bb397
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-0.31.0.ebuild
@@ -0,0 +1,68 @@
+# 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.31.0.ebuild,v 1.1 2012/01/14 04:57:46 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
+}