gentoo resync : 10.02.2020

7 files changed, 91 insertions, 9 deletions

diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index e18323660704..de641ab08164 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,9 +4,11 @@ AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0
 DIST nginx-unit-1.12.0.tar.gz 681661 BLAKE2B 1e497172a37fdcd33d0ced5b97675bff42f4cadab2f9363316e667c90c8b4dc4b43f4b8d5cff9f547daa7e92d532550434907515134a5c958586f1822beea749 SHA512 a55a084ed6e1cd3f784bd81571772ca29ca9a0d19089c9bb74c88258d2e1ef872978219c47b6dc2610711ae1aa95ef68ddb77f45747a2eacdd9d92c6f8fee28b
 DIST nginx-unit-1.13.0.tar.gz 693159 BLAKE2B fd2e803188e66c16d5956f26e693c81273b1f3f69c9b68209f15bca6abd0e06b9fb9e03eb32ab640b8f601260b439abee1c4aa9cd03ed92fd26ab55893a6a6ab SHA512 cf33295604040963545b04f72f1a894431d4ee22a2c7b9560f18a694f110ee3bf243c90f65cfa4760a0009a5a7b132b75e1bb51439b19255e15148e8f4e9b9a7
 DIST nginx-unit-1.14.0.tar.gz 708603 BLAKE2B 482ab76a1eaef2943c0000c6dd2adf37aca285304b306e5b05d67e9cca30665269d11c1a585bd1a638d6811b8ee6370ef3cf682bebaf7165585cdaea51f3a5c8 SHA512 0cfe5364d427ff09d08c3b1b134827665f8bf70b8871f3c4506680e4c2d61249a53581122c42276b590f5eb077c398ae6a6c2fa46f24c680844b7d365f2ca66b
+DIST nginx-unit-1.15.0.tar.gz 712284 BLAKE2B 8db45644a22a4043de660ed0dcb94957e6e9f26ee1735a0a053128b0995cfb670d9c52d7d64ffa2292818cc7aed79071fdd753186f010e1bd0fae876f886adff SHA512 3be17ba5290d323283e962a3a5b9c244c3c45302848b62fdad2fd92129e330c8783b4f76273dedc7b010ed71bd6a4bf1cc4085a3425288b1e28dc532e1a1bf5a
 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.12.0-r3.ebuild 1973 BLAKE2B a3ac6f3aef30bd5a98b699311ed18b6325293f03bb30de27383db38723067ceae761ac05f2aedc324b5de4abf168f04d4b7444389706464063c4a473116d2d9b SHA512 be3f40d89854b316d43bd02e5fde82b69208c4dc158500a9a17e93fd157d436efaa57acdba3927104b483f13072d26727a85200a449038587ffc441ed23a2aec
-EBUILD nginx-unit-1.13.0.ebuild 1990 BLAKE2B f368b63276011c4e8568b79a0a2aa80dacf9f3f8f9a26f7c5a9ad919d9d3d5bfd93cbb15ffee35d1a05810133b61012d72fdd03ca3a1df72cc147a07876278ff SHA512 6225d705c2ff0da9cc98794f6657b30ed7bdc3baeb2d1078253f178745fdca572fbfc0cb4f1c4d1b43461e4f8a42e94e87b5c5729788bf6fb8a322cab901ef62
-EBUILD nginx-unit-1.14.0.ebuild 1992 BLAKE2B 177f5ad5f9c84274e1b65066b122dee3a66dbef7ff710f2103d10b8281d5afaa9ac4cca199f5b662c67ef534b1709080db1b890a50fe6ee278ac3f8ef30dd87c SHA512 5c4e2d7d76f2dc31d4a722c4b2ef2e55f70aabb297425b71832cc4fa0368ea881ca4854ef73ae4004733c5b4f9bb955e138def95726f576dbdb502440cec12e4
-EBUILD nginx-unit-1.8.0.ebuild 1700 BLAKE2B ec23607b482f1dcc5fa7dbba7364fc4cab62fe111f4afd1ba8d8600408d30020647174af79402c66ca1d0b56890c98980eeb12473b6e03660ed484362a1d3823 SHA512 5b1dcf2fec7071d9a99f0772748a31330612ad83ab5f2adba32c8d76b7aae0cac6d0f384d7d265ea902420092d6a3756679d58220a087f08fc58c2b96c9982a5
-MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
+EBUILD nginx-unit-1.12.0-r3.ebuild 1963 BLAKE2B afda4ef0d65e3ec12fd77350be7b2384dd39bc575310bad5632fe65e340bf424655737755b2e346cb38a7070a48276052050c493def70a3e8e46375bd1e04c94 SHA512 524682cf26343e769b478873fff40db5f38808a9679684f5484f306b6282840feca54fcfc1fd55c79c753626f3a710667e014850ba24e56358b53c9d7ee0d9d0
+EBUILD nginx-unit-1.13.0.ebuild 1980 BLAKE2B d66c20e69d49ae7b58cd8106d59cb1e84763ee99fcb9de4b7b10449d96c857f3117576b93bcaa262516d1134f6611bb1c11c08f2a6a0d103206fa1079f01158e SHA512 59f9c42a423c925089301b0176a3c1f4554c9e7a61b3beba2689d24d7945923a69dfefb95c97467e308681853eb227859822e22db66922c029451b8eb2f1ef2a
+EBUILD nginx-unit-1.14.0.ebuild 1982 BLAKE2B 1673391165bd459f87864810aa9688c5727c00f7817a4cd46d0f3027e0d8ed9e96db733bdf42f8995dd006a1388af40d9d48a351ec5ff786f4c01b4dce495d82 SHA512 3e1af60d9abe2ad885706cb5cc9a6eaf4912bfb6d2879ccb06adb3358d6bef03996d9d298e99a62bdaf07e390f9c2d3e41b4fe3042edd09bc53d328d548b4da0
+EBUILD nginx-unit-1.15.0.ebuild 1938 BLAKE2B 8f2aa722511d06f54afd5a6d8b2b2d823a6fcf6893907440b981685daf10189b220ae6eca9bde955ab2d014c74ac106c5a8841574bcd6be0235e5b0f061eecf3 SHA512 889e7e38e483dd657bfcb6babd1d6d90542f4b31b799ee93bcf0727f11d2093535a7f699495f56b532f6accb2e0deda1c3c28e514f3cd4338da81f17cd307d66
+EBUILD nginx-unit-1.8.0.ebuild 1690 BLAKE2B 620a1ffa238fc609f2436080140d49e8d4d0387d5a82a28aa683a0c8a29482e786ceb7d4343b35da9f4fb5a0caccabdd4a3baeba34d8d95a32a88be01e269aa7 SHA512 64279e44a4980e33806cabe186c41048631d34c57afbb4ff256a0280800b51197cb758f8b12dc0a856b829b9fdd27565843317fbc4c7f598a805923f12e353fb
+MISC metadata.xml 1047 BLAKE2B 04429a2c4f083e98a753a293b77bec95c6a9eada3b14d8d249e0f0a71788e31f36125f637e5afeb204727f2dabae1cfc359524e7019a71cca7c7c5d5805d61d0 SHA512 1e8b885289895816758f9711145b4d6e69b54f27394434700794d60fa613fa771246909b44987c9e884f11ab1c5b1e1e82053ec733678c1712401cc51e291879
diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
index ae56567e450a..c6f29a250703 100644
--- a/www-servers/nginx-unit/metadata.xml
+++ b/www-servers/nginx-unit/metadata.xml
@@ -21,6 +21,7 @@
 		<flag name="php7-1">Support for PHP 7.1</flag>
 		<flag name="php7-2">Support for PHP 7.2</flag>
 		<flag name="php7-3">Support for PHP 7.3</flag>
+		<flag name="php7-4">Support for PHP 7.4</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">nginx/unit</remote-id>
diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
index fe54f3d5da05..ab4379548ef8 100644
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.12.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
index 7c0a7235ecef..7f3d1031a1e3 100644
--- a/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
index 88b0d284968d..a1506b1539e9 100644
--- a/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.14.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8})
 
 inherit flag-o-matic python-single-r1
 
diff --git a/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
new file mode 100644
index 000000000000..28295fbc991c
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.15.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python3_{6,7,8})
+
+inherit flag-o-matic python-single-r1
+
+MY_P="unit-${PV}"
+DESCRIPTION="Dynamic web and application server"
+HOMEPAGE="https://unit.nginx.org"
+SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+MY_USE="perl python ruby"
+MY_USE_PHP="php7-2 php7-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-2? ( dev-lang/php:7.2[embed] )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( dev-lang/ruby:* )
+	ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply_user
+	sed -i '/^CFLAGS/d' auto/make || die
+}
+
+src_configure() {
+	local opt=(
+		--control=unix:/run/${PN}.sock
+		--log=/var/log/${PN}
+		--modules=$(get_libdir)/${PN}
+		--pid=/run/${PN}.pid
+		--prefix=/usr
+		--state=/var/lib/${PN}
+	)
+	use ssl && opt+=( --openssl )
+	export AR="$(tc-getAR)"
+	export CC="$(tc-getCC)"
+	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
+	# Modules require position-independent code
+	append-cflags $(test-flags-CC -fPIC)
+	for flag in ${MY_USE} ; do
+		if use ${flag} ; then
+			./configure ${flag} || die "Module configuration failed: ${flag}"
+		fi
+	done
+	for flag in ${MY_USE_PHP} ; do
+		if use ${flag} ; then
+			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
+			./configure php \
+				--module=${flag} \
+				--config=${php_slot}/bin/php-config \
+				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
+		fi
+	done
+}
+
+src_install() {
+	default
+	diropts -m 0770
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+}
diff --git a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
index 6a544717ad6b..85232da8eb28 100644
--- a/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python2_7 python3_{6,7})
+PYTHON_COMPAT=(python3_{6,7})
 
 inherit python-single-r1