1 |
commit: d0143563471cd0d629ba1b7a609e95b69288be3b |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 29 09:14:09 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 29 09:20:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0143563 |
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 |
app-admin/apache-tools/apache-tools-2.4.41.ebuild | 105 ---------------------- |
14 |
app-admin/apache-tools/apache-tools-2.4.43.ebuild | 105 ---------------------- |
15 |
3 files changed, 212 deletions(-) |
16 |
|
17 |
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest |
18 |
index 5e31f89021b..de9bdf9bd31 100644 |
19 |
--- a/app-admin/apache-tools/Manifest |
20 |
+++ b/app-admin/apache-tools/Manifest |
21 |
@@ -1,3 +1 @@ |
22 |
-DIST httpd-2.4.41.tar.bz2 7072373 BLAKE2B 88a2390736209d5ef04bffcb867bc8d6019302885e6f3cc63d18123336d4d0657252105a3bfebf4e91b8daa02119d4a61f4c0a9702244858a3193ec6cf681c0f SHA512 350cc7dcd2c439e0590338fa6da3f44df44f9bb885c381e91f91b14c2f48597f6f0bbac0ea118a8a67eaa70ae7edbb769beace368643ed73f6daee44c307b335 |
23 |
-DIST httpd-2.4.43.tar.bz2 7155865 BLAKE2B cd85c7e25500f8f1b4bd6ac5f715718a61bf548dfaf36408a970d27bacbfce256e4dda255ba5b62f89e117c335d0568d6207c93e5fb0d2b1ee84dba4ce0d4bd7 SHA512 16cfeecc8f6fab6eca478065a384bdf1872f7ac42206b0bc2bcac6c0d9c576f392c07107201f39e0601dec1bbafcb33d66153544de4d87d79b9a52094d334b64 |
24 |
DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13 |
25 |
|
26 |
diff --git a/app-admin/apache-tools/apache-tools-2.4.41.ebuild b/app-admin/apache-tools/apache-tools-2.4.41.ebuild |
27 |
deleted file mode 100644 |
28 |
index 42dcd53ef1e..00000000000 |
29 |
--- a/app-admin/apache-tools/apache-tools-2.4.41.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,105 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
-inherit flag-o-matic multilib toolchain-funcs |
37 |
- |
38 |
-DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm" |
39 |
-HOMEPAGE="https://httpd.apache.org/" |
40 |
-SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" |
41 |
- |
42 |
-LICENSE="Apache-2.0" |
43 |
-SLOT="0" |
44 |
-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" |
45 |
-IUSE="libressl ssl" |
46 |
-RESTRICT="test" |
47 |
- |
48 |
-RDEPEND=">=dev-libs/apr-1.5.0:1= |
49 |
- dev-libs/apr-util:1= |
50 |
- dev-libs/expat |
51 |
- dev-libs/libpcre |
52 |
- kernel_linux? ( sys-apps/util-linux ) |
53 |
- ssl? ( |
54 |
- !libressl? ( dev-libs/openssl:0= ) |
55 |
- libressl? ( dev-libs/libressl:0= ) |
56 |
- )" |
57 |
- |
58 |
-DEPEND="${RDEPEND} |
59 |
- sys-devel/libtool" |
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.43.ebuild b/app-admin/apache-tools/apache-tools-2.4.43.ebuild |
139 |
deleted file mode 100644 |
140 |
index 42dcd53ef1e..00000000000 |
141 |
--- a/app-admin/apache-tools/apache-tools-2.4.43.ebuild |
142 |
+++ /dev/null |
143 |
@@ -1,105 +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="libressl 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 |
- kernel_linux? ( sys-apps/util-linux ) |
165 |
- ssl? ( |
166 |
- !libressl? ( dev-libs/openssl:0= ) |
167 |
- libressl? ( dev-libs/libressl:0= ) |
168 |
- )" |
169 |
- |
170 |
-DEPEND="${RDEPEND} |
171 |
- sys-devel/libtool" |
172 |
- |
173 |
-S="${WORKDIR}/httpd-${PV}" |
174 |
- |
175 |
-PATCHES=( |
176 |
- "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446 |
177 |
-) |
178 |
- |
179 |
-src_prepare() { |
180 |
- default |
181 |
- |
182 |
- # This package really should upgrade to using pcre's .pc file. |
183 |
- cat <<-\EOF >"${T}"/pcre-config |
184 |
- #!/bin/bash |
185 |
- flags=() |
186 |
- for flag; do |
187 |
- if [[ ${flag} == "--version" ]]; then |
188 |
- flags+=( --modversion ) |
189 |
- else |
190 |
- flags+=( "${flag}" ) |
191 |
- fi |
192 |
- done |
193 |
- exec ${PKG_CONFIG} libpcre "${flags[@]}" |
194 |
- EOF |
195 |
- chmod a+x "${T}"/pcre-config || die |
196 |
-} |
197 |
- |
198 |
-src_configure() { |
199 |
- # Brain dead check. |
200 |
- tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no" |
201 |
- |
202 |
- tc-export PKG_CONFIG |
203 |
- |
204 |
- local myeconfargs=( |
205 |
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules |
206 |
- --sbindir="${EPREFIX}"/usr/sbin |
207 |
- --with-perl="${EPREFIX}"/usr/bin/perl |
208 |
- --with-expat="${EPREFIX}"/usr |
209 |
- --with-z="${EPREFIX}"/usr |
210 |
- --with-apr="${SYSROOT}${EPREFIX}"/usr |
211 |
- --with-apr-util="${SYSROOT}${EPREFIX}"/usr |
212 |
- --with-pcre="${T}"/pcre-config |
213 |
- $(use_enable ssl) |
214 |
- $(usex ssl '--with-ssl="${EPREFIX}"/usr' '') |
215 |
- ) |
216 |
- # econf overwrites the stuff from config.layout. |
217 |
- ac_cv_path_PKGCONFIG=${PKG_CONFIG} \ |
218 |
- econf "${myeconfargs[@]}" |
219 |
- sed -i \ |
220 |
- -e '/^LTFLAGS/s:--silent::' \ |
221 |
- build/rules.mk build/config_vars.mk || die |
222 |
-} |
223 |
- |
224 |
-src_compile() { |
225 |
- emake -C support |
226 |
-} |
227 |
- |
228 |
-src_install() { |
229 |
- emake -C support DESTDIR="${D}" install |
230 |
- dodoc CHANGES |
231 |
- doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ |
232 |
- docs/man/{htcacheclean,rotatelogs}.8 |
233 |
- |
234 |
- # Providing compatiblity symlinks for #177697 (which we'll stop to install |
235 |
- # at some point). |
236 |
- pushd "${ED}"/usr/sbin >/dev/null || die |
237 |
- local i |
238 |
- for i in *; do |
239 |
- dosym ${i} /usr/sbin/${i}2 |
240 |
- done |
241 |
- popd >/dev/null || die |
242 |
- |
243 |
- # Provide a symlink for ab-ssl |
244 |
- if use ssl ; then |
245 |
- dosym ab /usr/bin/ab-ssl |
246 |
- dosym ab /usr/bin/ab2-ssl |
247 |
- fi |
248 |
-} |