[gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/files/, www-servers/nginx-unit/

[Mike Pagano]

commit:     e204f7e05cd1e8c7e5807ac54ad89027924a9d8a
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 14:27:37 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 14:27:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e204f7e0

www-servers/nginx-unit: Version bump, eapi bump, fix bugs

Add version 1.25.0
Add systemd unit file
EAPI 8 bump
Fix openrc init.d file

Closes: https://bugs.gentoo.org/811744
Closes: https://bugs.gentoo.org/811747
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 www-servers/nginx-unit/Manifest                 |  1 +
 www-servers/nginx-unit/files/nginx-unit.initd   |  4 +-
 www-servers/nginx-unit/files/nginx-unit.service | 13 ++++
 www-servers/nginx-unit/nginx-unit-1.25.0.ebuild | 87 +++++++++++++++++++++++++
 4 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 45a5a8c9ad6..3cbd0b9367b 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1 +1,2 @@
 DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
+DIST nginx-unit-1.25.0.tar.gz 853280 BLAKE2B 7aa33e687ba754ebaaca4a0076df3f1cc05e83213de1b64cf28718bf53b9085a26a78c036f4e98308cabec0026ce2b4e91718dfb9d8d83fdad779a587e1c1d71 SHA512 fc001ab21c5aa6c07b092f7b1f44be3b88636f9e2059c8bc4049a06d863daae1bbfa2531a4a24bdd5976250d7a0e260dcf0dbb0dec63efcc008b5398c6bb4bbd

diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
index 41165a659d9..f7bd33af933 100644
--- a/www-servers/nginx-unit/files/nginx-unit.initd
+++ b/www-servers/nginx-unit/files/nginx-unit.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/unitd"
@@ -10,5 +10,5 @@ depend() {
 }
 
 start_pre() {
-	checkpath -d /var/lib/nginx-unit -o root:root 0770
+	checkpath -d /var/lib/nginx-unit -o root:root -m 0770
 }

diff --git a/www-servers/nginx-unit/files/nginx-unit.service b/www-servers/nginx-unit/files/nginx-unit.service
new file mode 100644
index 00000000000..e77bb8a38d6
--- /dev/null
+++ b/www-servers/nginx-unit/files/nginx-unit.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=NGINX Unit
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Type=forking
+PIDFile=/run/nginx-unit.pid
+ExecStart=/usr/sbin/unitd
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target

diff --git a/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
new file mode 100644
index 00000000000..5a6de36e3bf
--- /dev/null
+++ b/www-servers/nginx-unit/nginx-unit-1.25.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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-3 php7-4"
+IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+REQUIRED_USE="|| ( ${IUSE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="perl? ( dev-lang/perl:= )
+	php7-3? ( dev-lang/php:7.3[embed] )
+	php7-4? ( dev-lang/php:7.4[embed] )
+	python? ( ${PYTHON_DEPS} )
+	ruby? (
+		dev-lang/ruby:*
+		dev-ruby/rubygems:*
+	)
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+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}
+	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+}