gentoo auto-resync : 28:02:2024 - 05:40:38

5 files changed, 104 insertions, 41 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 86ab99d5e40b..2319f6cd06f5 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 71dcd09b14c4..c82226646b92 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,8 +1,8 @@
 AUX nginx-unit.confd 510 BLAKE2B 03cb328cbeef1baa1cf1590b11e8019efae98729ffd44fdbd278c2e48a99333d40a86ee7f8ccd1d986fa38276b7397e6622f926a6b22a07b39c8d600cdcdf93a SHA512 54e1e77ba3c2bf63e7da0d3c47d842ff5a702a33e97217534cf73688f4809947702660ad438b5126a529c2f834761ac85965aac4e8def24e478e16b69e6637ac
-AUX nginx-unit.initd 291 BLAKE2B e0d8b4bbdd9d57214551f4257b95271210a942fed747797f102b7932323b9bcbe871d9fd7cd0e8dee81eca2b41f21d5118a7f4f31c3fe6cbe18c1df09b164be0 SHA512 1212b49a56e4318476d051f8a3a82c6bb65f55adadd2dc51e3e91100823f6bdd8f82f162041db92fbc4f1a777cdafd22c32efce121a57f5d6eb3f5883da1abaa
-AUX nginx-unit.initd-r1 799 BLAKE2B 867b159e37a0e4f7aaad472ce3eeeb1f19814f15969d4fda6a65bda119df05491f9e9cee20cba191b51dab901a332cc2ab95bb4048589db8b0966736ebcd0d22 SHA512 1494cdfe368a32ba47c34730784c66a6cc408418a4d55012713c48f5a78abe31117f0651a5d5952e3b6ea17371232a08465189dffd4b35cda19a329ba5a43de2
 AUX nginx-unit.initd-r2 808 BLAKE2B efb9c3f33c5fd3070333ddb224ff0bcd4e7f8e1147b426193a006f3b880f547d168179199d8cbedcec2f0a0a517650c5ceeccf812170a9f85eef896f2940dab2 SHA512 408e7e73b74ce9371e78f2113617b4627b430b19ccb2881d310aa9a33b7e1fc7a30051e558fb524af42bcbed7a76da4a494b0b931839d614e83b9ffa0a3ea0b6
 AUX nginx-unit.service 237 BLAKE2B 7e8b373372b7908bee80f4a57718a6b9ef7fd99872057006377284fb3bda088a0b6720b0246e5a27b6853d6351244432482f12afe5758b0f36dbdd1c04cce118 SHA512 fdf7ec12f58064c9a9fbd431fc4f56699563ff6bbf8124195810ca7a2e0ed813dbfdc41e6e1455b12960bd8d96fcf0eb2b632243d71d6a3b74d93a263c11596d
 DIST nginx-unit-1.31.1.tar.gz 907165 BLAKE2B 3df7258754761922dceeb66f369faec465bb2f497b692f706c6f22adb21ddf397b2aa2fee758fc89163c30517edf9cb28803193cd53bb9292573a5b21d396dc4 SHA512 28e5f1e88b9e5e21c5094f901227e193137c120e4af3f2950e113d118a301cabb17abf9f0fea8fc8893f36f6e9ae09f86bbf7a323999da34e71e42615937c57c
+DIST nginx-unit-1.32.0.tar.gz 937300 BLAKE2B e603e76ed1d5838eed60675d922bc60a5c6d2bdb34eb98a2198a161c1743efc55c8f4249f4d734d1356089fc14c494d686b043ccedbd5c80b0a1a74d3bb03483 SHA512 52b1c8d6d07db927a4836e854a1372f27230b03ddb09bc8203c4c8433e8391e4bf35d62de3f37e91cde3680d19c183e3f871d5e22fba20343548946b44be466c
 EBUILD nginx-unit-1.31.1.ebuild 2297 BLAKE2B 1bfa5f145667ebebfa2e1ed8c79ff858d8ce39e1e7506f8804de84d1e92011f26a5195c14cd5f3fbdec16a89b2c01130818213b8b4f53f35cf0e9ec66ad4a525 SHA512 cdcdd5074aca20b6cefb900241b667f007ab716d9f2118e22dfdfb1a51da3c9400f2b3f560732f179579c0c997819a5cad4fbb9c98f49bebf82db8d01994ab5d
+EBUILD nginx-unit-1.32.0.ebuild 2299 BLAKE2B 53e10a761f1713d355dd45209b8865970df6a39926455135e024a371a7c941a0481fdc6b7d96bc72aa09479903750b4983a5578d0c4ebbb2137e844e02d5b1bd SHA512 3c389ff3c729110e3aa88fbdb08a916b4062a506677fbc5711c10dfa10da9c245ac97cf4ca2fae89a5582e33c81ca1f3c63d9c4ea1d2926285fe17d2531de661
 MISC metadata.xml 781 BLAKE2B f1ecaa8dee982424963fc9e13bc397a11926e7d10b89a0cec8b3c69b73ff877eac83e479d83dbbdcd4da97af5f664949f99e88c5fd195d13ffb7e9bdb41603d6 SHA512 b721b7b61e9033483dc81fd1cd8b2b836ad132b48089e9ab5c78c56bc8c44a11e8fd672d99cbd4ffd37f37226c0e795da4ee3e14996f972f5c74a50f9aef37ec
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
deleted file mode 100644
index f7bd33af9334..000000000000
--- a/www-servers/nginx-unit/files/nginx-unit.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/unitd"
-pidfile="/run/nginx-unit.pid"
-
-depend() {
-	use dns logger netmount
-}
-
-start_pre() {
-	checkpath -d /var/lib/nginx-unit -o root:root -m 0770
-}
diff --git a/www-servers/nginx-unit/files/nginx-unit.initd-r1 b/www-servers/nginx-unit/files/nginx-unit.initd-r1
deleted file mode 100644
index 32ef624d2103..000000000000
--- a/www-servers/nginx-unit/files/nginx-unit.initd-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/unitd"
-pidfile="/run/nginx-unit.pid"
-NXT_USER=${NXT_USER:-nginx-unit}
-NXT_GROUP=${NXT_GROUP:-nginx-unit}
-NXT_CONTROL=${NXT_CONTROL:-unix:/run/nginx-unit.sock}
-NXT_PID=${NXT_PID:-/run/nginx-unit.pid}
-NXT_LOG=${NXT_LOG:-/var/log/nginx-unit}
-NXT_MODULES=${NXT_MODULES:-/usr/lib64/nginx-unit}
-NXT_STATE=${NXT_STATE:-/var/lib/nginx-unit}
-NXT_TMP=${NXT_TMP:-/usr/tmp}
-
-command_args=" --user ${NXT_USER} --group ${NXT_GROUP} --control ${NXT_CONTROL} --pid ${NXT_PID} --log ${NXT_LOG} --modules ${NXT_MODULES} --state ${NXT_STATE} --tmp ${NXT_TMP}"
-
-depend() {
-	use dns logger netmount
-}
-
-start_pre() {
-    checkpath -d /var/lib/nginx-unit -o root:root -m 0770
-}
-
diff --git a/www-servers/nginx-unit/nginx-unit-1.32.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.32.0.ebuild
new file mode 100644
index 000000000000..8b4973c6dc33
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.32.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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-1 php8-2"
+IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	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=/usr/$(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
+}