gentoo resync : 22.10.2018

4 files changed, 13 insertions, 45 deletions

diff --git a/www-servers/spawn-fcgi/Manifest b/www-servers/spawn-fcgi/Manifest
index f63211417c7a..fbd2038141eb 100644
--- a/www-servers/spawn-fcgi/Manifest
+++ b/www-servers/spawn-fcgi/Manifest
@@ -1,9 +1,8 @@
 AUX spawn-fcgi.confd 2238 BLAKE2B 0364383f12b79728830556244485b991f5bf5f7f4595e5500b81330c43b752aca8f3fce53cd08d4f007a69279668c7d212c74ff0682a3e37ae0ec545744836c8 SHA512 0b0d5754de17dd691ead380a93526aa7fbdd432359b248ce06f030daefb1ad96e4a81fe5319557fb66602baccb45a0febf6417ec7b79eee91e1e070d9a852b90
 AUX spawn-fcgi.initd-r1 3090 BLAKE2B c59836f3c67fbf1d3cdd8db0efd923387e7e9f5c2f913cb276b695512cf6ab3f1fc1a9fd14bb654b9b109cbff3ffe31ce75ffb62573f56f2d851fa92d6ab24bf SHA512 e7336da885a19497247648c9b2e04044005285f8b989386d6d5441dbf284ebffa9df062e6e23cd0ae635232abaa2d41ff408b0c913683a6240929c5d1ec8a624
-AUX spawn-fcgi.initd-r2 3082 BLAKE2B 6fa89815bc51816ff5b15859716273b4780225ad3e934416f9e09ad754c2cef07ba7a8d24c55b5232834b9c5290adba5b7da0472f6ca90fa65979c1362bf3873 SHA512 86a82debd752709af3abd6056b31839a87d4dd14e990e5256a97e40b25c2293c113fc672b24ef7f2122b3d7b43de0d3434248240bf56c616ea2cbafcb5c82a29
+AUX spawn-fcgi.initd-r3 3048 BLAKE2B 5b501069acfe3a535f1d73cbb706d05de50ea8562e09a49209da551dc5ba9626ddc0093b76139d4291ce8ac4c3e329be0bbf494c41c6ec137a182b8b35c3c891 SHA512 6c983f9d741f508d12b728d24dc5b57396cbd2272ae71c7127ba95aef70bd1a90b68d2b15e3481dfdbcfa723ca73a92deea61baae64051a83cec0b583c7da1e1
 DIST spawn-fcgi-1.6.3.tar.bz2 77607 BLAKE2B eb6331f2f4ec1270f47ba317dcc60668e5d02dea9ed3a840033febd98443a73194559bcf56ff039131c8bf374108b72c47ccc531b7549bb3dee5f4f111308608 SHA512 136a198cbcda0d3ae4e445eac2ccdcc5483801514ce77542c630d615a7a19a68864b9d7d79733adb16347ba64c833afbf2a18df82937107a6bc8467f630b03b4
 DIST spawn-fcgi-1.6.4.tar.xz 79944 BLAKE2B 06fb92261042fe6bccda1a472a712a7c9bc7f56ee04b72f31ee133079f6c1d07ca07ef6c1b7c878db2e32861ea20914998411a3f6b596e4ba950f8767a899346 SHA512 e2b317997b56f852ad644b80fe36fa08376ae81f93566e181c31a3b6764de2eeb32a2e10e420136d8536487c575678ca52a33f7cb3488aadf7185fbd0196bee0
 EBUILD spawn-fcgi-1.6.3-r1.ebuild 784 BLAKE2B e7bf66cdf6281dbfc877e7953df82b1a39fc6826b3e72aeabb5cccd6cf868f5098b8a6c3bb2ce046d3ef203ff5975d32c2bec1b4da08288f59d368a5b6b84ce2 SHA512 402d57c189dfb2bdf1181f84ddc52cacfe31b663cf56fc80c7dac1a5d41f33e81df242ba752acd3d3822214f9a11ae38b4acd283a4e95f3fa7801d163065087c
-EBUILD spawn-fcgi-1.6.3-r2.ebuild 756 BLAKE2B 1d998dc556659faa637e8acfed73141406f67303bd8960bf900e63a8e5fbc4f1cbd2d763f591764b5d2a5cd9696b1ea44d815066288bcb5abce9df07fe5f526d SHA512 b249896cdf9ae55680803f1b7a91bb08d106e2ea084e529ff9312eb45755d1c0d095121752e13eb95d45e991316a80831d08665c459a83f5537e8f272b089e94
-EBUILD spawn-fcgi-1.6.4.ebuild 755 BLAKE2B 894ee21f39e946bb0fdd400b6b1b216f55cf527b67f2845a5945bc7be89b832a515e2f376652b768643c749a374b659c3c1c572ec4dc0d2b17cf52b3a91f5e9f SHA512 48019e1e463067b5164e2e5557be78217cdf636bffdea8af0fdeeeef5b5231f7a51a7d71f40ae187bcab99c94201a536da92666e466174f1cc558ff30d997525
+EBUILD spawn-fcgi-1.6.4-r1.ebuild 753 BLAKE2B 0a2f3ec9b32d168fedb18954cabad015414c19c6018ab8ac56d7d257f824c7bb6f9c545ad1483d2036d7fba886494a5880e87e25ea0e9948743377088707a277 SHA512 189949b622f7038703eb9554585fa9c7db3de57690000967fc25dc9a6717ee928581916294e9c6ce10f126a87c51d3e48f13cf68c83ae45263e2b8897bd12ca2
 MISC metadata.xml 448 BLAKE2B c5651b029dc5d74e075b0a3ee7eb0b9b1cca540a579ef017faca1363f920fd374277d4e24d25db64d81c5dcea05da91e5d9f3043f98863ca31f38893f67ba041 SHA512 461925b80f58574c97b298aa4b26314e26f40d8874bd3d8e4fc6f9bd1aa7161f9c69cfcc47dd9bd9077b631827e5a6631e0322174fb1387624b7bc3d021e29a2
diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2 b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
index e7941a125a58..ef680aad2776 100644
--- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r2
+++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd-r3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PROGNAME=${SVCNAME#*.}
@@ -60,8 +60,8 @@ start() {
 		OPTIONS="${OPTIONS} -c ${FCGI_CHROOT}"
 	fi
 
-	if [ -n "${FCGI_DIR}" ]; then
-		OPTIONS="${OPTIONS} -d ${FCGI_DIR}"
+	if [ -n "${FCGI_CHDIR}" ]; then
+		OPTIONS="${OPTIONS} -d ${FCGI_CHDIR}"
 	fi
 
 	if [ -n "${FCGI_USER}" ] && [ "${FCGI_USER}" != "root" ]; then
@@ -80,7 +80,7 @@ start() {
 	for i in ${ALLOWED_ENV}; do
 		local j
 		eval j=$(echo \$"$i")
-		[ -n "${j}" ] && E="${E} ${i}=${j}"
+		[ -n "${j}" ] && E="${E} --env ${i}=${j}"
 	done
 
 	ebegin "Starting FastCGI application ${PROGNAME}"
@@ -93,8 +93,8 @@ start() {
 		[ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}"
 		[ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))"
 
-		env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
-			--name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \
+		start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \
+			${E} -- ${SOCKET_OPTION} ${INET_OPTION} \
 			-P ${P} ${OPTIONS} -- ${FCGI_PROGRAM}
 		RETVAL=$?
 
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
deleted file mode 100644
index a19ec429e424..000000000000
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
-HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
-SRC_URI="http://www.lighttpd.net/download/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="ipv6"
-
-DEPEND=""
-RDEPEND="
-	!<=www-servers/lighttpd-1.4.20
-	!<=www-servers/cherokee-0.98.1"
-
-src_configure() {
-	econf $(use_enable ipv6)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
-	newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
-
-	docinto examples
-	dodoc doc/run-generic doc/run-php doc/run-rails
-}
diff --git a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
index 4068e674e390..92e2c3777b59 100644
--- a/www-servers/spawn-fcgi/spawn-fcgi-1.6.4.ebuild
+++ b/www-servers/spawn-fcgi/spawn-fcgi-1.6.4-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A FCGI spawner for lighttpd and cherokee and other webservers"
 HOMEPAGE="http://redmine.lighttpd.net/projects/spawn-fcgi"
@@ -15,7 +15,8 @@ IUSE="ipv6"
 DEPEND=""
 RDEPEND="
 	!<=www-servers/lighttpd-1.4.20
-	!<=www-servers/cherokee-0.98.1"
+	!<=www-servers/cherokee-0.98.1
+"
 
 src_configure() {
 	econf $(use_enable ipv6)
@@ -25,7 +26,7 @@ src_install() {
 	default
 
 	newconfd "${FILESDIR}"/spawn-fcgi.confd spawn-fcgi
-	newinitd "${FILESDIR}"/spawn-fcgi.initd-r2 spawn-fcgi
+	newinitd "${FILESDIR}"/spawn-fcgi.initd-r3 spawn-fcgi
 
 	docinto examples
 	dodoc doc/run-generic doc/run-php doc/run-rails