Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/nginx-unit/
Date: Wed, 26 Jan 2022 14:24:43
Message-Id: 1643207072.1b7ac8dff849325da457ab47b6cb80b19929978b.mpagano@gentoo
1 commit: 1b7ac8dff849325da457ab47b6cb80b19929978b
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 26 14:24:32 2022 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 26 14:24:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7ac8df
7
8 www-servers/nginx-unit: Remove old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
12
13 www-servers/nginx-unit/Manifest | 2 -
14 www-servers/nginx-unit/metadata.xml | 1 -
15 www-servers/nginx-unit/nginx-unit-1.22.0-r1.ebuild | 87 ---------------------
16 www-servers/nginx-unit/nginx-unit-1.26.0.ebuild | 89 ----------------------
17 4 files changed, 179 deletions(-)
18
19 diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
20 index 2d11205ebdc0..a19535087daa 100644
21 --- a/www-servers/nginx-unit/Manifest
22 +++ b/www-servers/nginx-unit/Manifest
23 @@ -1,3 +1 @@
24 -DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
25 -DIST nginx-unit-1.26.0.tar.gz 865556 BLAKE2B 8ef2f32364ae9858ec41c21639c2b9514d7aed4d4150d2952634946b0b180f5fee7c4be6e67e3608040d9bc7bd0f4fd19c158b5457fe629566bc42ff845f599b SHA512 9e10cd320bc6182e94f8b5296367922b39e2149166793f46c5012f9dbba806a4508ee4ec65a8677391f5c4d7b06481c176ccf94b8fd1ab5d4b018eb167877f5f
26 DIST nginx-unit-1.26.1.tar.gz 865811 BLAKE2B eb0b62e48a8d0f9199dfe77a2d6ec90a06ac24f83b362ae16fde83eea53e03923127be7b24da47a83cf51fc4ebe7930cba9a3ee7550a5243f242cc4bfba3a3b9 SHA512 1caadb35cb208067a5d437e1f649c9f9a833a39c4344b2c3a5ae94d9fcd811913e2f23114cf8d7886030306e036da18c55f09044b8a575c1616568321b8d84ec
27
28 diff --git a/www-servers/nginx-unit/metadata.xml b/www-servers/nginx-unit/metadata.xml
29 index 88bdbf1127e4..4a985c432a3b 100644
30 --- a/www-servers/nginx-unit/metadata.xml
31 +++ b/www-servers/nginx-unit/metadata.xml
32 @@ -21,7 +21,6 @@
33 engineering or operations.
34 </longdescription>
35 <use>
36 - <flag name="php7-2">Support for PHP 7.2</flag>
37 <flag name="php7-3">Support for PHP 7.3</flag>
38 <flag name="php7-4">Support for PHP 7.4</flag>
39 </use>
40
41 diff --git a/www-servers/nginx-unit/nginx-unit-1.22.0-r1.ebuild b/www-servers/nginx-unit/nginx-unit-1.22.0-r1.ebuild
42 deleted file mode 100644
43 index 1611cdbc984f..000000000000
44 --- a/www-servers/nginx-unit/nginx-unit-1.22.0-r1.ebuild
45 +++ /dev/null
46 @@ -1,87 +0,0 @@
47 -# Copyright 1999-2021 Gentoo Authors
48 -# Distributed under the terms of the GNU General Public License v2
49 -
50 -EAPI=7
51 -
52 -PYTHON_COMPAT=( python3_{7,8,9} )
53 -
54 -inherit flag-o-matic python-single-r1 toolchain-funcs
55 -
56 -MY_P="unit-${PV}"
57 -DESCRIPTION="Dynamic web and application server"
58 -HOMEPAGE="https://unit.nginx.org"
59 -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
60 -S="${WORKDIR}/${MY_P}"
61 -
62 -LICENSE="Apache-2.0"
63 -SLOT="0"
64 -KEYWORDS="amd64"
65 -MY_USE="perl python ruby"
66 -MY_USE_PHP="php7-2 php7-3 php7-4"
67 -IUSE="${MY_USE} ${MY_USE_PHP} ssl"
68 -REQUIRED_USE="|| ( ${IUSE} )
69 - python? ( ${PYTHON_REQUIRED_USE} )"
70 -
71 -DEPEND="perl? ( dev-lang/perl:= )
72 - php7-2? ( dev-lang/php:7.2[embed] )
73 - php7-3? ( dev-lang/php:7.3[embed] )
74 - php7-4? ( dev-lang/php:7.4[embed] )
75 - python? ( ${PYTHON_DEPS} )
76 - ruby? (
77 - dev-lang/ruby:*
78 - dev-ruby/rubygems:*
79 - )
80 - ssl? ( dev-libs/openssl:0= )"
81 -RDEPEND="${DEPEND}"
82 -
83 -pkg_setup() {
84 - use python && python-single-r1_pkg_setup
85 -}
86 -
87 -src_prepare() {
88 - eapply_user
89 - sed -i '/^CFLAGS/d' auto/make || die
90 -}
91 -
92 -src_configure() {
93 - local opt=(
94 - --control=unix:/run/${PN}.sock
95 - --log=/var/log/${PN}
96 - --modules=$(get_libdir)/${PN}
97 - --pid=/run/${PN}.pid
98 - --prefix=/usr
99 - --state=/var/lib/${PN}
100 - )
101 -
102 - use ssl && opt+=( --openssl )
103 - export AR="$(tc-getAR)"
104 - export CC="$(tc-getCC)"
105 - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
106 -
107 - # Modules require position-independent code
108 - append-cflags $(test-flags-CC -fPIC)
109 -
110 - for flag in ${MY_USE} ; do
111 - if use ${flag} ; then
112 - ./configure ${flag} || die "Module configuration failed: ${flag}"
113 - fi
114 - done
115 -
116 - for flag in ${MY_USE_PHP} ; do
117 - if use ${flag} ; then
118 - local php_slot="/usr/$(get_libdir)/${flag/-/.}"
119 - ./configure php \
120 - --module=${flag} \
121 - --config=${php_slot}/bin/php-config \
122 - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
123 - fi
124 - done
125 -}
126 -
127 -src_install() {
128 - default
129 -
130 - diropts -m 0770
131 - keepdir /var/lib/${PN}
132 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
133 -}
134
135 diff --git a/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild
136 deleted file mode 100644
137 index dcbeae43d4de..000000000000
138 --- a/www-servers/nginx-unit/nginx-unit-1.26.0.ebuild
139 +++ /dev/null
140 @@ -1,89 +0,0 @@
141 -# Copyright 1999-2021 Gentoo Authors
142 -# Distributed under the terms of the GNU General Public License v2
143 -
144 -EAPI=8
145 -
146 -PYTHON_COMPAT=( python3_{7,8,9} )
147 -
148 -inherit flag-o-matic python-single-r1 systemd toolchain-funcs
149 -
150 -MY_P="unit-${PV}"
151 -DESCRIPTION="Dynamic web and application server"
152 -HOMEPAGE="https://unit.nginx.org"
153 -SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
154 -S="${WORKDIR}/${MY_P}"
155 -
156 -LICENSE="Apache-2.0"
157 -SLOT="0"
158 -KEYWORDS="~amd64"
159 -MY_USE="perl python ruby"
160 -MY_USE_PHP="php7-3 php7-4"
161 -IUSE="${MY_USE} ${MY_USE_PHP} ssl"
162 -REQUIRED_USE="|| ( ${IUSE} )
163 - python? ( ${PYTHON_REQUIRED_USE} )"
164 -
165 -DEPEND="perl? ( dev-lang/perl:= )
166 - php7-3? ( dev-lang/php:7.3[embed] )
167 - php7-4? ( dev-lang/php:7.4[embed] )
168 - python? ( ${PYTHON_DEPS} )
169 - ruby? (
170 - dev-lang/ruby:=
171 - dev-ruby/rubygems:=
172 - )
173 - ssl? ( dev-libs/openssl:0= )
174 - virtual/libcrypt:0="
175 -RDEPEND="${DEPEND}"
176 -
177 -pkg_setup() {
178 - use python && python-single-r1_pkg_setup
179 -}
180 -
181 -src_prepare() {
182 - eapply_user
183 - sed -i '/^CFLAGS/d' auto/make || die
184 - default
185 -}
186 -
187 -src_configure() {
188 - local opt=(
189 - --control=unix:/run/${PN}.sock
190 - --log=/var/log/${PN}
191 - --modules=$(get_libdir)/${PN}
192 - --pid=/run/${PN}.pid
193 - --prefix=/usr
194 - --state=/var/lib/${PN}
195 - )
196 -
197 - use ssl && opt+=( --openssl )
198 - export AR="$(tc-getAR)"
199 - export CC="$(tc-getCC)"
200 - ./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
201 -
202 - # Modules require position-independent code
203 - append-cflags $(test-flags-CC -fPIC)
204 -
205 - for flag in ${MY_USE} ; do
206 - if use ${flag} ; then
207 - ./configure ${flag} || die "Module configuration failed: ${flag}"
208 - fi
209 - done
210 -
211 - for flag in ${MY_USE_PHP} ; do
212 - if use ${flag} ; then
213 - local php_slot="/usr/$(get_libdir)/${flag/-/.}"
214 - ./configure php \
215 - --module=${flag} \
216 - --config=${php_slot}/bin/php-config \
217 - --lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
218 - fi
219 - done
220 -}
221 -
222 -src_install() {
223 - default
224 -
225 - diropts -m 0770
226 - keepdir /var/lib/${PN}
227 - newinitd "${FILESDIR}/${PN}.initd" ${PN}
228 - systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
229 -}