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: Wed, 06 Jul 2016 09:56:43
Message-Id: 1467798989.664a34245b22f5d3042f8f3a7004ba24cf648708.polynomial-c@gentoo
1 commit: 664a34245b22f5d3042f8f3a7004ba24cf648708
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 09:56:29 2016 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 09:56:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664a3424
7
8 app-admin/apache-tools: Removed old.
9
10 Package-Manager: portage-2.3.0
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-admin/apache-tools/Manifest | 1 -
14 app-admin/apache-tools/apache-tools-2.4.18.ebuild | 96 -----------------------
15 2 files changed, 97 deletions(-)
16
17 diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
18 index b29fe52..9d9eb3a 100644
19 --- a/app-admin/apache-tools/Manifest
20 +++ b/app-admin/apache-tools/Manifest
21 @@ -1,4 +1,3 @@
22 DIST httpd-2.2.31.tar.bz2 5610489 SHA256 f32f9d19f535dac63b06cb55dfc023b40dcd28196b785f79f9346779e22f26ac SHA512 5aa47d4b76f692bbd8b309135ff99152df98cf69b505b9daf3f13f7f2a31443eaf4995161adfbc47a133b4d0e091fda2d95fc6b87a956f0ada18d7466ee28e74 WHIRLPOOL a2e3e53c51719cb6f7e641b41788cd89ce7b4d2ea105b403bfa3b3d4479b69c5604228269062f66722594e105e91121d05b1c9f27ca7dc4ecfcf339da8b8375c
23 -DIST httpd-2.4.18.tar.bz2 5181291 SHA256 0644b050de41f5c9f67c825285049b144690421acb709b06fe53eddfa8a9fd4c SHA512 8e342cc447313c07275869381c2d6f2314a96547f0c86ee1c617975d0f7ad8efb47113ab5995c733108ae4dec31ad79847e397ecea859b60414ffe1680617a31 WHIRLPOOL e0ae6b8581e2993e0f873d8928e3b54f1df750f29e82d2f1308376af440308c56e89dfb3ec051cdf164a271580ccac71ebc5b038e23ca65a9221fdfc08b47b41
24 DIST httpd-2.4.20.tar.bz2 6331344 SHA256 0e76a375ed3dbac636f50ac39de966ece443751fe4d62392f9a360a19d94d0da SHA512 8591e0ca8f1c4755d670f1a8780bb656c62b30635cff1f7d4434f7c5017b99f1b14bbb296da5cdb63cd3bcfa4908b8b5f99a0c036e9e0f0c9514acd2a3cb7e53 WHIRLPOOL cc61fa5a2344268cdba69ba1662d555d492b40468a81b1d67fce55f85e178f63ef218a303e51e494c91a26dcec259e3912ca640192dbbe42d2b02ee4fac19a1d
25 DIST httpd-2.4.23.tar.bz2 6351875 SHA256 0c1694b2aad7765896faf92843452ee2555b9591ae10d4f19b245f2adfe85e58 SHA512 c520de5be748c0a785ef0dc77102749eb4f47e224968b8d4bed2ae644faa0964623a0e960b64486a0888446790d050b52a6ae34fe61717fab95b37384b4825b1 WHIRLPOOL f3defbd06a878c66236adfcac2b59b6f47115ac815708bb45f2152bd1754b14a01458c9331eb7a65cba52e0bc53e2e66b32a384d44a029b07ffdd068c7c08a19
26
27 diff --git a/app-admin/apache-tools/apache-tools-2.4.18.ebuild b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
28 deleted file mode 100644
29 index 993b58d..0000000
30 --- a/app-admin/apache-tools/apache-tools-2.4.18.ebuild
31 +++ /dev/null
32 @@ -1,96 +0,0 @@
33 -# Copyright 1999-2015 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=5
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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~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 -src_prepare() {
66 - epatch "${FILESDIR}"/${PN}-2.4.7-Makefile.patch #459446
67 -
68 - # This package really should upgrade to using pcre's .pc file.
69 - cat <<-\EOF >"${T}"/pcre-config
70 - #!/bin/sh
71 - [ "${flag}" = "--version" ] && set -- --modversion
72 - exec ${PKG_CONFIG} libpcre "$@"
73 - EOF
74 - chmod a+x "${T}"/pcre-config
75 -}
76 -
77 -src_configure() {
78 - # Brain dead check.
79 - tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
80 -
81 - tc-export PKG_CONFIG
82 -
83 - # Instead of filtering --as-needed (bug #128505), append --no-as-needed
84 - append-ldflags $(no-as-needed)
85 -
86 - # econf overwrites the stuff from config.layout.
87 - ac_cv_path_PKGCONFIG=${PKG_CONFIG} \
88 - econf \
89 - --libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules \
90 - --sbindir="${EPREFIX}"/usr/sbin \
91 - --with-perl="${EPREFIX}"/usr/bin/perl \
92 - --with-expat="${EPREFIX}"/usr \
93 - --with-z="${EPREFIX}"/usr \
94 - --with-apr="${SYSROOT}${EPREFIX}"/usr \
95 - --with-apr-util="${SYSROOT}${EPREFIX}"/usr \
96 - --with-pcre="${T}"/pcre-config \
97 - $(use_enable ssl) \
98 - $(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
99 - sed -i \
100 - -e '/^LTFLAGS/s:--silent::' \
101 - build/rules.mk build/config_vars.mk || die
102 -}
103 -
104 -src_compile() {
105 - emake -C support
106 -}
107 -
108 -src_install() {
109 - emake -C support DESTDIR="${D}" install
110 - dodoc CHANGES
111 - doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
112 - docs/man/{htcacheclean,rotatelogs}.8
113 -
114 - # Providing compatiblity symlinks for #177697 (which we'll stop to install
115 - # at some point).
116 - pushd "${ED}"/usr/sbin >/dev/null || die
117 - local i
118 - for i in *; do
119 - dosym ${i} /usr/sbin/${i}2
120 - done
121 - popd >/dev/null || die
122 -
123 - # Provide a symlink for ab-ssl
124 - if use ssl; then
125 - dosym ab /usr/bin/ab-ssl
126 - dosym ab /usr/bin/ab2-ssl
127 - fi
128 -}