summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Bergmann <sebastian@gentoo.org>2006-01-21 07:42:17 +0000
committerSebastian Bergmann <sebastian@gentoo.org>2006-01-21 07:42:17 +0000
commit50952efadf40bb90aff97db72dd615d702f31096 (patch)
treebdfcb91ac3352c8736b9440e2480e3870a950938 /www-servers
parentStable on ppc64; bug #119512 (diff)
downloadhistorical-50952efadf40bb90aff97db72dd615d702f31096.tar.gz
historical-50952efadf40bb90aff97db72dd615d702f31096.tar.bz2
historical-50952efadf40bb90aff97db72dd615d702f31096.zip
No response from www-servers in two weeks, committing the fix for bug 102861 ourselves.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/monkeyd/ChangeLog8
-rw-r--r--www-servers/monkeyd/Manifest18
-rw-r--r--www-servers/monkeyd/monkeyd-0.9.1.ebuild12
3 files changed, 23 insertions, 15 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 06292c65d273..3751dc5e40bd 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-servers/monkeyd
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.11 2005/09/17 00:47:33 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.12 2006/01/21 07:42:17 sebastian Exp $
+
+ 21 Jan 2006; Sebastian Bergmann <sebastian@gentoo.org>
+ monkeyd-0.9.1.ebuild:
+ Fix bug 102861.
17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
Converted to UTF-8, fixed encoding screwups
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 7349213f7bdd..5e094f6368bd 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,18 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 1b406a89dcd194302ffe13c0dafcb81e monkeyd-0.9.0-r1.ebuild 2047
-MD5 f9d0709603daa884fbfe56758af94fa2 monkeyd-0.9.1.ebuild 2076
-MD5 291658390dada237b2e8533a44409448 metadata.xml 164
-MD5 098915a71ae204a75c1a19bfdc19688f ChangeLog 3162
+MD5 9acf7a0058075895d6d05707155530d1 ChangeLog 3264
MD5 b4069bcda46c5e3e1d3811511b4d9594 files/digest-monkeyd-0.9.0-r1 63
-MD5 69c4c944e7c908857c48df0e8b8a1eb4 files/monkeyd.init.d 484
MD5 810e268a8cb64ca8f70e205ab8e1d5e2 files/digest-monkeyd-0.9.1 63
MD5 744c1e82caccabdc0a9a61e81dabef4c files/monkeyd.conf.d 278
+MD5 69c4c944e7c908857c48df0e8b8a1eb4 files/monkeyd.init.d 484
+MD5 291658390dada237b2e8533a44409448 metadata.xml 164
+MD5 1b406a89dcd194302ffe13c0dafcb81e monkeyd-0.9.0-r1.ebuild 2047
+MD5 9f2f7d5de03e3b00f7ef0018494a6d5f monkeyd-0.9.1.ebuild 2136
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDK2fZLLFUmVNQ7rkRAp+IAJ0bHSyM+6DOHZM/MOdxyj8Lm54/CgCcCuGj
-TXdaGCALZphY5vhJckR4prg=
-=hjXn
+iD8DBQFD0eXmaGfFFLhbXWkRAtzYAJoDPB9EbX9R67nZYEhek2FtjhD53wCfQhxT
+q1tLubuVoFnMs58o0QKll44=
+=F6UA
-----END PGP SIGNATURE-----
diff --git a/www-servers/monkeyd/monkeyd-0.9.1.ebuild b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
index 3b16687e856a..de7db8a5d262 100644
--- a/www-servers/monkeyd/monkeyd-0.9.1.ebuild
+++ b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.4 2005/08/11 01:51:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.5 2006/01/21 07:42:17 sebastian Exp $
-inherit toolchain-funcs
+inherit toolchain-funcs depend.php
WEBROOT=/var/www/localhost
@@ -19,10 +19,14 @@ IUSE="php"
DEPEND="virtual/libc
>=sys-apps/portage-2.0.51"
RDEPEND="virtual/libc
- php? ( dev-php/php-cgi )"
+ php? ( virtual/httpd-php )"
S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ use php && require_php_cgi
+}
+
src_unpack() {
unpack ${A}
cd ${S}