Version bump, fix init script

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

5 files changed, 117 insertions, 5 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 4a28b716acdc..05d7aa725f36 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2012/05/23 15:42:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.34 2012/06/07 08:22:05 blueness Exp $
+
+*monkeyd-1.0.0 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.0.0.ebuild,
+  +files/monkeyd.confd, +files/monkeyd.initd:
+  Version bump, fix init script
 
 *monkeyd-0.33.0-r1 (23 May 2012)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index a9e7afb0ca95..bc0c69cb58bc 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,17 +4,21 @@ Hash: SHA256
 AUX monkeyd-dont-strip-configure.patch 570 RMD160 7ad63949856dcbde0bddbdcd7a64e31d0bcc5d9e SHA1 cf596e8d31540112693d0778dfdbb83e4faf281b SHA256 d273065df34464af7647d87df2f8c1a337c9d328a0e396b0fce3d196687b615d
 AUX monkeyd-fix-manpage-path.patch 1366 RMD160 44cb97cf389f414e385a6a474b533c9b13af49b1 SHA1 bbd21071b80238946b2151497aab07d7e6008351 SHA256 c0cd71d52d389f17fb2a943db0d9d7e1d15efc5e147eae89e2173d294a9f0eca
 AUX monkeyd.conf.d 278 RMD160 cb1c63336d326d53385745979d7323ab6382809f SHA1 b574167bc11035297c1f784e9cb965edafba86e4 SHA256 403fd75c0a9dbdd6994e6b3dea2583f01c50a048fe2a904be305890b406d5074
+AUX monkeyd.confd 288 RMD160 906dfad6aed7f5d1a48c8156e23eb4dcb4af9ce1 SHA1 4cfeebe92eecb528ee639018610873c755bafd07 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f83e54bd1700eee
 AUX monkeyd.init.d 484 RMD160 c25ab63ecb67d6d97698f7d1451093ed2f418bd2 SHA1 5a88a47edc7c75c8756718057f611c8f38fed803 SHA256 a3f1f888cde204182a984138d4b33d3fa6e6a20570012a4a0809d50a27734db8
+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-0.33.0.tar.gz 340670 RMD160 4a7fb8deaf3e6c3d382c7a899bf47c5bfe27d0f0 SHA1 f9325eb4a666bd08a2eb6b58294cc348c0c91c59 SHA256 39aaf1c8356dae20abc2ca27262772b00775fa013c12ed284ddf72c4599aca8d
+DIST monkey-1.0.0.tar.gz 339383 RMD160 e5532e2ef5dcf8df5f3e8600910ee56c8e1a7139 SHA1 9d2fcf7af3fc3fb6121e155d2e30d3ce25dbb46c SHA256 647917ad92be2bb316fb26cf3f483b4de1badabaec4dfae1a85d9830514e7764
 EBUILD monkeyd-0.31.0.ebuild 1853 RMD160 7f08232902775853d2766b873ea2fe5f502f1595 SHA1 d66ce2f63197256407f825a99d68ab3da16421ad SHA256 32f8209c169678c852d0aaa219efa623b6f533527711c2697e2c19af498978d2
 EBUILD monkeyd-0.33.0-r1.ebuild 1918 RMD160 959a5e9931a0aec61145d97991af1bb97a66b64a SHA1 8bd0daffc552bd80c749f2ed22cdbada5bd5142c SHA256 0d63c4ead2f1babb1bda51faa17112f31543f5263c90ba416f6bf628fae747ec
-MISC ChangeLog 6302 RMD160 fb6e0eb80320f8c6de6a71c3c71c88629fdabaa0 SHA1 3b2910318b8bf763158b2db45721fe424ff9de9c SHA256 5f1824431411140876b954a433a043b3dd62120d49adbdd65a5152172f60f4fe
+EBUILD monkeyd-1.0.0.ebuild 1852 RMD160 dfd5f34d38511016d63eedbcf9777429ef7838ad SHA1 bc601a99bcd1ac69ecebbaa861fdd6693e4561d1 SHA256 f8f8a71428494bb457a8125bfa56e67fc722c6b01f13138ec4c501b0fed548f6
+MISC ChangeLog 6489 RMD160 60485564798174b99fa12f4c4a2abff8b960ef51 SHA1 821ffbde08988a94bec57d3794ddf39bd8511d5a SHA256 a21be86c0fa43a1b502280fe862e33a506680a20671a591481fbd2d91091d09f
 MISC metadata.xml 234 RMD160 59e569023e48130b98d1b9f67416af7ef133a7c5 SHA1 8c7c05396c1846e09239cef8844ef3417ce96bbc SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk+9BVMACgkQl5yvQNBFVTXaDgCePHPErc1l0YS/roeDFDEOs4jO
-gDUAoKL9tVuI/oG6oE0aEDnMK97riYzH
-=BR8M
+iEYEAREIAAYFAk/QZLgACgkQl5yvQNBFVTXi3gCgg0gV249ckZDSOU7Xx9wl7cdR
+Q5oAnjjU9ouc1YKA2wXqLonyQk8SUkjh
+=JN9/
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/files/monkeyd.confd b/www-servers/monkeyd/files/monkeyd.confd
new file mode 100644
index 000000000000..ad867ee182aa
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.confd,v 1.1 2012/06/07 08:22:06 blueness Exp $
+
+# Add any additional command line arguments here
+MONKEY_ARGS=""
diff --git a/www-servers/monkeyd/files/monkeyd.initd b/www-servers/monkeyd/files/monkeyd.initd
new file mode 100644
index 000000000000..5f3ef96ebaa1
--- /dev/null
+++ b/www-servers/monkeyd/files/monkeyd.initd
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.initd,v 1.1 2012/06/07 08:22:06 blueness Exp $
+
+DAEMON="/usr/bin/monkey"
+CONFFILE="/etc/monkeyd/monkey.conf"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting monkeyd"
+	start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping monkeyd"
+	local PORT=$(awk '/^ *Port/ { print $2 }' "${CONFFILE}")
+	local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
+	PIDFILE="${PIDFILE}"."${PORT}"
+	start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/www-servers/monkeyd/monkeyd-1.0.0.ebuild b/www-servers/monkeyd/monkeyd-1.0.0.ebuild
new file mode 100644
index 000000000000..c7235d1998bc
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.0.0.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.0.ebuild,v 1.1 2012/06/07 08:22:05 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
+}