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.6.ebuild
Date: Fri, 07 Sep 2007 21:48:19
Message-Id: E1ITla3-0001DS-36@stork.gentoo.org
1 hollow 07/09/07 21:41:35
2
3 Modified: ChangeLog
4 Added: apache-tools-2.2.6.ebuild
5 Log:
6 version bump
7 (Portage version: 2.1.3.7)
8
9 Revision Changes Path
10 1.16 app-admin/apache-tools/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.16&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.16&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.15&r2=1.16
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v
19 retrieving revision 1.15
20 retrieving revision 1.16
21 diff -u -r1.15 -r1.16
22 --- ChangeLog 4 Sep 2007 18:35:45 -0000 1.15
23 +++ ChangeLog 7 Sep 2007 21:41:34 -0000 1.16
24 @@ -1,6 +1,12 @@
25 # ChangeLog for app-admin/apache-tools
26 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.15 2007/09/04 18:35:45 armin76 Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.16 2007/09/07 21:41:34 hollow Exp $
29 +
30 +*apache-tools-2.2.6 (07 Sep 2007)
31 +
32 + 07 Sep 2007; Benedikt Böhm <hollow@g.o>
33 + +apache-tools-2.2.6.ebuild:
34 + version bump
35
36 04 Sep 2007; Raúl Porcel <armin76@g.o>
37 apache-tools-2.2.4-r4.ebuild:
38
39
40
41 1.1 app-admin/apache-tools/apache-tools-2.2.6.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.6.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/apache-tools/apache-tools-2.2.6.ebuild?rev=1.1&content-type=text/plain
45
46 Index: apache-tools-2.2.6.ebuild
47 ===================================================================
48 # Copyright 1999-2007 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.6.ebuild,v 1.1 2007/09/07 21:41:34 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 ~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 -Wl,--no-as-needed
92
93 if use ssl ; then
94 myconf="${myconf} --with-ssl=/usr --enable-ssl"
95 append-flags -DHAVE_OPENSSL -DUSE_SSL -I/usr/include/openssl
96 append-ldflags -lssl
97 fi
98
99 # econf overwrites the stuff from config.layout, so we have to put them into
100 # our myconf line too
101
102 econf \
103 --sbindir=/usr/sbin \
104 --with-perl=/usr/bin/perl \
105 --with-expat=/usr \
106 --with-z=/usr \
107 --with-apr=/usr \
108 --with-apr-util=/usr \
109 --with-pcre=/usr \
110 ${myconf} || die "econf failed!"
111
112 cd support
113 emake || die "emake support/ failed!"
114 }
115
116 src_install () {
117 cd "${S}"/support
118
119 make DESTDIR="${D}" install || die "make install failed!"
120
121 # install manpages
122 doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm}.1 \
123 "${S}"/docs/man/{ab,htcacheclean,logresolve,rotatelogs}.8
124
125 # Providing compatiblity symlinks for #177697 (which we'll stop to install
126 # at some point).
127
128 for i in $(ls "${D}"/usr/sbin 2>/dev/null); do
129 dosym /usr/sbin/${i} /usr/sbin/${i}2
130 done
131
132 # Provide a symlink for ab-ssl
133 if use ssl ; then
134 dosym /usr/sbin/ab /usr/sbin/ab-ssl
135 dosym /usr/sbin/ab /usr/sbin/ab2-ssl
136 fi
137
138 dodoc "${S}"/CHANGES
139 }
140
141
142
143 --
144 gentoo-commits@g.o mailing list