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, 16 Jul 2018 08:00:38
Message-Id: 1531728026.934be8c59c75900f44341934694023fadb7ebd5c.polynomial-c@gentoo
1 commit: 934be8c59c75900f44341934694023fadb7ebd5c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 16 07:59:24 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 16 08:00:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934be8c5
7
8 app-admin/apache-tools: Removed old.
9
10 Package-Manager: Portage-2.3.42, Repoman-2.3.9
11
12 app-admin/apache-tools/Manifest | 1 -
13 app-admin/apache-tools/apache-tools-2.4.29.ebuild | 106 ----------------------
14 2 files changed, 107 deletions(-)
15
16 diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
17 index 1c9555807b9..7d83b9d428f 100644
18 --- a/app-admin/apache-tools/Manifest
19 +++ b/app-admin/apache-tools/Manifest
20 @@ -1,5 +1,4 @@
21 DIST httpd-2.2.34.tar.bz2 5779739 BLAKE2B 8cdd41fb5d1880da4a1cfef252b4682f613b938594057ea4c9665d3881a50b298fb7339c1ceb3dafc215aa927048f99d500f2d29c125016d5766954be9b632b4 SHA512 e6dac5865a48533c025fe17523ee74d68c3a23f9512c9441b78a140e33cfb6835573eb049b0ad424eb5c5ca78a1915778c54e8a409da95fbdd3890cb99e08240
22 DIST httpd-2.4.27.tar.bz2 6527394 BLAKE2B 50a650eb2edd121dac860ff555273290010d7e85bf4d5fbe3683f82e1928dde99ebfabc42186436f5052a66555a73d8b797b114c76c123faa31b9f51575d0bbb SHA512 7e7e8070715b74cb6890096a74e194f4c6a49c14bda685b1ad832e84312f1ac4316ea03a430e679502bfd8e1853aefa544ee002a20d0f7e994b9a590c74bc42c
23 -DIST httpd-2.4.29.tar.bz2 6567926 BLAKE2B 01a83212941abad548f73fc144f9731ff51e0ed8f975e76cb994247601f7c2f89a3f862e011638afb77988eda0ef2b543634fb6bc45b583e9bdba2c30e565731 SHA512 840982fd3d21463bc5c1747f211dfacf3abdf634d149e49bb49fd2e5deda140de602dbdf31e1bbe5337a48f718ab2261c408e83a8dd39a9291ee7b6b7a85639a
24 DIST httpd-2.4.33.tar.bz2 6934765 BLAKE2B 4ff266b85358e3100c8064c84c89db0235e6f46bb4b308e6b3bf642a9c0815eb6a731ee12e3d8ea2bf31a5d5e6621152452f1e8a9625755689f552f2473b1955 SHA512 e74b2b3346d67be45a8bc8a7cbb8eabf5c403a5cfe5797a976f94a539529843fbcdf03b9ca0548816b2cf37f4ce0eb301f8d5af25b1270fdf8dd9f5bf0585269
25 DIST httpd-2.4.34.tar.bz2 6942969 BLAKE2B 02ecb9980f48bef7ac915077598560353e0682001bdaa99410b7faad459c4581f8d0878b4840e38e570b1872d549d58743260cb3030c145ae93bef97fc692cc4 SHA512 2bc09213f08a4722e305929fbac5f5060c7a8444704494894bb9b61f17e4d20bb6e3d663bb93fc5b2030b04a43fb12373d260cc291422b210b299725aaf3b5c8
26
27 diff --git a/app-admin/apache-tools/apache-tools-2.4.29.ebuild b/app-admin/apache-tools/apache-tools-2.4.29.ebuild
28 deleted file mode 100644
29 index a863d1e0222..00000000000
30 --- a/app-admin/apache-tools/apache-tools-2.4.29.ebuild
31 +++ /dev/null
32 @@ -1,106 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -inherit flag-o-matic eutils multilib toolchain-funcs
38 -
39 -DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
40 -HOMEPAGE="https://httpd.apache.org/"
41 -SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
42 -
43 -LICENSE="Apache-2.0"
44 -SLOT="0"
45 -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"
46 -IUSE="libressl ssl"
47 -RESTRICT="test"
48 -
49 -RDEPEND=">=dev-libs/apr-1.5.0:1
50 - dev-libs/apr-util:1
51 - dev-libs/expat
52 - dev-libs/libpcre
53 - kernel_linux? ( sys-apps/util-linux )
54 - ssl? (
55 - !libressl? ( dev-libs/openssl:0= )
56 - libressl? ( dev-libs/libressl:0= )
57 - )"
58 -
59 -DEPEND="${RDEPEND}
60 - sys-devel/libtool"
61 -
62 -S="${WORKDIR}/httpd-${PV}"
63 -
64 -PATCHES=(
65 - "${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
66 -)
67 -
68 -src_prepare() {
69 - default
70 -
71 - # This package really should upgrade to using pcre's .pc file.
72 - cat <<-\EOF >"${T}"/pcre-config
73 - #!/bin/bash
74 - flags=()
75 - for flag; do
76 - if [[ ${flag} == "--version" ]]; then
77 - flags+=( --modversion )
78 - else
79 - flags+=( "${flag}" )
80 - fi
81 - done
82 - exec ${PKG_CONFIG} libpcre "${flags[@]}"
83 - EOF
84 - chmod a+x "${T}"/pcre-config
85 -}
86 -
87 -src_configure() {
88 - # Brain dead check.
89 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
90 -
91 - tc-export PKG_CONFIG
92 -
93 - # Instead of filtering --as-needed (bug #128505), append --no-as-needed
94 - #append-ldflags $(no-as-needed)
95 -
96 - # econf overwrites the stuff from config.layout.
97 - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
98 - econf \
99 - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
100 - --sbindir="${EPREFIX}"/usr/sbin \
101 - --with-perl="${EPREFIX}"/usr/bin/perl \
102 - --with-expat="${EPREFIX}"/usr \
103 - --with-z="${EPREFIX}"/usr \
104 - --with-apr="${SYSROOT}${EPREFIX}"/usr \
105 - --with-apr-util="${SYSROOT}${EPREFIX}"/usr \
106 - --with-pcre="${T}"/pcre-config \
107 - $(use_enable ssl) \
108 - $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
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 -}