Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/, www-servers/nginx-unit/files/
Date: Tue, 17 Sep 2019 13:31:54
Message-Id: 1568727103.a45d69a83dc44f0da339a4b964fb551ddcbd85de.mgorny@gentoo
1 commit: a45d69a83dc44f0da339a4b964fb551ddcbd85de
2 Author: Ralph Seichter <github <AT> seichter <DOT> de>
3 AuthorDate: Tue Sep 17 13:24:34 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 17 13:31:43 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45d69a8
7
8 www-servers/nginx-unit: Addressed QA issues
9
10 Closes: https://bugs.gentoo.org/694656
11 Package-Manager: Portage-2.3.69, Repoman-2.3.16
12 Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
13 Closes: https://github.com/gentoo/gentoo/pull/12947
14 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
15
16 www-servers/nginx-unit/Manifest | 1 -
17 www-servers/nginx-unit/files/nginx-unit.initd | 2 +-
18 www-servers/nginx-unit/nginx-unit-1.9.0.ebuild | 67 --------------------------
19 3 files changed, 1 insertion(+), 69 deletions(-)
20
21 diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
22 index fcbfded696a..defa0ceaf85 100644
23 --- a/www-servers/nginx-unit/Manifest
24 +++ b/www-servers/nginx-unit/Manifest
25 @@ -1,3 +1,2 @@
26 DIST nginx-unit-1.10.0.tar.gz 564348 BLAKE2B 82339422b4b3b696ff4bbb216d6c0d54f046531aa56f6e0f5602a9bbe18db878b6bc9c9e9b1513be0cee3197f288549d8a6f826bf69ffbb91fc35757775bde4d SHA512 da2b248ba22e5d46fa1c8c21041a875655fad0e1a09683c58cb5bb33ed0a671a921c7a13f99269f0574da02d0efaeff0233abc901e4e333f3f7ac9383334c781
27 DIST nginx-unit-1.8.0.tar.gz 511226 BLAKE2B e396b27954840a5f1ad3a4cd9501a5e5fe769a754c51043da784a2c4596e6acc33089f495bf412a0db086e5c715a51292c7dece004a6512564421a431b6c339e SHA512 1d0ad05343ff70aff4c6e221a36c20df95fa2e2262ae5c69963a9bcb9ef883151e8a2fa9fef29f43ac5489aa5cbb3e9dfd10cf5e7f6d7a98742b490ebf3a0413
28 -DIST nginx-unit-1.9.0.tar.gz 522420 BLAKE2B 8fabd8a43c8e5b07a8d9db41bb1d9790a6d434a20b762649557bc4e715a00b663416cd9556c9e5fc1894487172c1549de4d5511259876ea6bcd306e258e0ff5f SHA512 25beda88e3e92cace7acfee45a640c351f4e15f20f2aa0f047c3ba61351c6119f270754186f39ab3f1fcc16b1bef9009da4f507d5cdf511538825f2a4c879d62
29
30 diff --git a/www-servers/nginx-unit/files/nginx-unit.initd b/www-servers/nginx-unit/files/nginx-unit.initd
31 old mode 100755
32 new mode 100644
33 index 23720abcc1e..41165a659d9
34 --- a/www-servers/nginx-unit/files/nginx-unit.initd
35 +++ b/www-servers/nginx-unit/files/nginx-unit.initd
36 @@ -1,5 +1,5 @@
37 #!/sbin/openrc-run
38 -# Copyright 1999-2018 Gentoo Foundation
39 +# Copyright 1999-2019 Gentoo Authors
40 # Distributed under the terms of the GNU General Public License v2
41
42 command="/usr/sbin/unitd"
43
44 diff --git a/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild
45 deleted file mode 100644
46 index 3b4b5a06037..00000000000
47 --- a/www-servers/nginx-unit/nginx-unit-1.9.0.ebuild
48 +++ /dev/null
49 @@ -1,67 +0,0 @@
50 -# Copyright 1999-2019 Gentoo Authors
51 -# Distributed under the terms of the GNU General Public License v2
52 -
53 -EAPI=7
54 -
55 -PYTHON_COMPAT=(python2_7 python3_{5,6,7})
56 -
57 -inherit python-single-r1
58 -
59 -MY_P="unit-${PV}"
60 -DESCRIPTION="A dynamic web and application server"
61 -HOMEPAGE="https://unit.nginx.org"
62 -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
63 -
64 -LICENSE="Apache-2.0"
65 -SLOT="0"
66 -KEYWORDS="~amd64"
67 -MY_USE="perl python ruby"
68 -MY_USE_PHP="php5-6 php7-1 php7-2 php7-3"
69 -IUSE="${MY_USE} ${MY_USE_PHP}"
70 -REQUIRED_USE="|| ( ${IUSE} ) python? ( ${PYTHON_REQUIRED_USE} )"
71 -
72 -DEPEND="perl? ( dev-lang/perl:= )
73 - php5-6? ( dev-lang/php:5.6[embed] )
74 - php7-1? ( dev-lang/php:7.1[embed] )
75 - php7-2? ( dev-lang/php:7.2[embed] )
76 - php7-3? ( dev-lang/php:7.3[embed] )
77 - python? ( ${PYTHON_DEPS} )
78 - ruby? ( dev-lang/ruby:= )"
79 -RDEPEND="${DEPEND}"
80 -S="${WORKDIR}/${MY_P}"
81 -
82 -pkg_setup() {
83 - use python && python-single-r1_pkg_setup
84 -}
85 -
86 -src_configure() {
87 - ./configure \
88 - --control=unix:/run/${PN}.sock \
89 - --ld-opt="${LDFLAGS}" \
90 - --log=/var/log/${PN} \
91 - --modules=$(get_libdir)/${PN} \
92 - --pid=/run/${PN}.pid \
93 - --prefix=/usr \
94 - --state=/var/lib/${PN} || die "Core configuration failed"
95 - for flag in ${MY_USE} ; do
96 - if use ${flag} ; then
97 - ./configure ${flag} || die "Module configuration failed: ${flag}"
98 - fi
99 - done
100 - for flag in ${MY_USE_PHP} ; do
101 - if use ${flag} ; then
102 - local php_slot="/usr/$(get_libdir)/${flag/-/.}"
103 - ./configure php \
104 - --module=${flag} \
105 - --config=${php_slot}/bin/php-config \
106 - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
107 - fi
108 - done
109 -}
110 -
111 -src_install() {
112 - default
113 - diropts -m 0770
114 - keepdir /var/lib/${PN}
115 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
116 -}