Remove require_php_cgi. Fix bug #549974.

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

3 files changed, 30 insertions, 21 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/Manifest b/www-servers/monkeyd/Manifest
index ad925186e10d..17af61c7fd0d 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -10,23 +10,23 @@ DIST monkey-1.5.5.tar.gz 898602 SHA256 5a0554fdb4d8746f5eb665f305bd120c8f2bef3e7
 DIST monkey-1.5.6.tar.gz 902636 SHA256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 SHA512 4c7c627cb047252252b22da5fba179a21fb5b8dc6280b96307af52757ad049d24b0daaaea51dca4f0429af5e6499c239f6b62a03654cc9e7ad98ae8f5149b64c WHIRLPOOL aba1a928023fc67224f254182eb9707c6594c7092d9ff98ecfa297c91d5c61f79235e7467192b5d46ac114ae67a3cee98e06704721348a40ee825755ab39d9a1
 EBUILD monkeyd-1.5.3.ebuild 4661 SHA256 9fcb34841425f8090cbd51c7fca4a4dc92a222a4da1ef585584252b0c8e2866f SHA512 10c4663cd34c9a8390be1386312a79599df6c9b93305e2c39e6a8e3c4d14c34476a72980612666f1e86ea7ecc6067a52359649894688c0dcb8673679c8807a77 WHIRLPOOL f89391785fb32d11a4c506ca40ca53b6aa1150477e5e5aa7dea70688200abf0ffe8d63b5021a1c22778b1fff372da614d1d95e44037e538a63ce8814eab16523
 EBUILD monkeyd-1.5.5.ebuild 4656 SHA256 b8b9828e2d1dd39723be9b19a58b37923de8fb274b257b422dfe3b8eb0ba8f73 SHA512 9598701e95868c92536b24e52badaa1873d11b20984ca0c202a6ff90c0f6e60c30104fae119dc978c2c1256247b973bdfe158bd770649bb43b04072bea84b568 WHIRLPOOL f80a50befa84f3a998daa8b8f962c134e43e90050e94b48d377e2498c26a0030bc23779aed7d347eca020a8002f8cc22089b2f844da988a1fe30ba5624a41ac4
-EBUILD monkeyd-1.5.6.ebuild 4666 SHA256 377feab7daf5418d845bda2eb8c5eb158f49dcfc472398cfe5986f1b2f8e32cf SHA512 c0971edbfd4d594dc4746339104b226337034663c401fb779ca5904277e935457a04f07ca5fffa08aeb45d64f75fb2c6c05894c710ae6779f7a6004bf6e092be WHIRLPOOL 4da716d55e3ecea9ab74ff6c4b2a4dfe987ae34ec0f056e637e62fd87b68c128f4816b3ce3d7801a97345cdce59d3cff26b14ec245a2ab1739ac0a96456e6a8f
-MISC ChangeLog 14030 SHA256 f971aada95f4facac234aa3b60c740838e70e26c90ae0c088a1a3d8f283dac71 SHA512 03f9f3dfd2014320e5b7547ec64e211b6912bf9a17f6a0377c74bc36bb074376d52714f62e96d51b8155a35695cc38141a52a69ff5fa3aca31eac995c383e70d WHIRLPOOL 09e1119bc548b3ceaf8a79a657b92b16adfbfbfcaa5f5051aae24d472020b890c8b79a30e9b9bd6da7f9f0a0e23aa1c355bc814351d0694fa8e5f4791994b37a
+EBUILD monkeyd-1.5.6-r1.ebuild 4720 SHA256 9aec5c2963e5fa33438414199bcbfd90a3e79a94d59148d5797c95a6ccb8bd0b SHA512 439aaaa8be42783204a910667dd4e426fd6a1d5959d4d91c2f7f1f37ff5d8c1075f0c261ae5e766e3cec1c6c0e31a8126658023c553cb9f89acc9c1f555ac0ef WHIRLPOOL dff3f3b47bdef1c01b5760e0ef367c51d9ef51a8b5d873c05398a526be92d2a0fc47ced87e4474d0cd6e96f98774d93913c84e40929a94b9212358ef47af1edb
+MISC ChangeLog 14219 SHA256 371d5325488f59feeb7b4b19963195c37f6c102ac904907606df47bb67f923bb SHA512 f6ccda6ae7e4fffa0725dcb01091c27a5e2a11722f6bea4d260a2499392992dba4b4ae2b308abd7a2a41f2cef81f128ce9967c022d25e64d71e0fb8770ff1846 WHIRLPOOL 994423b0709fae72c46dbb27684db248cdaf51cbbff7f19c43c19942c4ed3afdb0aabad24961eeb848aa7ab7163c7c6d8e392663fc3e6fdbda497badca803b54
 MISC metadata.xml 454 SHA256 c916dc93db8fabd28ce958c782df8a2b37765a52897e25a4d4a32a183da4a52e SHA512 c88500a432b7753b4630a35c37970f5c98e83812c3bbb29e87abad4bf6d965275e57374520e02f8c7028be34cbdc9c0f94b585de40bebff4bd9eb5826da22c55 WHIRLPOOL 29177e52eef3ed11c150c468000ec0a492a89a549ac06a7e4c9dc5276df7fa791c94e0ef978182d57842b5c5359a9911189b861a89e2ed8b95a89da34dc8e06f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVErrqAAoJELp701BxlEWfUj4P/Ran2tThI2p4fV6e5tqCxGNN
-ugKun2q79HKP6d8vTlKzeewJ5HR3VfLF1l0aIZb3D4Uc2kK9GdTKM+3r0N88LRxL
-mo2PGBlJWfVe8c2uDzliWvDvMubeb/W+fU9Chq7yd3tEkacfvgK1AHCrZfmHsq6z
-XOWvZDwKn2WK2jCcNGFtEXl7+UKv4IXF2pkPMdbVwANe3sCqyNO59e1zN1InqNEA
-4G+9PRqcVS7BmPjNGvJ3b3c624h8Q+upT+2VuzAGUSl8cJhprK1ROSFUu3wT9LuD
-g++82S2o0prOpD3Ghh4lBKqi4GB04DUB0Qym6+N8Edyv6QMicmRYj/8SCzAb3EvP
-0kyZ1DW1T+dSsvvFZ3rGqRfjpnW80oG0XkLDhZvtfsrTJfqcO9GnFgfUwFl/GCv6
-OuNTSr4ra+olUZgHat2SaCS7xCY0IryM7Wq4mZ+ZRiaX0XZEu93+Fuym49Vd/H4z
-T6fJeaxY2HaiYAG09iqIJf7yc1xYL12fBitwjDV0wAV4H+takWWmXDjMHbCrPLsr
-fjv+yMh/TRvTsTtx8F6O4VfDf7tpBt6hObxAhBlLt0yccZBZ+mZtLp9B3V/qNtjs
-lspUYg4qcRpZkCoEkOl/fiYVEE+zI9W1P51wFXsK7dKHq9MZZYGi9+avjjOpQ58M
-+QZqPr6IDYY66LCESs7H
-=ZQP5
+iQIcBAEBCAAGBQJVgfFZAAoJEJOE+m71LUu61UUQAK8K5aBiq9BxINxZPX/FkOPe
+HDbn4Wg/IZ97AbKr2gtNcMTYrWayLDv/METjd0EfFDcqibwDY4hq8LmJxdv5Ur5L
+q3NtRCH1reOt9ahDQVvfP3ONYVRkBd+/zlMQExm4kSALJK0hKuKHzCV0K0zQ4MVI
+05xrafVcOzPmSn93TYwZZWF7xQXp+fIo5ZUXnCXT1XFZ+u869Tp+Laqkn58nlNcl
+rHoVwZQoJ8azyaFrDKuVlHj+vJKWuPUUalCOwdLKiF/hzcBSkzY5+n3sMoAAZpi/
+2iWnVLdk8g0R/RG4pYSgYLRQX3E8a4DtHm3/5UwvpFQ6jo8r/EyfjTooKJ+FNags
+t6GEgR13QqZBCR2MHk2BCLVxjRACnqiLIb1XeMpkjFz0j408vE7K63eOydNh4ByR
+m7ztEymUKIC7mDAXcIXBCmBTzD/I1PJ8JNM/QQbP27/HdJrQmsT1S4P/1jzhLN+F
+i7RKRoVIa9OPca7GCWduh5TTBaxOvAfpSCd35sygwWit+55kySQ1jBw+01kD/CYB
+N0Z0Pkb8IUSQ/Wq4bVAEoBqcq/ILJDwj6bWcrSkYubArGDpLlXZo123VvFHIloLR
+Ev7uPRZRqwLG1yEIitnh2Onqgp7xCAiGRQViAHMfy5gKHZKFgVW7vRrcCjErSxDU
+wPyHQUEvKSdZWjvMCX2H
+=T422
 -----END PGP SIGNATURE-----
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" \