Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/
Date: Mon, 04 Oct 2021 11:36:42
Message-Id: 1633347389.14f607fb77f46c79f619a2fe092b06c78985652a.polynomial-c@gentoo
1 commit: 14f607fb77f46c79f619a2fe092b06c78985652a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 4 11:34:48 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 11:36:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f607fb
7
8 app-admin/apache-tools: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 app-admin/apache-tools/Manifest | 2 -
13 .../apache-tools/apache-tools-2.4.46-r1.ebuild | 103 ---------------------
14 .../apache-tools/apache-tools-2.4.47-r1.ebuild | 103 ---------------------
15 3 files changed, 208 deletions(-)
16
17 diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
18 index 6bd2d2c865e..974327ca71e 100644
19 --- a/app-admin/apache-tools/Manifest
20 +++ b/app-admin/apache-tools/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
23 -DIST httpd-2.4.47.tar.bz2 7187445 BLAKE2B ba5b6ebac73aaa6f2f0d7a34d5bf9d13bd4ac862ee9d04b105c315c3aad16401b842b6901424dba6a44a0b5d255c0356e0bf72b5d1898b4b091b12192c204c96 SHA512 ac05e878604037572b484c32c767e022bf027e5efa2a2ed28472939d9f536448f1536ede4d809f1e913a29a0247bdd27981bd00d3d8614f978573c14bce7c7af
24 DIST httpd-2.4.48.tar.bz2 7194385 BLAKE2B 5006535dc15b703b4388d90d57559bd882f16210c2f38f4d773312ed8322803629deee18709ca4446000c20c94ff8b0037acbe4dddab9cdbe45417079f708039 SHA512 6c250626f1e7d10428a92d984fd48ff841effcc8705f7816ab71b681bbd51d0012ad158dcd13763fe7d630311f2de258b27574603140d648be42796ab8326724
25 DIST httpd-2.4.49.tar.bz2 7199599 BLAKE2B 78614647335a2351ce3ffb67f79bffd4aa0f42080a46de1f8d8a75c2ccae24998f5d505e60e9d4a710ff763e6a8cb3abee3da34ff6a7f2e18b68029a8abe80b7 SHA512 418e277232cf30a81d02b8554e31aaae6433bbea842bdb81e47a609469395cc4891183fb6ee02bd669edb2392c2007869b19da29f5998b8fd5c7d3142db310dd
26 DIST httpd-2.4.50.tar.bz2 7653174 BLAKE2B 6bdb26bc03347b9643e973d22726ef283b8d92b675f81e85f4e0470bedf8510bac60cd043fe966bc786d5ae47827ac1bb31da88a0e510f4bb6c665e2075c3beb SHA512 b1afbaf44e503b822ff2b443881dcb44a93aa55d496f88ae399a2e7def05f78590f266a16da1f2c0aac88e463b76fba20843b1e20a102e76c8269de6fae3e158
27
28 diff --git a/app-admin/apache-tools/apache-tools-2.4.46-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.46-r1.ebuild
29 deleted file mode 100644
30 index 4c8dbb3e437..00000000000
31 --- a/app-admin/apache-tools/apache-tools-2.4.46-r1.ebuild
32 +++ /dev/null
33 @@ -1,103 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -inherit flag-o-matic multilib toolchain-funcs
39 -
40 -DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
41 -HOMEPAGE="https://httpd.apache.org/"
42 -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
43 -
44 -LICENSE="Apache-2.0"
45 -SLOT="0"
46 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
47 -IUSE="ssl"
48 -RESTRICT="test"
49 -
50 -RDEPEND=">=dev-libs/apr-1.5.0:1=
51 - dev-libs/apr-util:1=
52 - dev-libs/expat
53 - dev-libs/libpcre
54 - virtual/libcrypt:=
55 - kernel_linux? ( sys-apps/util-linux )
56 - ssl? ( dev-libs/openssl:0= )"
57 -DEPEND="${RDEPEND}
58 - sys-devel/libtool"
59 -BDEPEND="virtual/pkgconfig"
60 -
61 -S="${WORKDIR}/httpd-${PV}"
62 -
63 -PATCHES=(
64 - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
65 -)
66 -
67 -src_prepare() {
68 - default
69 -
70 - # This package really should upgrade to using pcre's .pc file.
71 - cat <<-\EOF >"${T}"/pcre-config
72 - #!/bin/bash
73 - flags=()
74 - for flag; do
75 - if [[ ${flag} == "--version" ]]; then
76 - flags+=( --modversion )
77 - else
78 - flags+=( "${flag}" )
79 - fi
80 - done
81 - exec ${PKG_CONFIG} libpcre "${flags[@]}"
82 - EOF
83 - chmod a+x "${T}"/pcre-config || die
84 -}
85 -
86 -src_configure() {
87 - # Brain dead check.
88 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
89 -
90 - tc-export PKG_CONFIG
91 -
92 - local myeconfargs=(
93 - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
94 - --sbindir="${EPREFIX}"/usr/sbin
95 - --with-perl="${EPREFIX}"/usr/bin/perl
96 - --with-expat="${EPREFIX}"/usr
97 - --with-z="${EPREFIX}"/usr
98 - --with-apr="${SYSROOT}${EPREFIX}"/usr
99 - --with-apr-util="${SYSROOT}${EPREFIX}"/usr
100 - --with-pcre="${T}"/pcre-config
101 - $(use_enable ssl)
102 - $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
103 - )
104 - # econf overwrites the stuff from config.layout.
105 - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
106 - econf "${myeconfargs[@]}"
107 - sed -i \
108 - -e '/^LTFLAGS/s:--silent::' \
109 - build/rules.mk build/config_vars.mk || die
110 -}
111 -
112 -src_compile() {
113 - emake -C support
114 -}
115 -
116 -src_install() {
117 - emake -C support DESTDIR="${D}" install
118 - dodoc CHANGES
119 - doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
120 - docs/man/{htcacheclean,rotatelogs}.8
121 -
122 - # Providing compatiblity symlinks for #177697 (which we'll stop to install
123 - # at some point).
124 - pushd "${ED}"/usr/sbin >/dev/null || die
125 - local i
126 - for i in *; do
127 - dosym ${i} /usr/sbin/${i}2
128 - done
129 - popd >/dev/null || die
130 -
131 - # Provide a symlink for ab-ssl
132 - if use ssl ; then
133 - dosym ab /usr/bin/ab-ssl
134 - dosym ab /usr/bin/ab2-ssl
135 - fi
136 -}
137
138 diff --git a/app-admin/apache-tools/apache-tools-2.4.47-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.47-r1.ebuild
139 deleted file mode 100644
140 index 26baef954af..00000000000
141 --- a/app-admin/apache-tools/apache-tools-2.4.47-r1.ebuild
142 +++ /dev/null
143 @@ -1,103 +0,0 @@
144 -# Copyright 1999-2021 Gentoo Authors
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=7
148 -inherit flag-o-matic multilib toolchain-funcs
149 -
150 -DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
151 -HOMEPAGE="https://httpd.apache.org/"
152 -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
153 -
154 -LICENSE="Apache-2.0"
155 -SLOT="0"
156 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
157 -IUSE="ssl"
158 -RESTRICT="test"
159 -
160 -RDEPEND=">=dev-libs/apr-1.5.0:1=
161 - dev-libs/apr-util:1=
162 - dev-libs/expat
163 - dev-libs/libpcre
164 - virtual/libcrypt:=
165 - kernel_linux? ( sys-apps/util-linux )
166 - ssl? ( dev-libs/openssl:0= )"
167 -DEPEND="${RDEPEND}
168 - sys-devel/libtool"
169 -BDEPEND="virtual/pkgconfig"
170 -
171 -S="${WORKDIR}/httpd-${PV}"
172 -
173 -PATCHES=(
174 - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
175 -)
176 -
177 -src_prepare() {
178 - default
179 -
180 - # This package really should upgrade to using pcre's .pc file.
181 - cat <<-\EOF >"${T}"/pcre-config
182 - #!/bin/bash
183 - flags=()
184 - for flag; do
185 - if [[ ${flag} == "--version" ]]; then
186 - flags+=( --modversion )
187 - else
188 - flags+=( "${flag}" )
189 - fi
190 - done
191 - exec ${PKG_CONFIG} libpcre "${flags[@]}"
192 - EOF
193 - chmod a+x "${T}"/pcre-config || die
194 -}
195 -
196 -src_configure() {
197 - # Brain dead check.
198 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
199 -
200 - tc-export PKG_CONFIG
201 -
202 - local myeconfargs=(
203 - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
204 - --sbindir="${EPREFIX}"/usr/sbin
205 - --with-perl="${EPREFIX}"/usr/bin/perl
206 - --with-expat="${EPREFIX}"/usr
207 - --with-z="${EPREFIX}"/usr
208 - --with-apr="${SYSROOT}${EPREFIX}"/usr
209 - --with-apr-util="${SYSROOT}${EPREFIX}"/usr
210 - --with-pcre="${T}"/pcre-config
211 - $(use_enable ssl)
212 - $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
213 - )
214 - # econf overwrites the stuff from config.layout.
215 - ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
216 - econf "${myeconfargs[@]}"
217 - sed -i \
218 - -e '/^LTFLAGS/s:--silent::' \
219 - build/rules.mk build/config_vars.mk || die
220 -}
221 -
222 -src_compile() {
223 - emake -C support
224 -}
225 -
226 -src_install() {
227 - emake -C support DESTDIR="${D}" install
228 - dodoc CHANGES
229 - doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
230 - docs/man/{htcacheclean,rotatelogs}.8
231 -
232 - # Providing compatiblity symlinks for #177697 (which we'll stop to install
233 - # at some point).
234 - pushd "${ED}"/usr/sbin >/dev/null || die
235 - local i
236 - for i in *; do
237 - dosym ${i} /usr/sbin/${i}2
238 - done
239 - popd >/dev/null || die
240 -
241 - # Provide a symlink for ab-ssl
242 - if use ssl ; then
243 - dosym ab /usr/bin/ab-ssl
244 - dosym ab /usr/bin/ab2-ssl
245 - fi
246 -}