Version bump, bugs #500304

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 280 insertions, 16 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index dfeba60dfb11..07579974fc3e 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.66 2013/10/17 00:31:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.67 2014/02/05 13:46:33 blueness Exp $
+
+*monkeyd-1.4.0 (05 Feb 2014)
+
+  05 Feb 2014; Anthony G. Basile <blueness@gentoo.org>
+  +files/monkey-1.4.0-use-system-jemalloc.patch, +monkeyd-1.4.0.ebuild,
+  metadata.xml:
+  Version bump, bugs #500304
 
 *monkeyd-1.3.0 (17 Oct 2013)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 275a84ad8301..af2fad482a73 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,28 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX monkey-1.4.0-use-system-jemalloc.patch 3321 SHA256 dc266b211c17d31dc70e4120c459b5aac3601a2953d9757c6d5bbe980ebea1c9 SHA512 006a6557e07d9777680ec3d444aa6ff5c91300f80db43cacdb125b502e151e45dc0ee9a1e2c132bab130e79de58396dd38061086143dac609b47917c80cc0726 WHIRLPOOL 9eefe0870451710947b5a2595e4926f4a50543cae56be2ba7508af667880a824967195d1321c62e685bd9689aa2cce59f42e98a893fe94a59238d07efe1c17e6
 AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f83e54bd1700eee SHA512 0ed5e3e7f86564d157d833f980e715ebbc0017530f967b21581a1df8c0990a15ff8af538f664c03da3b10affa02773ad78e4dcd03a3d3f670d7661ecaf0ca00f WHIRLPOOL 1f736bab1f63324c0020d2d236bb84bf253978d76db8087ff0d71849bece6ae7531dfa6ab250e2f136301ef265f35061d059eb45536fc1b8220c9fbd78b83ef2
 AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d SHA512 9f5ac51a06c0255d5d2b09c19228c849c5314f8f9d4ef2dbc837028620462897dd81b504cbf53bd36bd4896e72fcc17b2b0043e038de7bd3d39aa1be26dc8126 WHIRLPOOL e3d4788d4b78a7e1b8482581547350e1dc989ca561484283533d696eea3419f89643fe45610c6e793a3e2c26a1ef7e6ef24cba9fba99f8e06a4cfcbe25cc57c6
 DIST monkey-1.2.2.tar.gz 428467 SHA256 fe52c95436af8901399656e7764a207fbe64b5ca4941e458d48ceaff49c08633 SHA512 b76e90d33db119e881cb3c3adad2cae34a59c3f42283945912e6f3bdff97dc4e82bec663218fc925c16d4e1c3ef50a8c00d3a37da9d0e7e042ec3bbf88f58cf3 WHIRLPOOL 5b13419505be1a09d63e3d54ef17f1bdd8c2eba6ec1cf59c4f9b20c82ca661fcbeb50d2454913de03dce225de90bedd0bf4ba3ebe3d477dd8af481542928baf0
 DIST monkey-1.3.0.tar.gz 329808 SHA256 bfc35e2a070cd8554d6f4155e44e28ec78079f0029e66a63b41db92b5a67e116 SHA512 c45853eed1f7a46fbb38c4ae5fd27f06ebd7a662e5cbc9de73f4cb13f91ca3f4e6471f35499c097d649404ec8bad81a8a8bdcb4faa50e933fa64b496e2265057 WHIRLPOOL ce5d91349304891d1bfa8a7c8691d6ebb837f51b92ff9399a26bc6dc4a9aa3c9c6d730365e7f999997ceb6fbeeb41f009ed6b445a0e65d82bfbdea68a0cbcc06
+DIST monkey-1.4.0.tar.gz 881328 SHA256 b2e3578819abb558ee5e449b8c4aa323b69f52cd8f2c8f061a78e2f0b18675e7 SHA512 ab52e158a4b4954d4e72dc0687b2a22b5ced75ad5ca93ee5533d81ab1eb24101919e87917fdd89570de537167fafb2e0c448765b24f472715556a41e2c0a8390 WHIRLPOOL e00c1156af7e6620d1fd18c358ecc682b3356a5fb9681d3b058a24a234c3d46e84b77d84f89817de5abadacbe475414c90c6894e29248400404a16b43f7c0bd0
 EBUILD monkeyd-1.2.2.ebuild 4305 SHA256 1cc45979d5d67d1af4ee4eb99acbbc8bd8d14899234db22586361ea4b71fd297 SHA512 2081bea6107ae0cd61e8915a0f0eadcfaf430fbdd97a535c46f44661b27dcbdcd78df030b066989003ba6758761edfc66c5051becc176d1e02b91db0ee7b97c8 WHIRLPOOL c43455b63f4801c08275dae815cb056341e9aa1295f2799fc7a6b58fb018260dd0e6fe25bceed993e3e5efe204306a368d09db215a7bc9bf64ceb6a598316dee
 EBUILD monkeyd-1.3.0.ebuild 4310 SHA256 bb97bad298ffc8c4caa498d289829e1c17b6d2fec70c83a09c74046538380056 SHA512 a30097f9e5d14e8a203c8a4a8cec1988a5b6734bd65ff34a2e5a1312bdf1540427a13e31e435a47da89bde7f8adf4669a13fa213fa39bbcc1fa021bfbde08e37 WHIRLPOOL 54ff2a21f9a6383bbd2b3fc7aaf9bc8b3a4c3d8339b765fc5821c3200e2a6bf60e74b83d2cd105396a68494fb45caaf9ba90b56b64cf2ec3f1d04c1a2d8cd0b4
-MISC ChangeLog 10812 SHA256 303b2ad5698cda919222a701e4786c98addd7ce6866d46b99d9c9becc04d6440 SHA512 1b0afef16b9424a73e31b97f85e269054b5fe1dd8f2a195d7e206ae834b638d6b0521296d618259d76f0c7e7ee9d8077f3ba3724239a78820f7a52af6f1e3c56 WHIRLPOOL 8e64e1912d16de6ed858875cba1cded3faf223c606439e80e73b72b3f2b7fcd21ea71b1e98a1ef94f13d83eff51d77f5bd6f128300d577304f397cfd2b369e86
-MISC metadata.xml 385 SHA256 88901f1e630c8bb995da2ece6f50de69a82b845f63e51742c6f90b26f31c5321 SHA512 863daa33d3ce733a5b84927dba2f0bb28f24802b27f0b2ef225b4c5e8251977f8500ea015f0f21febda32cc7933c95daf9add6fe9563cce979ecf8096babb242 WHIRLPOOL b61c7a2b8e851a98662ebbc76cfb826a0980c6c9654f119d152f226add3cce42b8ed2e2d354e6c994b9e10badd3521b611d133bdc0983a00c75e920717959269
+EBUILD monkeyd-1.4.0.ebuild 4583 SHA256 87999bb1796204840502078f0cec92142ef02f417b4e3df8e6a09057588222fd SHA512 826d1d07c11db7eeaba571acc7c550d79bb2b72397178c6d92f5828089f5e8a1a881af13a2f6c1a9d78f052c6699c5b91542c3cd1d1edb75ba0cfa76c1345d08 WHIRLPOOL a22a65aa50f904076343733d6a1e708acd81612929578ae1f5e445b81599c625077170e2d82cac9f7ee66c20a20baedead7bab8f4b68f97f71f51c64353c665f
+MISC ChangeLog 11015 SHA256 1d8a2aa5dc13d3252b6a1ac260abaa84a3073c83c426b89834ca0bcccb94ec78 SHA512 975553351821ac656172ba79798fbf7a5721eb4b8338e7d6029fe3c4c1749ffa4f0fd9c152a36c6115900b4039ef0a62454ade2d51e727043ffd50faccaf7047 WHIRLPOOL 3f07e4ad834d8ae0a7a3a3141f20269dab2f668844b4f679c3d888a7a26cdb729578522f039e53ab14d93781d4cbcd449aa2382f8ceeb47ca715b2de1f3ac008
+MISC metadata.xml 512 SHA256 8d13dabffbe7cf041490619cf2605bcfc36505ce64fa1a794511046e27cd8113 SHA512 042b871a25ae83b5b684d6138e0af3e1f40e411a3d88612c5f28c276d4b94735a0e9f07f1ffcc53c672a9390b850ba4bda22a9f8aa7ca65ac8a76f52b0f696e5 WHIRLPOOL b76d8916db36f339f4a2feb397da9b434eea18ab2eee65d40283ddf59e6309570ec82a3417f9d342da167e781cdbef5827f2bbf808ddf7961ce30ab5f956a3d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSXzBEAAoJEJOE+m71LUu6LD4QAJZQyWL/7a+dxGerzlb6/zzX
-Z9/HEwkWSKyjeh3EUmNZHk+Hj8U6czxtDXCbvztrbakG4sgSzevb1aKNeH8i92C7
-rosNRpN7DwEaeKiPj0pLiNtoKnm7H1zrPmOU0qe8qGFF4pHyrd8IKEDe0v1Ax/Ax
-geBG3tEIcvtuNoikmzsvx0opeb+cU5d6rR+RJd9gbNTC1ZWtkuU9ZppXEOny3kaj
-zLODEVyrTuKrJegtC7GGQKcyMC5bY9zikcfp54OBJd/1tRHOgUssIeIFPvXDsW69
-Lu8NINsy7w1NbvLLmL5yXg2s0wujFDBCKeuhaEl17bWe5TzSQxHmk+bZsgAz21NQ
-Fed47pv/5DZ5FRxIWw8d+/uhl11i0REN34fp9jchqTNM9eJbCcLvVgzi0EINsBb8
-s9KndCwL3y+GK9Dl9Ejlh9R/G5gpBmbRqPSvcbm02m4lepK4qs9Q8NNyozgfqnzh
-A9KFjI4NOGN8h1G1B0rnbzhMlT8Ys+OfFLaRl8Fi+uII/OPzmgXpvKfvJwlE7F22
-QKtdyJDpkmYQ4/eTBOZFlxpWIGWMQtj5Ixj62hRT+hDPXUl6kmgllltHo9XaTS1r
-mJrGq8a4LVvBgBd1oJYmtQ/E7j5cjuwMy8ooRvELRFwmUrnDwCZLLvkMDnAzv0fS
-I2EGNxfBIdksWMdGjtrX
-=VbFM
+iQIcBAEBCAAGBQJS8kDuAAoJEJOE+m71LUu6j14QAKqvZR02CYnu8bMdXRoPmuaz
+BP7sTk7txSbduDmnD8k/PmFQ7fySvpdJ4JjGN8vTqqmwNCHvB4S3JEQm+mzRit6W
+NkMWO12TVugvOM/+uHz5pBo3fwBT3qtmi7xf3Tn4i6t0e4+AoltyX+f7qKZjIqV6
+TSQvljN5cjCXwAS3v5QTk01YK1ityAvO7kVnF5wSKvjUmqoHmK2Vk+jDOX1q9b+c
+CHdgK+mRLj+yMcHua1oSjKsErmZEdq2uFQSsb083umJ/7wuZqhIOB3WP858uIfST
+gdxDs3pcy52853soQBl2a34xujt0ToBX7oQ/wXiWsAe6/OHzq3+idh015rFivHiJ
+RIIvH5fg8YxKE9FjW/qiX/rxaQf9eOeMhW5G/TPL577nlJZRy3WlPgyXYGPyaJDv
+AwrYKw3FcY3DqnR0o8EwWIak3VcdwLlr4HrqyoYyFp2A+oALOav6c2qrUzpMiJ62
+CspCIJT5cMUYas7wCM9AkRvAOFy5pd6Lp02IoDaCnQv/SgnOcV6SW+vs5oyc7pVi
+XQxhPRut1XbKKPF0EXmxktlBFOBr+StLvtS5qHH5tBAG2V2mv0LHg+VqDeH2Ak7k
+8kSxd1XqLU/ZKGFSVtHqx4defWHojRK4G5t9UxoxMrKfuSZRy1X3Awj/E8Pg4yA6
+jH66LtuALZYDx/4NBLzH
+=Xunj
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch b/www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch
new file mode 100644
index 000000000000..502b90b3c58b
--- /dev/null
+++ b/www-servers/monkeyd/files/monkey-1.4.0-use-system-jemalloc.patch
@@ -0,0 +1,109 @@
+diff -Naur monkey-1.4.0.orig/configure monkey-1.4.0/configure
+--- monkey-1.4.0.orig/configure	2014-02-05 08:38:13.223712041 -0500
++++ monkey-1.4.0/configure	2014-02-05 08:37:19.575716331 -0500
+@@ -193,7 +193,7 @@
+ 
+ 	echo "+ Creating src/Makefile"
+ 	create_makefile2 mod_libs mod_obj make_script platform \
+-                         malloc_libc malloc_jemalloc
++                         malloc_libc
+ 
+ 	echo "+ Creating src/include/mk_info.h"
+ 	create_info sysconfdir \
+@@ -203,33 +203,12 @@
+ 
+ 	echo -e "+ Creating Makefile"
+ 	if [ "$dir" = 0 ]; then
+-		create_makefile1 bindir malloc_jemalloc
++		create_makefile1 bindir
+ 	else
+ 		create_makefile1_install prefix bindir mandir sysconfdir \
+-                datadir logdir malloc_jemalloc
++                datadir logdir
+ 	fi
+ 
+-        # if the memory allocator is jemalloc, lets start configuring the dependency
+-        if [ $malloc_jemalloc -eq 1 ]; then
+-                echo
+-                echo -e "\033[1m=== Configuring Memory Allocator ===\033[0m"
+-                cd deps/jemalloc
+-                ./configure $JEMALLOC_OPTS \
+-                            --with-jemalloc-prefix=je_ \
+-                            --enable-cc-silence \
+-                            CFLAGS="-std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops " \
+-                            LDFLAGS="" > jemalloc.config 2>&1
+-                if [ $? -eq 0 ]; then
+-                      echo "+ Jemalloc configured"
+-                else
+-                      cat jemalloc.config
+-                      echo
+-                      echo "check more details with: $ cat deps/jemalloc/config.log"
+-                      exit 1
+-                fi
+-                cd ../../
+-        fi
+-
+ 	echo
+ 	echo -e "\033[1m=== Monkey Configuration ===\033[0m"
+ 	echo -e "Platform\t= $platform"
+@@ -306,12 +285,6 @@
+ # Create Makefile
+ create_makefile1()
+ {
+-        if [ $malloc_jemalloc -eq 1 ]; then
+-                $deps="deps/jemalloc"
+-        else
+-                $deps=""
+-        fi
+-
+ 	cat > Makefile << EOF
+ # Monkey HTTP Daemon: Makefile
+ # ============================
+@@ -449,13 +422,6 @@
+ 
+ create_makefile1_install()
+ {
+-        # memory allocator
+-        if [ $malloc_jemalloc -eq 1 ]; then
+-                all_deps="$all_deps jemalloc"
+-        else
+-                deps=""
+-        fi
+-
+ 	# remove old data
+ 	rm -rf plugins.conf plugins.list
+         touch plugins.conf
+@@ -506,10 +472,6 @@
+ 	@\$(MAKE)  -C plugins all
+ 	@echo "  DONE"
+ 
+-jemalloc:
+-	@echo "  CC    jemalloc [all]"
+-	@\$(MAKE)  -C deps/jemalloc
+-
+ clean:
+ 	@(cd src; \$(MAKE) clean)
+ 	@(cd plugins; \$(MAKE) clean)
+@@ -587,8 +549,7 @@
+ 	fi
+ 
+         if [ $malloc_jemalloc -eq 1 ]; then
+-                extra="../deps/jemalloc/lib/libjemalloc.a"
+-                libs="$libs -lm"
++                libs="$libs -ljemalloc"
+         fi
+ 
+ 	cat > src/Makefile<<EOF
+diff -Naur monkey-1.4.0.orig/src/include/mk_memory.h monkey-1.4.0/src/include/mk_memory.h
+--- monkey-1.4.0.orig/src/include/mk_memory.h	2014-02-04 09:04:22.000000000 -0500
++++ monkey-1.4.0/src/include/mk_memory.h	2014-02-05 08:37:55.403713466 -0500
+@@ -25,7 +25,8 @@
+ #include <stdio.h>
+ 
+ #ifdef MALLOC_JEMALLOC
+-#include "../../deps/jemalloc/include/jemalloc/jemalloc.h"
++#include <jemalloc.h>
++#include <jemalloc_defs.h>
+ #endif
+ 
+ #include "mk_macros.h"
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index 560c188cd6b4..0877a83a9f9a 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -7,6 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="debug">Enable lots of debugging info</flag>
+		<flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
 		<flag name="minimal">Do not install shared lib and include files</flag>
+		<flag name="musl">Enable musl compatibility mode</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-1.4.0.ebuild b/www-servers/monkeyd/monkeyd-1.4.0.ebuild
new file mode 100644
index 000000000000..0678bb6e8059
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.4.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.4.0.ebuild,v 1.1 2014/02/05 13:46:33 blueness Exp $
+
+EAPI="5"
+
+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"
+
+# ssl is broken, so we turn it off until fixed
+IUSE="-debug jemalloc php minimal musl uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+# ssl is borken, so we remove "ssl? ( monkeyd_plugins_polarssl )"
+REQUIRED_USE="uclibc? ( !debug )"
+
+DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )"
+RDEPEND="php? ( dev-lang/php )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBROOT="/var/www/localhost"
+
+pkg_setup() {
+	use php && require_php_cgi
+
+	if use debug; then
+		ewarn
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn "Do not use debug in production!"
+		ewarn "\033[1;33m**************************************************\033[00m"
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# Unconditionally get rid of the bundled jemalloc
+	rm -rf "${S}"/deps
+	epatch "${FILESDIR}"/${PN}-1.4.0-use-system-jemalloc.patch
+
+	# Don't install the banana script, we use ${FILESDIR}/monkeyd.initd instead
+	sed -i '/Creating bin\/banana/d' configure || die "No configure file"
+	sed -i '/create_banana_script bindir/d' configure || die "No configure file"
+
+	# Don't explicitly strip files
+	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die "No configure file"
+
+	# We don't need the includes, sym link to libmonkey.so, or monkey.cp when not installing the .so
+	use minimal && {
+		sed -i '/install -d \\$(INCDIR)/d' configure || die "No configure file"
+		sed -i '/install -m 644 src\/include\/\*.h \\$(INCDIR)/d' configure || die "No configure file"
+		sed -i '/ln -sf/d' configure || die "No configure file"
+		sed -i '/install -d \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
+		sed -i '/install -m 644 monkey.pc \\$(LIBDIR)\/pkgconfig/d' configure || die "No configure file"
+	}
+
+	# Unquiet build
+	sed -i '/^CC\s/d' configure || die "No configure file"
+	sed -i 's/^\(CC_QUIET=\).*/\1 \\\$(CC)/' configure || die "No configure file"
+	sed -i 's/^\(.*MAKE.*\)-s\(.*\)$/\1\2/' configure || die "No configure file"
+	makes=$(find . -iname Makefile.in)
+	for f in ${makes}; do
+		sed -i '/^CC\s/d' $f || die "No file "$f
+		sed -i 's/^\(CC_QUIET=\).*/\1 \$(CC)/' $f || die "No file "$f
+	done
+}
+
+src_configure() {
+	local myconf=""
+
+	use uclibc && myconf+=" --uclib-mode"
+	use musl && myconf+=" --musl-mode"
+
+	use minimal || myconf+=" --enable-shared"
+	use jemalloc || myconf+=" --malloc-libc"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	local enable_plugins=""
+	local disable_plugins=""
+	for p in ${PLUGINS}; do
+		cp=${p/monkeyd_plugins_/}
+		use $p && enable_plugins+="${cp}," || disable_plugins+="${cp},"
+	done
+	myconf+=" --enable-plugins=${enable_plugins%,} --disable-plugins=${disable_plugins%,}"
+
+	# Non-autotools configure
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--datadir=${WEBROOT}/htdocs \
+		--logdir=/var/log/${PN} \
+		--mandir=/usr/share/man \
+		--libdir=/usr/$(get_libdir) \
+		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
+		--sysconfdir=/etc/${PN} \
+		--platform="generic" \
+		${myconf} \
+		|| 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
+}