Version bump.

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

3 files changed, 166 insertions, 15 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 53ddbe71f704..6c7f298417d0 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.84 2014/10/19 12:24:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.85 2015/03/03 11:18:50 blueness Exp $
+
+*monkeyd-1.5.6 (03 Mar 2015)
+
+  03 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.5.6.ebuild:
+  Version bump.
 
 *monkeyd-1.5.5 (19 Oct 2014)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 44459b51a605..54cbcaf92f33 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -7,24 +7,26 @@ AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f8
 AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d SHA512 9f5ac51a06c0255d5d2b09c19228c849c5314f8f9d4ef2dbc837028620462897dd81b504cbf53bd36bd4896e72fcc17b2b0043e038de7bd3d39aa1be26dc8126 WHIRLPOOL e3d4788d4b78a7e1b8482581547350e1dc989ca561484283533d696eea3419f89643fe45610c6e793a3e2c26a1ef7e6ef24cba9fba99f8e06a4cfcbe25cc57c6
 DIST monkey-1.5.3.tar.gz 892478 SHA256 0ac300e04f052818bc26b7da0183c3c5cd13be8090aaabd3505838587be8c0ec SHA512 6a55ba580bfde3c11329e94055d287e341990e4db4cb5ab12e40b8bab57b4b51fd57cd33fc5aa9d864127f235888f818593be26fe93daa34ca3c40fa8936465f WHIRLPOOL 4038bd2f0b39f6068ab69dc98dec4d5b29feca388c18361f57b653db86c38469d69072ae803ddd565e57350163247072334835216a13d014956a27b91c8a42b6
 DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7fea2a43be6b472461b45b05 SHA512 faf86a36a91c8b1e47f3a2ea7f19aee98eada6f3348ff64f160fc388c268a146d49ad9434043731cf928fca6708db40fa5e1daedc41d4b8cce671f98d590b920 WHIRLPOOL 26b44624f77b72bbd31da6be5855429199a0fc9ab163548f1d0f21a34b84a1f0325241ed7ad5ecbb28c9e9f899458b5d8c15f9f91e27b73a53023c2e3152947d
+DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 EBUILD monkeyd-1.5.3.ebuild 4661 SHA256 9fcb34841425f8090cbd51c7fca4a4dc92a222a4da1ef585584252b0c8e2866f SHA512 10c4663cd34c9a8390be1386312a79599df6c9b93305e2c39e6a8e3c4d14c34476a72980612666f1e86ea7ecc6067a52359649894688c0dcb8673679c8807a77 WHIRLPOOL f89391785fb32d11a4c506ca40ca53b6aa1150477e5e5aa7dea70688200abf0ffe8d63b5021a1c22778b1fff372da614d1d95e44037e538a63ce8814eab16523
 EBUILD monkeyd-1.5.5.ebuild 4666 SHA256 8b596b68ac45fbf73a1b05ce234cb7c1d02493adacd48ae97856ee0d6176339d SHA512 a412e6c861b953bea9252b4c06e6fb2f5edd3d5d5ac5a36e52c5c281059472ebdc70f7854eaf396beb7571868ba612f59f194ef42cfa8a9af07959a95fad3931 WHIRLPOOL e7aa7ecdcd183e2bd25fb66fc378d7f42d4c289208ea41290f9b004c8409e5b5cd8814fbfc83ccdc9d6e87efdf42ef183caad941dca41a670161fe73629765b1
-MISC ChangeLog 13468 SHA256 eac60beae4e8fc0622d220cff95f133bce5a95e8a9e22df568f19228455c7139 SHA512 bac41e95ca35ed67abd388f0399a7ba4868c7c728bc248f0c04fae7ec9407a53114314a494d1ed477a6b9a1318729e23e225fc7cab88d6554728916333c7c2c6 WHIRLPOOL f2b9086a5563ad95599a1c6c3cc109699b889b3bef511a5a1bc9d896af3977ebdf4ba16ac99ec2264dce6492e52983c42d1d6bfaf1267c35a764d2a9394db15f
+EBUILD monkeyd-1.5.6.ebuild 4666 SHA256 377feab7daf5418d845bda2eb8c5eb158f49dcfc472398cfe5986f1b2f8e32cf SHA512 c0971edbfd4d594dc4746339104b226337034663c401fb779ca5904277e935457a04f07ca5fffa08aeb45d64f75fb2c6c05894c710ae6779f7a6004bf6e092be WHIRLPOOL 4da716d55e3ecea9ab74ff6c4b2a4dfe987ae34ec0f056e637e62fd87b68c128f4816b3ce3d7801a97345cdce59d3cff26b14ec245a2ab1739ac0a96456e6a8f
+MISC ChangeLog 13593 SHA256 0a0ca2bae21e5b8e491429187212473e0e5565bb2aed197ef9a10a019f307c93 SHA512 86f435f556cfae9b0e4923a25d5ac3293bea8557bbe083ed23ef260bfb5f1a5f95cbcc09d4ccccd77dbcd48fc413afcc3d6bdd8f41c45b67469941c05c48fa47 WHIRLPOOL db0796c3d7618e1310145a95f574b4d65a55e56c4f7d6c80d29b2630d0d8f1f8a661b35de8973854024eefd3a40d21dc028103cd2df05a3820c11b6052432a17
 MISC metadata.xml 454 SHA256 c916dc93db8fabd28ce958c782df8a2b37765a52897e25a4d4a32a183da4a52e SHA512 c88500a432b7753b4630a35c37970f5c98e83812c3bbb29e87abad4bf6d965275e57374520e02f8c7028be34cbdc9c0f94b585de40bebff4bd9eb5826da22c55 WHIRLPOOL 29177e52eef3ed11c150c468000ec0a492a89a549ac06a7e4c9dc5276df7fa791c94e0ef978182d57842b5c5359a9911189b861a89e2ed8b95a89da34dc8e06f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUQ63NAAoJEJOE+m71LUu6GDYQAK6rmhY0HHGcXzktDI2ECn1I
-c21d+qdQ8zeHU5zH05DfSDJDVgo4RTq9u09BN4BrTjlpcckLBI4yPREWDJoPnvKQ
-dtB1wghg4ApJZ627meyeUgCNPIFQ5oj5v3/F/AGK4OqASyO/BrkWSHgZOitkb6xx
-3R5UquFx46nU+NFZURScl5157YQZQObJHZQADV0cUWUJvu1b74WMrUtfmJkLlMzA
-sZn3dYUq1hh0Lw1dWsTjJMIWP7rgqEUpUsR6UW1OaKIxvV41nfHJW3cd6V33bhrn
-qnVEDEm9LrdZPIIJqjRGHxI7B/SHKUXRi0jV3QPEpoYc3R6LpovJVir9EW5LNK4S
-ExhIQNPOXUkNC+M4UJzJzIDiokRqKtUl4/bkoqRJOPoFM1n1dKFdzFkK8BWTRkbt
-1SjTaTbvinjzhVqZa9wRVlILM6sVgUfLS8jXbNlTEYyyC1Sz11VeO29ZQnbp5k3d
-lGnHN/fXBEJLoOoOFc+q/rxB2ioeXW+mcXvD3UeQiBP+aG2aVmjgpEhDwORLOgFV
-HVxvPdK8QRZcQTuzwYl4XBuNe45opZFNwVRV0NGCDSObYt91hjK0AwwoMN4k6v36
-mQH7Nl9EZaNQvJeSfNFr7DoAlhlKoeltqd/zH96vNB2UCigGwgn3TQqbQjgjhlK8
-MdBXfcobT21dNkvk0yFk
-=K/ry
+iQIcBAEBCAAGBQJU9ZkdAAoJEJOE+m71LUu6eQAP/2CD0IhvZHIOxO61W3+YRt93
+QhxnfXNiUw7nFF273sJtOHF2YQVOoCD1YvRVNPwWmQ2uWWiqpp5n1pJvoyS1CkQk
+ImQWSi52UaqnEW/qniW44FTv5dgETAInHKHuWBKC8eBCwflmb8yX6a1F+kGbZjz8
+35x8ICuzSQVYTqWK7Y0icRdAYsO4UkaEBXPk8MOUhtKgmEo8cBHv9s7DSTeVgMcH
+umLtBBRiAnEht+L0ijxQP/txnumPT0vS4WyTOew96KRnIEDej2nXTL/BqTEnUI7y
+RjpIFdV7DYIlWMqPEr9oLkCstLyXHsQSIMGSp6lLqH/HwRP2z5XBVt3ZymmvmYi6
+p7Dd0dY2n/frWPW14gkdggpEJGpqZUPcERMm624PGcupIopd+twEfEhTdQQHdxCV
+5duOhvrhWnkAq5o/DBd1Kc2StEnyMgDDyGTL0ShHr+kdShtsDfPC/3gdvaBPorgS
+98AYRdJ42jRT81msCmlNy6ZRyOfgRbMLpToVvTGm79eJV2IoMDfGX73CpzBN6TRg
+RHhj0oKwehbU3ix8Yfn/5MNiGzvWQjfOtxm5N59BreURXTvbyyzVK/E071uh46Nu
+vUh7yYeM/lSqR4S0xfavecgB4t5Y6Q9c5MOiZzsJLvo5jukRqH8HEu/+hvj3Lzh/
+xgG+Q5qra9BOPBKmZaWH
+=BCbG
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.5.6.ebuild b/www-servers/monkeyd/monkeyd-1.5.6.ebuild
new file mode 100644
index 000000000000..190d23909ddd
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.5.6.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6.ebuild,v 1.1 2015/03/03 11:18:50 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 elibc_musl elibc_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="elibc_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.5.2-use-system-jemalloc.patch
+	epatch "${FILESDIR}"/${PN}-1.5.0-fix-CPPFLAGS.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 elibc_uclibc && myconf+=" --uclib-mode"
+	use elibc_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
+}