diff options
| author |   Anthony G. Basile <blueness@gentoo.org> | 2015-06-17 22:12:55 +0000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-06-17 22:12:55 +0000 |
| commit | f3fda0e4ca4bfc658630e17f5ec6f4307b05a9ce (patch) | |
| tree | 2e8bc2e6c3ae1886f6315a2838a05a65f280792b /www-servers/monkeyd | |
| parent | Version bump. (diff) | |
| download | gentoo-2-f3fda0e4ca4bfc658630e17f5ec6f4307b05a9ce.tar.gz gentoo-2-f3fda0e4ca4bfc658630e17f5ec6f4307b05a9ce.tar.bz2 gentoo-2-f3fda0e4ca4bfc658630e17f5ec6f4307b05a9ce.zip | |
Remove require_php_cgi. Fix bug #549974.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'www-servers/monkeyd')
| -rw-r--r-- | www-servers/monkeyd/ChangeLog | 8 | ||||
| -rw-r--r-- | www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild (renamed from www-servers/monkeyd/monkeyd-1.5.6.ebuild) | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog index 48b1016a532b..0280e942ab06 100644 --- a/www-servers/monkeyd/ChangeLog +++ b/www-servers/monkeyd/ChangeLog @@ -1,6 +1,12 @@ # 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.89 2015/03/25 13:40:57 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.90 2015/06/17 22:12:55 blueness Exp $ + +*monkeyd-1.5.6-r1 (17 Jun 2015) + + 17 Jun 2015; Anthony G. Basile <blueness@gentoo.org> +monkeyd-1.5.6-r1.ebuild, + -monkeyd-1.5.6.ebuild: + Remove require_php_cgi. Fix bug #549974. 25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> monkeyd-1.5.5.ebuild: Stable for x86, wrt bug #541974 diff --git a/www-servers/monkeyd/monkeyd-1.5.6.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild index 190d23909ddd..ed9c25f2a8c5 100644 --- a/www-servers/monkeyd/monkeyd-1.5.6.ebuild +++ b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6.ebuild,v 1.1 2015/03/03 11:18:50 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild,v 1.1 2015/06/17 22:12:55 blueness Exp $ EAPI="5" @@ -21,18 +21,20 @@ IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth m # 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="elibc_uclibc? ( !debug )" +REQUIRED_USE=" + elibc_uclibc? ( !debug ) + cgi? ( php )" DEPEND="jemalloc? ( >=dev-libs/jemalloc-3.3.1 )" -RDEPEND="php? ( dev-lang/php )" +RDEPEND=" + php? ( dev-lang/php ) + cgi? ( dev-lang/php[cgi] )" 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" @@ -106,6 +108,7 @@ src_configure() { --logdir=/var/log/${PN} \ --mandir=/usr/share/man \ --libdir=/usr/$(get_libdir) \ + --pidfile=/var/run/monkey.pid \ --plugdir=/usr/$(get_libdir)/monkeyd/plugins \ --sysconfdir=/etc/${PN} \ --platform="generic" \ |