Version bump

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

3 files changed, 82 insertions, 5 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 4838c37fe5cf..4aaa0c8a4299 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.35 2012/06/07 08:25:21 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.36 2012/06/16 08:17:08 blueness Exp $
+
+*monkeyd-1.0.1 (16 Jun 2012)
+
+  16 Jun 2012; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.0.1.ebuild:
+  Version bump
 
   07 Jun 2012; Anthony G. Basile <blueness@gentoo.org>
   -monkeyd-0.33.0-r1.ebuild, -files/monkeyd-dont-strip-configure.patch,
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index c57b0ad2956c..b64035d27abc 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -7,14 +7,16 @@ AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88
 AUX monkeyd.initd 716 RMD160 dcda054db46e025ca22760e412482471cca7731d SHA1 9ef6adfed2ebcb8abf30e0d876c986a6e750daa6 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d
 DIST monkey-0.31.0.tar.gz 322931 RMD160 dcece1e034e76e115a48c2098f9c47ace6c50140 SHA1 fc1d978a2c6a062a45179de765d9d1448bc6ec9e SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
 DIST monkey-1.0.0.tar.gz 339383 RMD160 e5532e2ef5dcf8df5f3e8600910ee56c8e1a7139 SHA1 9d2fcf7af3fc3fb6121e155d2e30d3ce25dbb46c SHA256 647917ad92be2bb316fb26cf3f483b4de1badabaec4dfae1a85d9830514e7764
+DIST monkey-1.0.1.tar.gz 339773 RMD160 cdb1a9398abb90309fed6f51c9d97b66937d9ec3 SHA1 8fbcf0229e16ec2bf90162fe3e83b0877d09b549 SHA256 aea57483f46e5c5723f851cfbdd2a17a45ea8b7baa65d499e8b34216df617abc
 EBUILD monkeyd-0.31.0.ebuild 1853 RMD160 7f08232902775853d2766b873ea2fe5f502f1595 SHA1 d66ce2f63197256407f825a99d68ab3da16421ad SHA256 32f8209c169678c852d0aaa219efa623b6f533527711c2697e2c19af498978d2
 EBUILD monkeyd-1.0.0.ebuild 1852 RMD160 dfd5f34d38511016d63eedbcf9777429ef7838ad SHA1 bc601a99bcd1ac69ecebbaa861fdd6693e4561d1 SHA256 f8f8a71428494bb457a8125bfa56e67fc722c6b01f13138ec4c501b0fed548f6
-MISC ChangeLog 6718 RMD160 32dbf1e60bdb09d0114a07841895c24050579f58 SHA1 80f05d58fd1bc57c7e5fb8193034599a57a1d12e SHA256 60663c0d2bd101bc43032b3c3674aa9af4750eb639d5231039447520d1a179c8
+EBUILD monkeyd-1.0.1.ebuild 1852 RMD160 bd19100af9ab5880be27c4dc6f0935770a768893 SHA1 a2a9159db453dfaa24073c479802ae4857fa3539 SHA256 cc62c97bc7585391fc3a346282f755a109ee2ba0afb212d648fab41a3bc38579
+MISC ChangeLog 6842 RMD160 124da160b8651236b3025c5818ad458fdc7060bf SHA1 2c420de7bf7728365c1627a656248d67a3cc3efa SHA256 d0bb511f6aadbb8248bc6d44e90b1123eb4b9facffb79c1953c964839df1b91f
 MISC metadata.xml 234 RMD160 59e569023e48130b98d1b9f67416af7ef133a7c5 SHA1 8c7c05396c1846e09239cef8844ef3417ce96bbc SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk/QZX0ACgkQl5yvQNBFVTWofgCfXAQnXoXhweJiwVE3M34JTLB1
-A3cAn26XZmdgMol0hvPr7kVrMatTieWt
-=nQ0q
+iEYEAREIAAYFAk/cQQ4ACgkQl5yvQNBFVTWdBwCfZQ7i7hWctAooh5dz4/5iazwp
++hsAnRm7a/6X4Jb+yWC8djMiO7mGjyJF
+=BVLy
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.0.1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1.ebuild
new file mode 100644
index 000000000000..7b1e1e2cd18d
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.0.1.ebuild
@@ -0,0 +1,70 @@
+# 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.0.1.ebuild,v 1.1 2012/06/16 08:17:08 blueness 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:3}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~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, 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
+
+	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.initd monkeyd
+	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
+}