Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/apache-tools: ChangeLog apache-tools-2.2.16.ebuild
Date: Sat, 28 Aug 2010 14:57:08
Message-Id: 20100828145703.816BA20051@flycatcher.gentoo.org
1 hollow 10/08/28 14:57:03
2
3 Modified: ChangeLog
4 Added: apache-tools-2.2.16.ebuild
5 Log:
6 version bump wrt #330195
7 (Portage version: 2.2_rc67/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.78 app-admin/apache-tools/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.78&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.78&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.77&r2=1.78
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v
19 retrieving revision 1.77
20 retrieving revision 1.78
21 diff -u -r1.77 -r1.78
22 --- ChangeLog 4 Apr 2010 09:33:05 -0000 1.77
23 +++ ChangeLog 28 Aug 2010 14:57:03 -0000 1.78
24 @@ -1,6 +1,12 @@
25 # ChangeLog for app-admin/apache-tools
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.77 2010/04/04 09:33:05 gmsoft Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.78 2010/08/28 14:57:03 hollow Exp $
29 +
30 +*apache-tools-2.2.16 (28 Aug 2010)
31 +
32 + 28 Aug 2010; Benedikt Böhm <hollow@g.o>
33 + +apache-tools-2.2.16.ebuild:
34 + version bump wrt #330195
35
36 04 Apr 2010; Guy Martin <gmsoft@g.o> apache-tools-2.2.15.ebuild:
37 hppa stable, #308049
38
39
40
41 1.1 app-admin/apache-tools/apache-tools-2.2.16.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.16.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.16.ebuild?rev=1.1&content-type=text/plain
45
46 Index: apache-tools-2.2.16.ebuild
47 ===================================================================
48 # Copyright 1999-2010 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.16.ebuild,v 1.1 2010/08/28 14:57:03 hollow Exp $
51
52 inherit flag-o-matic eutils
53
54 DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
55 HOMEPAGE="http://httpd.apache.org/"
56 SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
57
58 LICENSE="Apache-2.0"
59 SLOT="0"
60 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
61 IUSE="ssl"
62 RESTRICT="test"
63
64 RDEPEND="=dev-libs/apr-1*
65 =dev-libs/apr-util-1*
66 dev-libs/libpcre
67 ssl? ( dev-libs/openssl )
68 !<www-servers/apache-2.2.4"
69
70 DEPEND="${RDEPEND}"
71
72 S="${WORKDIR}/httpd-${PV}"
73
74 src_unpack() {
75 unpack ${A}
76 cd "${S}"
77
78 # Apply these patches:
79 # (1) apache-tools-Makefile.patch:
80 # - fix up the `make install' for support/
81 # - remove envvars from `make install'
82 epatch "${FILESDIR}"/${PN}-Makefile.patch
83 }
84
85 src_compile() {
86 local myconf=""
87 cd "${S}"
88
89 # Instead of filtering --as-needed (bug #128505), append --no-as-needed
90 # Thanks to Harald van Dijk
91 append-ldflags $(no-as-needed)
92
93 if use ssl ; then
94 myconf="${myconf} --with-ssl=/usr --enable-ssl"
95 fi
96
97 # econf overwrites the stuff from config.layout, so we have to put them into
98 # our myconf line too
99 econf \
100 --sbindir=/usr/sbin \
101 --with-z=/usr \
102 --with-apr=/usr \
103 --with-apr-util=/usr \
104 --with-pcre=/usr \
105 ${myconf} || die "econf failed!"
106
107 cd support
108 emake || die "emake support/ failed!"
109 }
110
111 src_install () {
112 cd "${S}"/support
113
114 make DESTDIR="${D}" install || die "make install failed!"
115
116 # install manpages
117 doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
118 "${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
119
120 # Providing compatiblity symlinks for #177697 (which we'll stop to install
121 # at some point).
122
123 for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
124 dosym /usr/sbin/${i} /usr/sbin/${i}2
125 done
126
127 # Provide a symlink for ab-ssl
128 if use ssl ; then
129 dosym /usr/sbin/ab /usr/sbin/ab-ssl
130 dosym /usr/sbin/ab /usr/sbin/ab2-ssl
131 fi
132
133 # make htpasswd accessible for non-root users
134 dosym /usr/sbin/htpasswd /usr/bin/htpasswd
135 dosym /usr/sbin/htdigest /usr/bin/htdigest
136
137 dodoc "${S}"/CHANGES
138 }