Version bump, bug #472644

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

3 files changed, 159 insertions, 16 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 0e5dc49c56c7..1ced88934bcd 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.58 2013/06/06 21:06:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.59 2013/06/22 10:48:11 blueness Exp $
+
+*monkeyd-1.2.2 (22 Jun 2013)
+
+  22 Jun 2013; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.2.2.ebuild:
+  Version bump, bug #472644
 
 *monkeyd-1.2.1 (06 Jun 2013)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 94a7a6ad4f6d..38284272f84e 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -5,24 +5,26 @@ AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f8
 AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d22a6fbbae285d SHA512 9f5ac51a06c0255d5d2b09c19228c849c5314f8f9d4ef2dbc837028620462897dd81b504cbf53bd36bd4896e72fcc17b2b0043e038de7bd3d39aa1be26dc8126 WHIRLPOOL e3d4788d4b78a7e1b8482581547350e1dc989ca561484283533d696eea3419f89643fe45610c6e793a3e2c26a1ef7e6ef24cba9fba99f8e06a4cfcbe25cc57c6
 DIST monkey-1.1.1.tar.gz 404633 SHA256 5b6cf4b4a5cc2e6c7e2ac08515f542636884d7f85684f87005c6020e3567c7f4 SHA512 37a7806995d70a432d1f42e01f31a25012c7f39077613a4a0a772946ba512b52438d4ea3b798e09cc514833256775030a67ede5f66ac7ca93323642fba003008 WHIRLPOOL e490e34fe12a8f7f7fb63cb980fff6b642cbd341c56451ed4067fdb90445cacb6101b692e752f0771626846970651e1d07d1cb281e355be2fefa2581e96fe242
 DIST monkey-1.2.1.tar.gz 427126 SHA256 b1fcb257cb70e12013eddc5a7bb78a942555d400adf5902e67a8070148b11de6 SHA512 59ea99042cda4a3ad68c4184ec9c8cbd05c7d604bcbeb2cb90e21d27112395b1f1877e3592390a4aac6eb42a766e7847eac2606291827b8bf943e809b0d25be1 WHIRLPOOL 33d910c7ec63c676d6a18b24db5f1f001179a4b6a28150bbfac341f7331235dff4e25d60e4ed86f5e180ad012d81ae965c3646593a3bae3090ba8f146422ae08
+DIST monkey-1.2.2.tar.gz 428467 SHA256 fe52c95436af8901399656e7764a207fbe64b5ca4941e458d48ceaff49c08633 SHA512 b76e90d33db119e881cb3c3adad2cae34a59c3f42283945912e6f3bdff97dc4e82bec663218fc925c16d4e1c3ef50a8c00d3a37da9d0e7e042ec3bbf88f58cf3 WHIRLPOOL 5b13419505be1a09d63e3d54ef17f1bdd8c2eba6ec1cf59c4f9b20c82ca661fcbeb50d2454913de03dce225de90bedd0bf4ba3ebe3d477dd8af481542928baf0
 EBUILD monkeyd-1.1.1.ebuild 2044 SHA256 8929978ca500523871a1707816a12de6f47950d3b90efde6a29fe960ef1d6c80 SHA512 d8b549bd1df2543928a132226969ae6352ae245ce9afd98199a5c4497fd335fb0832687c7c3a789b43e7da6c6bb02a9daa7c8e14c81a6b6b57d9af545d74dfc1 WHIRLPOOL b399c1df3a3bdf5c4eb2093d154e9c3195c4233afccad725cf736492cd3c684a600c9eff53764cf486c7a964940e60a73c0a7fe5f2a47a267aa876bbc4f7d593
 EBUILD monkeyd-1.2.1.ebuild 4306 SHA256 9175eb31863b7c97d58bed3f7eece762ad33270e67819094af5032c92ed13824 SHA512 5866ed717866b36771d8fd2a5e6bc3f87526c98493bec191f3bc6cca474622ce5c4815c6ebcc2c65e5268a881346d84fda6c001e50f58fcd2babfc26425fcdf7 WHIRLPOOL 7e964632a4def037ed40197506957adc0c2a676aab795a59b1b948a8745c0c12e692b1867c2de1cdbdec3bcd36a3bda7ca099260e811abb1dd354c5f0e5ec011
-MISC ChangeLog 9867 SHA256 ceb5066f59a2c4ec6b7e29c94cc8b25d34140c0012488202fdde7dfd7129da1c SHA512 21a45c532eecd49ce7ba91c01ae53a303e4e744e254e317e252ac81d56873a7a6607150b8e8ec070e9fc1f8b81d5e8ebc78d61a3cb2b7d7d1ba423969ef8f791 WHIRLPOOL 7328c6386baff3c68a9d9921ce8c5eee7792567034d4ef978f914e88991b0b73d7a9e044839ae3b46ea35946f3a5a4919b98c619c7c381e8b62ffd5680e197ef
+EBUILD monkeyd-1.2.2.ebuild 4306 SHA256 83d48ca250c221dcbdeeb8e1a952731476f2c1bf4b903dbb29a6c4aca1bc9707 SHA512 f7c264905964e1282e944243a8213aae83a208d9b126339c337b09d12141e8050092b5cfa4c7b70d5d3ef149869363bd342797822fe1bfe15f4e8eca61e341d6 WHIRLPOOL 40f25222b01ff0439562c1c23c68fd22a6bb2ecf168ab4465758dcdaf1795d966d302bf5862e79b82aa8580b1e7ac1bfb3806f7e3d5591182ef595b2415f23b6
+MISC ChangeLog 10004 SHA256 98c9333bedd1a2d02cefd32fe49e61d9644236c5e5873cb4d57b492221e7b516 SHA512 566986d47581388ac51e2bcbc54b474fa587f290228243d58be63b9e2e83c6986341ba1ec957d2a67494151cc1138848e203020d0eab9d81cd8a8365b4bffd47 WHIRLPOOL 0500f35f1a1bbeac3cd695afb12c80dc8adc54eb43377b23013367029ebfd63419394bf2dc08f0ea04efcb94413c1105e22485055dd0a70d881e5cbab3546030
 MISC metadata.xml 385 SHA256 88901f1e630c8bb995da2ece6f50de69a82b845f63e51742c6f90b26f31c5321 SHA512 863daa33d3ce733a5b84927dba2f0bb28f24802b27f0b2ef225b4c5e8251977f8500ea015f0f21febda32cc7933c95daf9add6fe9563cce979ecf8096babb242 WHIRLPOOL b61c7a2b8e851a98662ebbc76cfb826a0980c6c9654f119d152f226add3cce42b8ed2e2d354e6c994b9e10badd3521b611d133bdc0983a00c75e920717959269
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRsPnsAAoJEJOE+m71LUu6nuYP/jzS9aiRkUjeAW/EfFhqBCPh
-Jj0pOEXxXwUgGnS5971wg0okujqe5boUud9vjUxnjUqIlf4r/LDlfoXovPJekEKj
-kzZwJrbqTlVf2fQXZFx5KJJIjB7oNQXHtTwt5WtsTRDsRD+vcO5M3uS+9WeIWqsb
-TCx+CMWjFgH9pI/DtB7VIPhcXO4oqiFNASlLFlroL6vDfN1+NeuqLsfwWH/Oha0h
-IKCyUWwFOcDOiVHDdPrVivx6vgJa35Vv9eiZfZ0fFMnO8u+IBYIt1euQZRKISBix
-eojcdIUIinSCy21gxsjM7vntbVTVutleikYurGw8gRTPqn7zcBwvkpV/LZz4QB57
-tPCxQSmwkj50hHEzSrejUAjzlTXF6FQUuCIacuEAiTe8GGYXlxWvnVHzwAoDecnG
-q0lXeXYdIsdE27n3adFPl3SfUPosyA2WsAHHqmHo4EPUItK77F58HuXKpHZeCvd6
-Um9B87bGE226EaLomHS9y+eNz0keGhJDKdVlEPZ8NymNMD8mL9cPrp/YkOXKE4sJ
-zvv7CxPO7rAdMiISNmMhfQ8GfLCvxjychcYaQ7jwUXVA77VT83sOtj2BT2RJ3EMT
-8s4MLhotkpDYEEAmZuQzRDlZrjwguB0Lf14ovDfKzwp7xAXRBcEbEugfrOmZlY56
-+VQQSwL3ylqNor/P8V7R
-=Paym
+iQIcBAEBCAAGBQJRxYFLAAoJEJOE+m71LUu6h/UQAKkyfaaDHA+FDkHjy0fDMhDy
+8mmvHZnhUL06byBdMYjSFMJ6eUdyf5zFsMj/i4SmzTlry9zQ9/beu6llkDPEFJfB
+feaOgiVQLGFLu/7FsCUA0l249Um5tpLP8ShP2ereiVTUNa1Ter4TQOdMXcHmMxIG
+Vt+6xmPyw405F1EZPM/g4mMwWcnFZQDNZ9s5QW5s11/yJo1u5gXRRGhwhUIfKcRq
+DT/NBPT5pBbb9YG86NOLjQ+Is2PInwNVvX3Lh2xmUE/QidTOBp2h0JE161xLQS2l
+VXZx4EqKaMZI8sVUieiRRa69r7hTItDHcnpaSD/7T8wfoGap+nHi37qrbTzv9Jwf
+miEmGmxBGhM/UImza6ARtCWmNR/ePPHSs0mZLWt1K5jE1Cv3dM2mZSEt3CraMgCS
+Um4S8+tMayHw4r4nRB3Zbbiu8HYCII5hD7yeakU/AELDClIn5XocpuR4kPPxFPUk
+gAYIIDEuihmmtJ88CvDkQ89qquNjkuj3aOFjyDFB4iisiVasWgDNnj7/CjeKRK8m
+0ljoKTY0xralFnBEq6XiwixPSul0mhl8uWnbkgr0vtF3ukrElhrHwz9ek/E+9bT5
+Jb2cvUKmsrLQ7PMpmMXPxVEdclm9I3NACLbqOgmi5kdGk8IasjouCldrxqcxxMFj
+4UlQ6yqCC3Dm2HoPMCAX
+=Tby0
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.2.2.ebuild b/www-servers/monkeyd/monkeyd-1.2.2.ebuild
new file mode 100644
index 000000000000..11371b0f2d7d
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.2.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999- Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.2.ebuild,v 1.1 2013/06/22 10:48:11 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 php minimal 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 )"
+
+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() {
+	# 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"
+
+	if use debug; then
+		myconf+=" --debug --trace"
+	else
+		myconf+=" --no-backtrace"
+	fi
+
+	use minimal || myconf+=" --enable-shared"
+
+	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
+}