Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

3 files changed, 91 insertions, 6 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index d5d7df977a17..de023d9eafff 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.44 2012/08/08 12:35:24 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.45 2012/08/18 23:13:40 blueness Exp $
+
+*monkeyd-1.1.1 (18 Aug 2012)
+
+  18 Aug 2012; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.1.1.ebuild:
+  Version bump
 
   08 Aug 2012; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.0.1-r1.ebuild:
   Add keepdir for empty directories
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 0679d9e6a1b0..7761dbd3c96f 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -5,17 +5,19 @@ AUX monkeyd.conf.d 278 SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be3
 AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f83e54bd1700eee SHA512 0ed5e3e7f86564d157d833f980e715ebbc0017530f967b21581a1df8c0990a15ff8af538f664c03da3b10affa02773ad78e4dcd03a3d3f670d7661ecaf0ca00f WHIRLPOOL 1f736bab1f63324c0020d2d236bb84bf253978d76db8087ff0d71849bece6ae7531dfa6ab250e2f136301ef265f35061d059eb45536fc1b8220c9fbd78b83ef2
 AUX monkeyd.init.d 484 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8 SHA512 12dd7cd96f4f60f1e485fd044f393ad47cf564a87576325a578099a46870da2aeedabe403dc6eca48f7c65d71817415af1fd0f26c8146400542fa0ec5307ca32 WHIRLPOOL 3a641f2ad290211d64dd0df9f2285ac514026d70c709e1708e013d7a93760372da0269e60ec1c3f474884289c32bcb73dd61cad95df4518cc856d2458500459b
 AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d SHA512 9f5ac51a06c0255d5d2b09c19228c849c5314f8f9d4ef2dbc837028620462897dd81b504cbf53bd36bd4896e72fcc17b2b0043e038de7bd3d39aa1be26dc8126 WHIRLPOOL e3d4788d4b78a7e1b8482581547350e1dc989ca561484283533d696eea3419f89643fe45610c6e793a3e2c26a1ef7e6ef24cba9fba99f8e06a4cfcbe25cc57c6
-DIST monkey-0.31.0.tar.gz 322931 SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
+DIST monkey-0.31.0.tar.gz 322931 SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808 SHA512 bd71b35651f92c65538456318c4704df582640d0f1edbbb6db3bde3d79629a31e1c4ff3295d9ec473b71184e32e1743230032f404a57fc65b6cae357ab6e44c3 WHIRLPOOL d71288fc5e964c24ba3b9f78b71e8ee878129fecee0b1542a20e87886515fa2be3d96e3b64085c38a1139f903667392936f6c1a94cf0dc350fe6becef38f939f
 DIST monkey-1.0.1.tar.gz 339773 SHA256 aea57483f46e5c5723f851cfbdd2a17a45ea8b7baa65d499e8b34216df617abc SHA512 42fa75370361328428eebed1d6a914137ab471022dff95f9efe8eec2ae59ef75753fa180bfd527beea2b83d5e33c394555ddbe13105f2901ceca4a44df382844 WHIRLPOOL 0ff51cd7396eb24d194341f4605b5541ac4360a85933d833cd3e4ebfce92e38509f99de2565e1df5adca4e827e9d5aeffe736cd9c4a6630b8f5acdbb28a7d408
+DIST monkey-1.1.1.tar.gz 404633 SHA256 5b6cf4b4a5cc2e6c7e2ac08515f542636884d7f85684f87005c6020e3567c7f4 SHA512 37a7806995d70a432d1f42e01f31a25012c7f39077613a4a0a772946ba512b52438d4ea3b798e09cc514833256775030a67ede5f66ac7ca93323642fba003008 WHIRLPOOL e490e34fe12a8f7f7fb63cb980fff6b642cbd341c56451ed4067fdb90445cacb6101b692e752f0771626846970651e1d07d1cb281e355be2fefa2581e96fe242
 EBUILD monkeyd-0.31.0.ebuild 1853 SHA256 32f8209c169678c852d0aaa219efa623b6f533527711c2697e2c19af498978d2 SHA512 dd53fe5c067dd10d784be8b4e704d382681d0c0831c9b336bf9514580dc2c9c37d9a8f52b1e2e10d5a9b1cc599303e12044928c26ddbe69a2b77af7b4a8bca22 WHIRLPOOL a63361cec312b320016ac2db921e0f7da287bb508f327836d872d7eafaa980f6fe8307b69f07bdeba10dd738bb8b5875a21074f97f0792bdbb7a32b05dbdee5f
 EBUILD monkeyd-1.0.1-r1.ebuild 2057 SHA256 e90322f55c2420e9fd0edb7c4cd4f2d09ca745cc85c26c5ddb7c8d82cda3493f SHA512 38c012467b7bfb7b12599f28ce6739747b7bf185e9d137d7597645dea97f2e6631fccd0f7639bb0662f09b57c56dd15afa3afa1d81121beb507ea3c7e88cf31f WHIRLPOOL 51a96ca582d06232830d100d23bfc6016b576d9d3804de24cbfa54e50c4738dd6789be818fb2fca24cdf474acac18994c2f27ff8d11815aa1850c28e918b71b6
 EBUILD monkeyd-1.0.1.ebuild 1859 SHA256 efe78ee434c52e123d34f79f837a526fe30adfc3c78922e8f2e33936599570fa SHA512 1467a4d223f539192b55b1ab200a3aee758ed982801cc5ddd22ad772176bb17692087548a1416764ec8d0145b5af280184f771daf085e6e01c6820eb57593fea WHIRLPOOL 4f7dd9a41a40d436bd3ae06c3bbd83ac14901b8b9b0668b34a834668e62146274eed19d064ed09158936441f53afcd88b2e22752f6b4addf8f1a853ebedf81a5
-MISC ChangeLog 7746 SHA256 c60a5bc73c9dd667edbcc12c66617ee002d79c3673111e1d8d93851bf3c31558 SHA512 2919cf661eab06c2021200e95cff74030c552189a796d8627f1bc39f8d3ddcd65e84fcce88bec941566f1b0d7b311119c8dd7793208f00a0483d04c5f9720810 WHIRLPOOL fd4edcc37bc0e9b3cebee00a47d21f9a9374369ea179733eb556a68567c3a216a3cb2afedf6693d753780077886d775780dfd6d3b36e169eaf55d28fcf08658d
+EBUILD monkeyd-1.1.1.ebuild 2054 SHA256 85f3e1e2e0fc17711e533f4d3165dc0395d300a0cdd154035f1dc63e0b639bde SHA512 fd87289d4c979f91b7bff29a0daafb14fd4945721def70ae534e937287b61742d18638653939b02a17d95d8d33e42b9c2f7e18351d5ff9b4cb0fe5783774eb54 WHIRLPOOL 52be53ceaf080c1aaca3b4672e9349bba3de8fa7f725fab9dd61b2d51eaf4ba6db3e1eb51f50479fbdc67e946ceac380dec2d6c90fbe9a477e7421c8cf948acd
+MISC ChangeLog 7870 SHA256 f2f58ca7c9f03b3768d153dc21d5ed001e21cbe627b873d26c9c608339eb57a7 SHA512 6d2470005de085a53b97de92a86b0017197df2de038c7205ee31290e6c54ff1d9b321e9c64b2c64430dfe1c8d7f8c171863019cd4b1d45717ec798cadca15a37 WHIRLPOOL 5e2e6dbbcd14e24e539a47792158cba9d6e29f97f9325cd4e7b3d7d900665158b00e995af6bfcf1fb70fad711a17d317c6d41977b76cc2c8eb48061a85688918
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAiXQ0ACgkQl5yvQNBFVTWflQCfVJoIDamBj4RXbni7oHqoyzt8
-KM8AniRiaH8gH1AN++sxvWABd1tPv8ln
-=5SYm
+iEYEAREIAAYFAlAwIZ8ACgkQl5yvQNBFVTWihACeNCMH6xoShsHLWM0rahRN5ty0
+qc4AoKcaRWI3WH5vmLq8YhpgCzMNP4p/
+=5BrX
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.1.1.ebuild b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
new file mode 100644
index 000000000000..c8df659b0f4c
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.1.1.ebuild
@@ -0,0 +1,78 @@
+# 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-1.1.1.ebuild,v 1.1 2012/08/18 23:13:40 blueness Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs depend.php multilib
+
+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:3}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="php"
+
+RDEPEND="php? ( virtual/httpd-php )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	use php && require_php_cgi
+}
+
+src_prepare() {
+	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd
+	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}"
+
+	# Don't install the banana script man page
+	rm "${S}"/man/banana.1
+}
+
+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
+
+	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
+	newinitd "${FILESDIR}"/monkeyd.initd monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+
+	#move htdocs to docdir, bug #429632
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+	mkdir "${D}"${WEBROOT}/htdocs
+
+	keepdir \
+		/var/log/monkeyd \
+		${WEBROOT}/htdocs
+}