Move distribution's htdocs to doc dir, bug #429632

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

3 files changed, 87 insertions, 5 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 714812d2f88b..b77e067e1814 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.42 2012/08/01 15:57:03 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.43 2012/08/08 12:17:18 blueness Exp $
+
+*monkeyd-1.0.1-r1 (08 Aug 2012)
+
+  08 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +monkeyd-1.0.1-r1.ebuild:
+  Move distribution's htdocs to doc dir, bug #429632
 
   01 Aug 2012; Anthony G. Basile <blueness@gentoo.org> monkeyd-1.0.1.ebuild:
   Stable arm, bug #426664
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index f8628972719e..bad48ee1d91e 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -8,13 +8,14 @@ AUX monkeyd.initd 716 SHA256 3e1c3d1fcf12bde4847f86c06eaf82c1230af8c56040d56f25d
 DIST monkey-0.31.0.tar.gz 322931 SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
 DIST monkey-1.0.1.tar.gz 339773 SHA256 aea57483f46e5c5723f851cfbdd2a17a45ea8b7baa65d499e8b34216df617abc SHA512 42fa75370361328428eebed1d6a914137ab471022dff95f9efe8eec2ae59ef75753fa180bfd527beea2b83d5e33c394555ddbe13105f2901ceca4a44df382844 WHIRLPOOL 0ff51cd7396eb24d194341f4605b5541ac4360a85933d833cd3e4ebfce92e38509f99de2565e1df5adca4e827e9d5aeffe736cd9c4a6630b8f5acdbb28a7d408
 EBUILD monkeyd-0.31.0.ebuild 1853 SHA256 32f8209c169678c852d0aaa219efa623b6f533527711c2697e2c19af498978d2 SHA512 dd53fe5c067dd10d784be8b4e704d382681d0c0831c9b336bf9514580dc2c9c37d9a8f52b1e2e10d5a9b1cc599303e12044928c26ddbe69a2b77af7b4a8bca22 WHIRLPOOL a63361cec312b320016ac2db921e0f7da287bb508f327836d872d7eafaa980f6fe8307b69f07bdeba10dd738bb8b5875a21074f97f0792bdbb7a32b05dbdee5f
+EBUILD monkeyd-1.0.1-r1.ebuild 1969 SHA256 77c3f9485c03d8ce63da805d7ad077ad34a7e4aa441ec9c4506ba6c2dedbf618 SHA512 95ecbeece20ad931d63ea566edb18a5e70e3fc5806906dabe0f53f85e5fb97a412ab4a237fc916fae93da028bac6a2bf014ee562ab2d293144f13a81bea05e81 WHIRLPOOL c3e870c6dafcbc4cb6091117e4f40147fc2e5aa4efe315c2652c745c87232d0c9445ec04005ad5ac2d9f63770751547c58d6a3d206a8d97c101ab78af487a074
 EBUILD monkeyd-1.0.1.ebuild 1859 SHA256 efe78ee434c52e123d34f79f837a526fe30adfc3c78922e8f2e33936599570fa SHA512 1467a4d223f539192b55b1ab200a3aee758ed982801cc5ddd22ad772176bb17692087548a1416764ec8d0145b5af280184f771daf085e6e01c6820eb57593fea WHIRLPOOL 4f7dd9a41a40d436bd3ae06c3bbd83ac14901b8b9b0668b34a834668e62146274eed19d064ed09158936441f53afcd88b2e22752f6b4addf8f1a853ebedf81a5
-MISC ChangeLog 7475 SHA256 5a127e44d2f22436944fe3e8ee97556efcf651ad44e035fc57b3f7d188042a91 SHA512 c8a8d50c93b814ae24953f1ea642f036195c51ccbf8010783fe82a3aaac57dc5bf22f75edc371cc9a8dd6cead917adfb00494c5f71fbc87637af09578936891b WHIRLPOOL 7f9f2e37fbd0119a01aea2f504005da3dc6934aff5b136a9cb96baaecb5aaa52e1b818444ad289a070f1fdf86bfa64d93c04c092d0bc960632c0f93e4c20a2fc
+MISC ChangeLog 7645 SHA256 7101f56874691b4df4c43254ff3be0f32fe7db1f6d5c63899ab966ab3ea1d66f SHA512 fe290517e95ece2b4f7c3ed5fe50764eae7cb67f2c9457b798526637a04838d81e1746f66f4c2d49b25277cd4cbf56bb7c60a3f7477431068ff75a700d3c87b0 WHIRLPOOL a3e176b83d90a2f1572a383120c77878682dbb57f5809a7a041593d37415329b8a73df743369ffdb9e149717533e25d49d83c611d4b9193ab4996f5d8243c0e9
 MISC metadata.xml 234 SHA256 86b598d5029ad9988722ec63434ea041be297ddbb0b2e290025f3b9737427ae9 SHA512 6bae37c6cc1d1145120c93ca1e2dcfe44019a51ef00edbc4ce132dbbe1f349a0eb854d6b0c1e4585fb4026a2142d23cc6ea493fc8ceb1aba7d8e3a404ad81491 WHIRLPOOL ee79d3a53e7c3d2b2af95c299347c823a6e6270eb7130c5dabaf966ef7615c063fced95a444e81165cf7c04543247654afa1195c2dc085e34cc8194a9a63f75e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAZUdoACgkQl5yvQNBFVTXoiACeIWYgBJ1kwGVIqH8eciwPF9/O
-1sAAnRIMD+JBcYvVHP4o3NFPraFHabHm
-=bUTF
+iEYEAREIAAYFAlAiWNAACgkQl5yvQNBFVTUiNgCeLV1XeVKjP3zpF6zL8KbAqjhY
+tS8AoKJrDGVYMZPI146l21UIiOu8e+y3
+=Ocfp
 -----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild b/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..d945acd9f833
--- /dev/null
+++ b/www-servers/monkeyd/monkeyd-1.0.1-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.1-r1.ebuild,v 1.1 2012/08/08 12:17:18 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 ~arm ~mips ~ppc ~ppc64 ~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
+
+	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
+
+	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
+
+	mv "${D}"${WEBROOT}/htdocs \
+		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
+
+	mkdir "${D}"${WEBROOT}/htdocs
+}