gentoo resync : 18.11.2019

10 files changed, 7 insertions, 269 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index e100819f156c..a8372edbc705 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index e16d14f866c7..d2dbb5c8cb9a 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -8,5 +8,5 @@ DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1e
 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
 DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335
 EBUILD apache-2.2.34.ebuild 2954 BLAKE2B 3966698a01ff8fbce49ecfbcf33a3abf1f77a0dcf0121acc658f257aa5f312cd34f5d721167aabfcfba984e8eb51e3864f28e64485ee0df43472acc15b18bca8 SHA512 6b046c4dedd1f039348530eb1f83432164cce304b6be7c7fdc8473c2bd0b7f463aece8923a5f7ab0b17ffb7b7d207c529c9aa10637138d4d0f144ad3cf7cb9d8
-EBUILD apache-2.4.41.ebuild 8556 BLAKE2B 47b9c03ff5e300069862e397f372c39036d04b2fe8eb4a3d0124914a947d85ca4178f3272b7a39e632bef79944bd3439c4b0946d35b730fa66a0598c924ac267 SHA512 e08037cbf804a2a5bca91d956f7d08e36f7f6d75d440cb4a411abe10fdb819bbf7b23afa14315a35d1efe1454aa4f728a8d0aca70b2c45bedfaf04236d439a89
+EBUILD apache-2.4.41.ebuild 8583 BLAKE2B bf7ee7af3bbe83fe91e93b6c154eebb6e9ce73e54fdc80566c088cfbd8ad86005acbe89ebddb1da85f755b1491ff14bebc80aa74d8de89a82993ebdd0f11bcc5 SHA512 76558e53631a77d31ef0464234e4f4f8f4b8b2ab6167a73f5d00c2538700ed6b360390bc36098d7d2b6ea8b2661fd66873300c6b0ba62de88f8393157daccbb2
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.41.ebuild b/www-servers/apache/apache-2.4.41.ebuild
index 36acc74b4126..ce8e5e980377 100644
--- a/www-servers/apache/apache-2.4.41.ebuild
+++ b/www-servers/apache/apache-2.4.41.ebuild
@@ -142,7 +142,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 # FIXME: Move to apache-2.eclass once this has reached stable.
 IUSE="${IUSE/apache2_modules_http2/+apache2_modules_http2}"
 # New suexec options (since 2.4.34)
-IUSE="${IUSE} +suexec-caps suexec-syslog"
+IUSE="${IUSE} +suexec-caps suexec-syslog split-usr"
 
 CDEPEND="apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= )
 	apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )
@@ -210,7 +210,7 @@ src_install() {
 	# old location until all ebuilds and eclasses have been modified to
 	# use the new location.
 	dobin support/apxs
-	dosym ../bin/apxs /usr/sbin/apxs
+	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
 
 	# Note: wait for mod_systemd to be included in some forthcoming release,
 	# Then apache2.4.service can be used and systemd support controlled
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index e3e4ee63bf61..9a6635f090e4 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -4,11 +4,8 @@ AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f09
 AUX gatling.initd 1915 BLAKE2B 8f0954d855759b6abe90d6ea823fb2e14bddcc36d45a20bbb731aaeb0a4efa2b3bfdc454d9ae1c127634057a33032dd73086d6f7f8c99678bf79c6bf602bcc19 SHA512 7992a44fc61408eef740bd94fd127240b85a27954c6217b44e7be01a6b95256acc8f61962b661eaeecd6321b958403430aae673b9e88656bb11883b577a3d9a6
 AUX gatling.initd-2 1970 BLAKE2B 6c964b6fba4bf576efbbf659fc027b336fe82ada1f822242fd62964dfb64efb71af4adda687bb406b78234b4a01ac6bd0e419e5a7d638b42c7833515e78b1996 SHA512 916b19712c51564bb38167262de1358289202894b80b948c1d10463c74fea0de9bcddc33a8dd804a08f5a07d1762e0cd21bfe6a404dbfe3fd49138248384dbfc
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
-DIST gatling-0.12.tar.bz2 99540 BLAKE2B 5711c1960d62979397919cceaee1331b71ea516ab0a4e877244c83e24ab8b6aa3978f7646dbf4f54b71e41eb32f7739800748e6a49c80adcaaa1491dd5158cd4 SHA512 50330e92576ce8002acaba9692cb9270ed2d794b1118e697193bd47beadac8ae75a8e2e0b802923172961d74e50cbe114b5e39c083b79a975c0a1bf4c86cab0a
 DIST gatling-0.13.tar.bz2 108128 BLAKE2B a8226bb9c608dd77491e4a922a79c310a40e155afcb28602a0cf279e45919bd86a0e93e58d7f33a3551820de20ae219e7af75bc0402eab27c95ba0530575f4c0 SHA512 b9fa604aa8bb8c5d40d9c3eaaa536ed5e73d0ed93eccb41ca4744316ad893dc6fe92fe2c1f0247de82d4eda63b0ab7ab338355d9963fb58f23d39a2c678a1db8
 DIST gatling-0.15.tar.xz 121804 BLAKE2B 7df5f6d4fc823e8a1252bacca2b57d0848dd3a920216d1d3185d5f471f786eee1eb36396114b367660ead816bd4ee6c734099bbb9bdb5ffbd5b70a59e0fb0667 SHA512 b76d220a0644f1e6e7ea966a4eff409964c564fc4a31c4efdb764e5f7b5857bc58c26bc31e860fe35df932cbd60fb2b0f4f21c75cb5aa56427e8a2a453684716
-EBUILD gatling-0.12-r2.ebuild 1448 BLAKE2B a7c5951e568e9cf12b6c3c0d9780769dbd157e28db8ebc5274becc60ffd118a07c1c2f3405cdb65e39f8baf2ac48872ab2fec2871fee7e117baa6980ce037476 SHA512 d8aa82aeefce975684f99c1df7feea7329979cb57a0f7f214a401d5ee5aa9a09618241ecf37a0bd8a2467ca7a66ab1f7e00decd1f2c4eb3a188bc26bf932e168
 EBUILD gatling-0.13-r1.ebuild 1517 BLAKE2B c07ee1269d3cd89c342309f74977f9b08d0cc8d11967805d49ad49365318019f5be857bf9c8d74d0b68a046f8a77c9d8a3522cc33b6b2605a70c8d4ede3dc993 SHA512 b946510624a7154271a78460e50235a1e7d1f2b3aa897efe3bbb378221adb2de296584f02a6c033794a6af27ddbbd1ec1b015059122aab36bdab248b6e3cced1
-EBUILD gatling-0.13.ebuild 1454 BLAKE2B b00758fbfe346244da9cedf9d723e83cb53c2083dc059c49a1a981110c96dce999f121faa38b96df4a17016338efa4593a26c46493a8cb92c5bf4f8f252e773a SHA512 a23dd560da18fd14702b657b61678b450a09449eb7bed6d1df884271c70bb50118d2325acb7896c2af0651c5e4554da774ab9f94cfd7aacbc7b02617f30d6df9
 EBUILD gatling-0.15.ebuild 1547 BLAKE2B a5e6e2d04fef5bb646debd50ba69d47f7d065cf44a3ba0021efc0f5bcadf056cb03fe1cfcb91b1a38f1e83a357da0c375e4ad198b6a8ea6cb37244fbedd65578 SHA512 409f89a283ac591c3ca06b9140de4e906064de750a76cac70d5abcf632704e23ef72281f3b213b054e43aa019c5f0a9264d21f922144831bf48c1b1b86c16984
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/gatling-0.12-r2.ebuild b/www-servers/gatling/gatling-0.12-r2.ebuild
deleted file mode 100644
index ffa25cc9ce32..000000000000
--- a/www-servers/gatling/gatling-0.12-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="High performance web server"
-HOMEPAGE="http://www.fefe.de/gatling/"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ssl diet"
-REQUIRED_USE="ssl? ( !diet )"
-
-DEPEND=">=dev-libs/libowfat-0.25[diet=]
-	diet? ( dev-libs/dietlibc )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm Makefile  # leaves us with GNUmakefile
-	epatch "${FILESDIR}/${P}-compile.patch"
-}
-
-src_compile() {
-	local DIET=
-	use diet && DIET='/usr/bin/diet'
-
-	local targets='gatling'
-	use ssl && targets+=' tlsgatling'
-
-	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
-}
-
-src_install() {
-	doman gatling.1 || die "installing manpage failed"
-
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
-
-	dobin gatling || die "installing gatling binary failed"
-	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
-	}
-}
-
-pkg_setup() {
-	ebegin "Creating gatling user and group"
-	enewgroup gatling
-	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
-}
diff --git a/www-servers/gatling/gatling-0.13.ebuild b/www-servers/gatling/gatling-0.13.ebuild
deleted file mode 100644
index a3f6ea2f13d6..000000000000
--- a/www-servers/gatling/gatling-0.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="High performance web server"
-HOMEPAGE="http://www.fefe.de/gatling/"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="ssl diet"
-REQUIRED_USE="ssl? ( !diet )"
-
-DEPEND=">=dev-libs/libowfat-0.25[diet=]
-	diet? ( dev-libs/dietlibc )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm Makefile  # leaves us with GNUmakefile
-	epatch "${FILESDIR}/${P}-compile.patch"
-}
-
-src_compile() {
-	local DIET=
-	use diet && DIET='/usr/bin/diet'
-
-	local targets='gatling'
-	use ssl && targets+=' tlsgatling'
-
-	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
-			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
-			|| die "emake ${targets} failed"
-}
-
-src_install() {
-	doman gatling.1 || die "installing manpage failed"
-
-	newconfd "${FILESDIR}/gatling.confd" gatling || die
-	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
-	dodoc README.{ftp,http} || die "installing docs failed"
-
-	dobin gatling || die "installing gatling binary failed"
-	use ssl && {
-		dodoc README.tls || die "installing docs failed"
-		dobin tlsgatling || die "installing tlsgatling binary failed"
-	}
-}
-
-pkg_setup() {
-	ebegin "Creating gatling user and group"
-	enewgroup gatling
-	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
-}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 031c8452ae45..6acd6b2849fa 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -2,10 +2,9 @@ AUX auto-make.patch 368 BLAKE2B ca9b0f4fe616edefb11806a6919835ad215e5b1bf4f0ca67
 AUX auto-os-conf.patch 3777 BLAKE2B 759053595665eea70d7119a31e49d9dc234b7684078781eef234e6cb2a50a401729edc7380cd7ffd64826a900167badb5bf3922c6e395a999ede1e15d2e3a28f SHA512 5e156343aa65e4c08ca3b6f6721d8564dde9ed2903a03165d8c96036cdba6f0bcd813b45a394b8684f9e06281d5a28ea0d161611c470280e639158e63816f319
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
 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.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
-EBUILD nginx-unit-1.12.0-r1.ebuild 1798 BLAKE2B 44e644a1fe2e49d0e1f7049a3335e9d7d93dac0e2f878ce8281ffab27f848937d602cae900dafcbff7b9520b81f5a1c0bd59471b322932bd284045cad90a7eb0 SHA512 7646a7de6402d3c6465cc05d6a4c7352d45f3f334bb444f37ccf613aefdf23c183b8940694cb411be347b6f7cd8726d15a28d4b615d03d9056fd46ee5751eba9
-EBUILD nginx-unit-1.12.0-r2.ebuild 1942 BLAKE2B 27a6b14586e16902f1b199d5b678571fd78b52565c30ea338daf63c0d557980b62bf635e7ff2e8b2a512919925bc4845ab81fbc97758c1922fb0aa9edbccf52a SHA512 4b4a801d88f732dcc29c5f4c59eb66b56c792b353b258bb2179597218f8c74f7ac8ff1a19004ae73f14ef651f2b8d5aaee9651607f3755ce7a01d81e5e494f5f
 EBUILD nginx-unit-1.12.0-r3.ebuild 1975 BLAKE2B 22be98f3faeb9a13450fb6637296c634b6b7e5cb7e9a260a59827eac74c880aa2e0247a54c9d4b87520f160c6c5c5ca59ec8b73ef4fc83f9b4d821841478459f SHA512 3807ca82c3990c975bbd878fc8605988b4843dee59df46fb6aa3a16a4590ff8003e7d19753ce3de889f5c6d35f8109ac227733c404c7cf16c612b08e7a0bccfc
-EBUILD nginx-unit-1.12.0.ebuild 1704 BLAKE2B 89e32ac74a41281be6fd66d069a7ee8068cddbd20cc3c82af9d21a9dacb3a6ce770c39547758e2653bbe82b86110985fde7b71f875437f9ec158b2148b664d00 SHA512 1620db91709ccff3a3ed4e79cdb01616aadc2c9790049cc23ffa45e9c0f54c3f8d0460a8bded8e49d44179592d9db979fa43b473f23d08fd6fa2d905e8289b9e
+EBUILD nginx-unit-1.13.0.ebuild 1992 BLAKE2B 2222bce66f0247847cc4f4b1503293b4797ad797556ade6a7af9d139df6e789286683a8f414833989415a0082a7abcf8fde1eb19905e3236685bb2fff34e794e SHA512 3837253fff7993724b498636ba0f6bb5f6f0f0aac1ccf00c1ce96cbbded47c9b3435bc37a2ec555a42fbbf0c5c6c7134080bcf23a61b70bee2c0ec430de473df
 EBUILD nginx-unit-1.8.0.ebuild 1702 BLAKE2B d1e3ca67f25ffe4f4538acb00a0e5c2ed91c3e56facc2c9e7591d7944f12a070fc3dd839154ee848795756f87dfcc60cadfa6ed2e5396a8abe189569f6ba18b6 SHA512 a09d58603a0d9529ad3684ba3306d0a0f603a3dc8479c6c12e9841f88c2b4f9daf6a261fbf60682b9596d6f7eea9fba5dafa4ccb514ae0667b834c0384ddf5e0
 MISC metadata.xml 998 BLAKE2B 89d0469b5b21967d1526d121fea36c3312a43e0a4c703aea36f451d4ef8cb4926435aca6a8af2d1ba9964498166da7551bcb6a87bb86a24896f08bf1d2016fc4 SHA512 c9e76bb48c5e1297354c25c7bf01cc80a3d0e2d21f130e24df5647987e9ac6747a9f02851070eea3fa948a7bfbb030b12f869f604ab3c63d82f481ee6c7d3ef3
diff --git a/www-servers/nginx-unit/nginx-unit-1.12.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0-r1.ebuild
deleted file mode 100644
index 9554af89ad61..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python2_7 python3_{5,6,7})
-
-inherit 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="php5-6 php7-1 php7-2 php7-3"
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
-	php7-2? ( dev-lang/php:7.2[embed] )
-	php7-3? ( dev-lang/php:7.3[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )
-	ssl? ( dev-libs/openssl:= )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-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 )
-
-	./configure ${opt[@]} --cc-opt="${CFLAGS}" --ld-opt="${LDFLAGS}" || die "Core configuration failed"
-	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.12.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.12.0.ebuild
deleted file mode 100644
index 72e543d89536..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.12.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python2_7 python3_{5,6,7})
-
-inherit python-single-r1
-
-MY_P="unit-${PV}"
-DESCRIPTION="A 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="php5-6 php7-1 php7-2 php7-3"
-IUSE="${MY_USE} ${MY_USE_PHP}"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php5-6? ( dev-lang/php:5.6[embed] )
-	php7-1? ( dev-lang/php:7.1[embed] )
-	php7-2? ( dev-lang/php:7.2[embed] )
-	php7-3? ( dev-lang/php:7.3[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:= )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	./configure \
-		--control=unix:/run/${PN}.sock \
-		--ld-opt="${LDFLAGS}" \
-		--log=/var/log/${PN} \
-		--modules=$(get_libdir)/${PN} \
-		--pid=/run/${PN}.pid \
-		--prefix=/usr \
-		--state=/var/lib/${PN} || die "Core configuration failed"
-	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.12.0-r2.ebuild b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
index 3627ea90fa4c..b398e40980ae 100644
--- a/www-servers/nginx-unit/nginx-unit-1.12.0-r2.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.13.0.ebuild
@@ -51,6 +51,8 @@ src_configure() {
 		--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)