Version bump.

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

3 files changed, 84 insertions, 9 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 54220a2e479a..29f4958781f2 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.26 2012/02/11 03:07:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.27 2012/02/21 11:37:10 radhermit Exp $
+
+*monkeyd-0.33.0 (21 Feb 2012)
+
+  21 Feb 2012; Tim Harder <radhermit@gentoo.org> +monkeyd-0.33.0.ebuild:
+  Version bump.
 
   11 Feb 2012; Tim Harder <radhermit@gentoo.org> -monkeyd-0.9.2.ebuild,
   -monkeyd-0.9.2-r1.ebuild,
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 3125b511a7df..8fc33d360e73 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -6,20 +6,22 @@ AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574
 AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88a47edc7c75c8756718057f611c8f38fed803 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8
 DIST monkey-0.31.0.tar.gz 322931 RMD160 dcece1e034e76e115a48c2098f9c47ace6c50140 SHA1 fc1d978a2c6a062a45179de765d9d1448bc6ec9e SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
 DIST monkey-0.32.0.tar.gz 324079 RMD160 a187f7a2053501607f9eb738e1aea2b3a8ad22e6 SHA1 e2afb7b38a2b578407efd6ce84f9cb5e87bcff20 SHA256 5408612ce21f82966ac10d2606bacaaaa877869c56a6cc174e093a88708ac68f
+DIST monkey-0.33.0.tar.gz 340670 RMD160 4a7fb8deaf3e6c3d382c7a899bf47c5bfe27d0f0 SHA1 f9325eb4a666bd08a2eb6b58294cc348c0c91c59 SHA256 39aaf1c8356dae20abc2ca27262772b00775fa013c12ed284ddf72c4599aca8d
 DIST monkey-0.9.1.tar.gz 84389 RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db SHA1 e54b870c0f597cdfc164e800246ed8445ce6d5fc SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a
 EBUILD monkeyd-0.31.0.ebuild 1864 RMD160 7062e26db90b61f9c9466230abd449641e10ee4b SHA1 efca4879d62d1b9102b5b750b40fb6ae0f24569f SHA256 b7181106622f7d76bae6c884c712d0e8eea95df737ad7f4e166b1a57c49c460e
 EBUILD monkeyd-0.32.0.ebuild 1864 RMD160 d7994495ea14d8e18dbfcb701025d5b583208190 SHA1 a0c8c3c7b59685b7c2194ecbf53b7941487f0baa SHA256 84dc95295c4264da274be77e1ae48f0594375973e492a18aadb646a5fcc11d94
+EBUILD monkeyd-0.33.0.ebuild 1864 RMD160 e440e03d99989dfa8a86abdd0fa0aa54404ad616 SHA1 8875a5badbb9116c60b0410b429ed66d64f28423 SHA256 7afbd8f8c54096d34596e7e7b9df72ebcdb9a5ef8311fbad78ea9278d8ec93fe
 EBUILD monkeyd-0.9.1.ebuild 2148 RMD160 8eab471b83d18f386bdd19e2d89cffb01ad65c56 SHA1 cd9f8d3d13dbe28a73aa50266df0cb95870f90ff SHA256 5149fa4c5bbda17053f2042d383aaa64a6747f26a7c205759a219950bbf33251
-MISC ChangeLog 5260 RMD160 10c4015a8d8cdc64e23b9d028225a7b99764759c SHA1 ae1f7751829cb256911f34588a024cd76f1b531e SHA256 d577a7e78992bd580f3b2d4c422851730a40a267e7a28c79df748da12440b967
+MISC ChangeLog 5381 RMD160 6a9cca335eb360c56c3a0af7f64e6f3148c9e1a9 SHA1 1b86e638cf216959086aa4038082662654c228b8 SHA256 f79bbe38b8c4662d62cf440464634408e16b2e582746cc7ed079150790eba255
 MISC metadata.xml 164 RMD160 898ac97013b213230bb265ed2ace7751bc5421bc SHA1 555fbb8a11872e4109122cce6c44861b3bda173d SHA256 23f2af7dc1d37e6e2c95358cd2399e487ebf8858a7e6f1798018196ade3132aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPNduEAAoJEEqz6FtPBkyjU30H/2wjSUa33nhQu6L9souNyNs9
-3SSTlAwuUL560zLGg0Xa2ktmQpLRK8yshyD7f21MUYz8KaTJIVT42sgiAc6uA4NQ
-a5luojDqpDHx84C1uGoM9JpqaHFetLP3cLzR6hYx2hq+c6vADKmV8/1/T/SjMXsn
-y3sDDcO/AmJeQ6gg3xPqopTqAyuw9mIR4oL0nYwGQdGVyGitWHqMUVMO/JM8jR6o
-l8ExB/KqoJsuUruevvbnGoBecqXn+5y2mWKfMm/IkbzPSF0/ved14Mw8rciW3jsV
-zO+z7Q+zLGghXrEuqEOzORyHzum4QmS/5gNuWTLhy22zX64viRCrjHk7Pdo6Jug=
-=kJoH
+iQEcBAEBCgAGBQJPQ4HvAAoJEEqz6FtPBkyjEfoIAINmHTRm9+nc6NvtDOR7orkd
+JB10y8ejwLn5kPdm8pETEPzB8i8JbXBtdoNAn+Uzu3Yhnwi8EIOtbsGDgqWo5UcL
+Akfd936QEsYzXW5O8aVnkkMGdU1jMEP42GniU2rw3MktacERl3KQDK4mbB3FxAGJ
+8r0+CZU3yD1dKPanwSvhuBYhrm0OurljFAgSlxZZwQfZErwc4PaIu4PYjlm0LbMx
+alhPEOTTFgs1VDD06k/l/HGLD2sQRjyH9ppQ8yI93WE57vFoT+OrLPWDU3Jw9FKv
+nW7xJXnzMRZXnOVmedmC4/JBxIfCGXljezbG62vZRHxtpLNPFd09GJs8txEIW2s=
+=MAmn
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-0.33.0.ebuild b/www-servers/monkeyd/monkeyd-0.33.0.ebuild
new file mode 100644
index 000000000000..b8f1d103483f
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-0.33.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.33.0.ebuild,v 1.1 2012/02/21 11:37:10 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
+}