Version bump

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

4 files changed, 168 insertions, 20 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index a90d7b0ae0d8..0b8279e7ceee 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/monkeyd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.51 2013/01/05 21:47:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.52 2013/05/28 12:55:02 blueness Exp $
+
+*monkeyd-1.2.0 (28 May 2013)
+
+  28 May 2013; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.2.0.ebuild,
+  metadata.xml:
+  Version bump
 
   05 Jan 2013; Anthony G. Basile <blueness@gentoo.org> -monkeyd-1.0.1-r1.ebuild,
   -monkeyd-1.0.1.ebuild, monkeyd-1.1.1.ebuild:
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index f8c78777873b..30fdcb5156c1 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 AUX monkeyd.confd 288 SHA256 ba8e0113f3d90f4c5681fb9c76ab523b56ffa409f8b388db9f83e54bd1700eee SHA512 0ed5e3e7f86564d157d833f980e715ebbc0017530f967b21581a1df8c0990a15ff8af538f664c03da3b10affa02773ad78e4dcd03a3d3f670d7661ecaf0ca00f WHIRLPOOL 1f736bab1f63324c0020d2d236bb84bf253978d76db8087ff0d71849bece6ae7531dfa6ab250e2f136301ef265f35061d059eb45536fc1b8220c9fbd78b83ef2
 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.0.tar.gz 425807 SHA256 b15b7f5df57a57ffea42380454e2de9896297f3326756f77b39ca8386d9fb22f SHA512 6358e817e75cf8160f95ec8185eb7db21793b1dde916c8a5e38b85f788e284a00175fa82cf764451db6a4b656b50c25908baf6f52d73037e4f597eb84c05c356 WHIRLPOOL bf717c8c873935031955bf7f5d940f01d132347fc9b5e4f5b3d4f93bdcf2bce65b19644d5e5b12d6b1409f4734b6a28c90576e603086d7a52817fd7f0ea11840
 EBUILD monkeyd-1.1.1.ebuild 2044 SHA256 8929978ca500523871a1707816a12de6f47950d3b90efde6a29fe960ef1d6c80 SHA512 d8b549bd1df2543928a132226969ae6352ae245ce9afd98199a5c4497fd335fb0832687c7c3a789b43e7da6c6bb02a9daa7c8e14c81a6b6b57d9af545d74dfc1 WHIRLPOOL b399c1df3a3bdf5c4eb2093d154e9c3195c4233afccad725cf736492cd3c684a600c9eff53764cf486c7a964940e60a73c0a7fe5f2a47a267aa876bbc4f7d593
-MISC ChangeLog 8669 SHA256 deb33409117a3013795d2ab7e736b96077926649acdd37ac154c429c1ff11300 SHA512 100ee0c0a5ba3bf56ccda5d0c9b3f96baccf4f46efb9c7d7fdf313eb77b5d3b8743cfea8aa11726d5e22f6f91b66889f95f742fe546d8ff743f3d273cbc14806 WHIRLPOOL f9cbf78fa1182f67b567bd819c5dfe554bd78a0d8aa25be6b4c1a48fad856d453e35f79531aaf391c1248d12beaea0bcef40cb746674a4a201193e45574b66e7
-MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
+EBUILD monkeyd-1.2.0.ebuild 4251 SHA256 9c7bf2f34dcfeca0283a5a72a2b9d0a616cfcdf42fa9b66689206c7c50698496 SHA512 b9f0121ac4f00d45c25f9b408016cfd252acf40ad119fe5c04f7f20150e54c9056f240a1f0d9fe0dcdb99ca500c3a08943d6f5d06d906a69d28b2621cc827c9e WHIRLPOOL f22beaae33084606e4f9cdb6ddc9085681aa73e5d3dc950eecfae149cdc946d23d5e1a766e8fce4db2810c7a79c9e0db5e90defd1684de2c258e849fdc19ceb9
+MISC ChangeLog 8809 SHA256 268ddfd0ccf843e727108c1d43aa67876be3c1f00a32d9f6c93b3247c5925640 SHA512 c79da412a766efa4139fff677220c77e76c96d54f79e5b1f33becc176cba4dfcf4ec7cd9cae6f7c97902d13ca1852ef37d91de47903ff7fee9d848f1d376aa85 WHIRLPOOL d3cccc4e4ffdcfa612ceb82ad0ef4671037357c3aefada911878b6b84a1b3a0e46587b34dfc1b2a8771e9f20dac15f3b75975defc91e0f40e9642cfc799eaba1
+MISC metadata.xml 363 SHA256 fbfae392fe1ae496e54604944b1b3dcd5e20441cc614f3affe878e44af60d116 SHA512 1b0b3d73f924f4278ba67b28be35fb2aa69d0840d262d767ab303f492baf8f8254f4abef6d35bf68b51e41f9a53b73628d7976284cbfd3fd05db30340860a621 WHIRLPOOL f581574f4e4c923e626e075477f316d21d30e9bfbca19ccc401f9c71ca238aae1cbca5b32da11fdb23ee1d8dff15825ffa9132cc807c77a67ac937004cec7934
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ6J9bAAoJEJOE+m71LUu6Kl4P/jAmJ3/EHHoDUTalDttXlhMY
-dq3bXy6k4NjxR3S/YGq3QiPSYDhzC6WZTT2YXTkXeWLeA89ejZeYOe/AIA6qefP8
-VkVqWtCjDyzlyHVbAzcnj+sjhIfxPFETzvbjUKWt7XDf3ca93UKhcbo1958Blruq
-6pH9wtfIGZB8Vti4AeZh4DflJuGFI0VFpYGhWi5gbZjyBf2+zrW0Ljk8CxlT/2C/
-HhSRMa2jKUSZks8cx4nSU4eo0CA6sAv/+J42vaaPq0vfEKvuen6jGg+GDsTXTQFa
-/17uD3vfNOpRVHn6as7e3GmqTinJjnS+HHBK8RUOXjx9tFXiW+DgFcndDkYW7aMv
-qLz+jegXcWhsuESlvXp8fIV7NFOkxoMUZ4XrWZzjRwP54Z6lJc9DQ33yErSE8Gpu
-5chzQVDbGCVoSwN77x+3RUYklSKeW7aW5Bz1cLg1Juf77GdI64nHbL6KGxUiI5rq
-BQp0d1pz6+nsEvoHF41R6Wvqy2DIEwfhGfnD6ZG7gCXDa2gLncGIntIoTLGGXI7N
-CZabTORnu9Uuavp/mWgIvtbtgqofaar43lfmyPPD0tku2j7xB0CHLHu+Tb4K1vsq
-jD3qafNb6xWj99KEmBhvtkqhVpRHlpaj81cq4U37F7pd3yJvnzk5feKfZ7jfZQkZ
-fp7T3EYosg7HSNVZPpIt
-=beks
+iQIcBAEBCAAGBQJRpKk7AAoJEJOE+m71LUu6T1gQAJd1u7zTz0/iNBBkl0yd4vdh
+rusgOImfQZQfSPaW5c9XKKpSZP3xtVeJxxWqNLV57k1PqmXsOLYmndZPnQ2b56c7
+OSBACztoapm4/J4D4K6W+02AA/7pJ1PMvk5COzWV9/hFcXrRpaDerE8Swk4iOb9e
+Si1p9ggUrSqreIW9UBlVNyUn5s5s20b7GTae3+pJ6dqVnNtM6Fi9nSOwAPZAI8B4
+6oNPyuz+OSs/d68kVG4xbE358z5sckx7X7JYLJ0r4nX4g3ar2TI+eHJfxXe2Mi1p
+YvHoUlG9FpQHw4Pg67z6qWadI//idV8Tu6G5+4/KMJ4FVDwW4a7qfO/cOf/g5RCW
+FXpEO6wTLR82i/xjqdQP4S7JFtqGBj/oNPG9eqtfJM3D2Xw3d3o5W6b2lCCSissm
+wgBl5U+ztWdIO6wZkIpiPsrlS7/ZMeY/DfgIxjVWZ5zQDGYdDOEXeBmZS4ldQWrP
+jm2yf4MjDqYhBlUJ/+4T6wdvrgKgA3nknjnzwi4ocCJHn0I1GhLFXX9F7Lo/M5bS
+HN4GANrYlbyL67k7PyCghGH0fimnZDDLkGZHzi8TvW3l6l1XeXqUcCgkOqR9Hy6l
+bQaxcwosOy5fB7Y7E58BqF6H1U2fhMcVB/o55GSI1nuPOi/fVLQKZht3OKBAbzUH
+CH4tzFQ0M/fkzBIZEDqo
+=6aAo
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index d67a15ac1284..0f40c54bf1e1 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>blueness@gentoo.org</email>
-	<name>Anthony G. Basile</name>
-</maintainer>
+	<maintainer>
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="debug">Enable lots of debugging info</flag>
+		<flag name="shared-lib">Install shared lib</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-1.2.0.ebuild b/www-servers/monkeyd/monkeyd-1.2.0.ebuild
new file mode 100644
index 000000000000..a80f8afe0ed7
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.2.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.2.0.ebuild,v 1.1 2013/05/28 12:55:02 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"
+
+PLUGINS="monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi
+monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril monkeyd_plugins_polarssl"
+IUSE="-debug php shared-lib uclibc ${PLUGINS}"
+
+# uclibc is often compiled without backtrace info so we should
+# force this off.  If someone complains, consider relaxing it.
+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 shared-lib || {
+		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 shared-lib && 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
+}