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