[gentoo-commits] gentoo-x86 commit in www-servers/monkeyd: ChangeLog monkeyd-1.0.0.ebuild

[Anthony G. Basile (blueness)]

blueness    12/06/07 08:22:06

  Modified:             ChangeLog
  Added:                monkeyd-1.0.0.ebuild
  Log:
  Version bump, fix init script
  
  (Portage version: 2.1.10.49/cvs/Linux x86_64)

Revision  Changes    Path
1.34                 www-servers/monkeyd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/ChangeLog?r1=1.33&r2=1.34

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ChangeLog	23 May 2012 15:42:00 -0000	1.33
+++ ChangeLog	7 Jun 2012 08:22:05 -0000	1.34
@@ -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.33 2012/05/23 15:42:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.34 2012/06/07 08:22:05 blueness Exp $
+
+*monkeyd-1.0.0 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@g.o> +monkeyd-1.0.0.ebuild,
+  +files/monkeyd.confd, +files/monkeyd.initd:
+  Version bump, fix init script
 
 *monkeyd-0.33.0-r1 (23 May 2012)
 



1.1                  www-servers/monkeyd/monkeyd-1.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/monkeyd/monkeyd-1.0.0.ebuild?rev=1.1&content-type=text/plain

Index: monkeyd-1.0.0.ebuild
===================================================================
# 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.0.ebuild,v 1.1 2012/06/07 08:22:05 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 ~mips ~ppc ~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

	mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html

	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
}