gentoo auto-resync : 03:09:2023 - 22:19:46

6 files changed, 2 insertions, 307 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 5dcdd3b06743..19545d6008a5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 26782da7d326..7b33c573735f 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -4,11 +4,7 @@ AUX nginx-unit.initd-r1 799 BLAKE2B 867b159e37a0e4f7aaad472ce3eeeb1f19814f15969d
 AUX nginx-unit.initd-r2 808 BLAKE2B efb9c3f33c5fd3070333ddb224ff0bcd4e7f8e1147b426193a006f3b880f547d168179199d8cbedcec2f0a0a517650c5ceeccf812170a9f85eef896f2940dab2 SHA512 408e7e73b74ce9371e78f2113617b4627b430b19ccb2881d310aa9a33b7e1fc7a30051e558fb524af42bcbed7a76da4a494b0b931839d614e83b9ffa0a3ea0b6
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.29.1.tar.gz 906654 BLAKE2B 1068a1002b05f6f9f28b19745e3c1c0f1d1def89fad8489174fd7b38ddd8c9678f27a3b105f98a17d537621cdd2cbedf9f39b4c284a7918d290287f3c324fa49 SHA512 c99cea78804ead999e62777132fe204e0f87e1b58e55b0b4a074ab8d203149c14c8faef64872a44404f8fca5bfd98d2f9e4aae2db89bebeee15f27cabbc9f247
-DIST nginx-unit-1.30.0.tar.gz 894843 BLAKE2B 7582887cf916d6bce45858f933a191121f8c9e7eb29d0df086ca48c6b87bd44ad650ac14e747587718a60fc39ba55c35e3469c91869c36f7e07f0db2c2840c39 SHA512 cee27016c5445eb44d144a491c6ec36445e45492c09775ec62613dd260e36a9a2d387088e3ae814082d1782dbcefca105e884ebd21dea94288a03062c945139d
 DIST nginx-unit-1.31.0.tar.gz 905152 BLAKE2B 4b3b89318706c584fc2b80599c00bb104c1d70c14f8730b3f1142ae1b30db4cdd6516958eb0daf90031df953c0654af71a0f453a0c0c1f345241b215c207963b SHA512 ce367c81dc96b4a8d280a3e34ff8bbf1941a595c5570f9e50ffa49e1f8ac3c2e0a620be5a994a1c4c65aee7790ca227fddafba1c461fccdced83fd4c08c091e6
-EBUILD nginx-unit-1.29.1-r1.ebuild 2172 BLAKE2B 25d0ce1c6b4748d06874288324292e7524f7b3c44942e7462c703de4e2bd6318c0c08342808ac8f1f1f48e5a81795c5a7f69163264308470d7f5776f54b95554 SHA512 3a64c9e2b0455f522829d1d501cfda385b7ed0eb0aed69515df6aa03a972cb544395caf5f95a1c6e294c036e0df8df04a1480d5b3afe37b4b88a01e50f91a6b1
 EBUILD nginx-unit-1.29.1.ebuild 2215 BLAKE2B fc5db358d12ec328a969e6b0260e3fc89b4792abb0c689661f1bbbdd52ca2c6c2733ce17499803b6e153ae432d1d3a62212ded0c6c4b47ee7fb7de8a386c5a44 SHA512 70e49718e8b243146a01e4461d4e9e95d57f13f4fa577e6370dab4d176f2134dc353a75dfb79a2db6e8dce1a6a856443af1b8e1cd6e902a1b82bedb0dbdfa0e5
-EBUILD nginx-unit-1.30.0-r1.ebuild 2337 BLAKE2B df357a6d0e9754f93a076dedd26d82fa6c10386665061e68402b5411f913105cb6ddaf0293bc18474c17f59133f21607c3a8cd3c6ba45018452c0fbeb3fec84f SHA512 5e4714a8efb3ae375e1e75530cd13677d6693051a622c421291b79acf3474738e377b620a429e27257ce17d7ef9d5749b9e76be39fbb3ed72bdcd10b0376b90a
-EBUILD nginx-unit-1.30.0.ebuild 2381 BLAKE2B 66c575a4d5ebb4131560ae95c78f095d1d3029d4388f57dd821d5cec489a552ccf29235c6a747896694ceba83ab11b8a9a9598fd691a4be0c230235cd64d5455 SHA512 44a00b96782952722ea01d79b952a9bc8102f5e6bf1b981c2daf6970169e2e21b16d9ec6dac17de5393c6ed74d053189600fcf7e344aed47ef283d7d496591ba
-EBUILD nginx-unit-1.31.0.ebuild 2337 BLAKE2B df357a6d0e9754f93a076dedd26d82fa6c10386665061e68402b5411f913105cb6ddaf0293bc18474c17f59133f21607c3a8cd3c6ba45018452c0fbeb3fec84f SHA512 5e4714a8efb3ae375e1e75530cd13677d6693051a622c421291b79acf3474738e377b620a429e27257ce17d7ef9d5749b9e76be39fbb3ed72bdcd10b0376b90a
+EBUILD nginx-unit-1.31.0.ebuild 2342 BLAKE2B 9427db46ce7ba25ff0abc78ec662e21aab88d0d39054bbf086ed27df4f8ae293d0a4001e1d5df94e78a23b1988392efa01ddfca0eafa95c0c0cae629d210351e SHA512 19123fb0ee7a0f3706c62043969f28a11e1a0d1b6f51d913efc1442c21ec418829770407ad26a07279ab6e0a0f7fcf36210bc7042ffcc1fc76bd6dfddb593006
 MISC metadata.xml 879 BLAKE2B 00418e215986951cc2d3cc3cc70c38fd4f1d207ab1d51462bdebb4b896972257c2013c5faff206b889930632b03f8bd8ae606ac8e45c2c2ee438ff419b5fe8f7 SHA512 f45dc3c960be09fb09a69e36b63ff5fecff3f1937098a365b077f61db3533efa63fe5500a3c365aca55842bdf383e8c84e3e8b135b6feb8aff6d691e3ab810ad
diff --git a/www-servers/nginx-unit/nginx-unit-1.29.1-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.29.1-r1.ebuild
deleted file mode 100644
index af289a79a2ce..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.29.1-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic python-single-r1 systemd toolchain-funcs
-
-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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php8-0 php8-1 "
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php8-0? ( dev-lang/php:8.0[embed] )
-	php8-1? ( dev-lang/php:8.1[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	ssl? ( dev-libs/openssl:0= )
-	virtual/libcrypt:0="
-RDEPEND="${DEPEND}
-	acct-user/nginx-unit
-	acct-group/nginx-unit"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-	default
-}
-
-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}
-		--user=${PN}
-		--group=${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-r1" ${PN}
-	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.30.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.30.0-r1.ebuild
deleted file mode 100644
index ed9744731336..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.30.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic python-single-r1 systemd toolchain-funcs
-
-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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php8-0 php8-1 php8-2"
-IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php8-0? ( dev-lang/php:8.0[embed] )
-	php8-1? ( dev-lang/php:8.1[embed] )
-	php8-2? ( dev-lang/php:8.2[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	ssl? ( dev-libs/openssl:0= )
-	virtual/libcrypt:0="
-RDEPEND="${DEPEND}
-	acct-user/nginx-unit
-	acct-group/nginx-unit"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-	default
-}
-
-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}
-		--user=${PN}
-		--group=${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
-
-	if use perl ; then
-		echo "1"
-		echo "D is ${D}"
-		emake DESTDIR="${D}/" perl-install
-	fi
-
-	rm -rf "${ED}"/usr/var
-
-	diropts -m 0770
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
deleted file mode 100644
index 576f5179c69f..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic python-single-r1 systemd toolchain-funcs
-
-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"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php7-4 php8-0 php8-1 php8-2"
-IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php7-4? ( dev-lang/php:7.4[embed] )
-	php8-0? ( dev-lang/php:8.0[embed] )
-	php8-1? ( dev-lang/php:8.1[embed] )
-	php8-2? ( dev-lang/php:8.2[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:=
-		dev-ruby/rubygems:=
-	)
-	ssl? ( dev-libs/openssl:0= )
-	virtual/libcrypt:0="
-RDEPEND="${DEPEND}
-	acct-user/nginx-unit
-	acct-group/nginx-unit"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-	default
-}
-
-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}
-		--user=${PN}
-		--group=${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
-
-	if use perl ; then
-		echo "1"
-		echo "D is ${D}"
-		emake DESTDIR="${D}/" perl-install
-	fi
-
-	rm -rf "${ED}"/usr/var
-
-	diropts -m 0770
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}"/nginx-unit.confd nginx-unit
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
index ed9744731336..8873b5665a10 100644
--- a/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.31.0.ebuild
@@ -51,7 +51,7 @@ src_configure() {
 	local opt=(
 		--control=unix:/run/${PN}.sock
 		--log=/var/log/${PN}
-		--modules=$(get_libdir)/${PN}
+		--modules=/usr/$(get_libdir)/${PN}
 		--pid=/run/${PN}.pid
 		--prefix=/usr
 		--state=/var/lib/${PN}