Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/apache-tools: apache-tools-2.4.7.ebuild ChangeLog
Date: Fri, 31 Jan 2014 08:17:43
Message-Id: 20140131081739.B03112004C@flycatcher.gentoo.org
1 vapier 14/01/31 08:17:39
2
3 Modified: apache-tools-2.4.7.ebuild ChangeLog
4 Log:
5 Simplify src_compile/src_install a bit -- no real functional changes.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
8
9 Revision Changes Path
10 1.6 app-admin/apache-tools/apache-tools-2.4.7.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild?r1=1.5&r2=1.6
15
16 Index: apache-tools-2.4.7.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- apache-tools-2.4.7.ebuild 31 Jan 2014 08:15:11 -0000 1.5
23 +++ apache-tools-2.4.7.ebuild 31 Jan 2014 08:17:39 -0000 1.6
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2014 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v 1.5 2014/01/31 08:15:11 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.7.ebuild,v 1.6 2014/01/31 08:17:39 vapier Exp $
29
30 EAPI=5
31 inherit flag-o-matic eutils multilib
32 @@ -51,32 +51,27 @@
33 }
34
35 src_compile() {
36 - cd support || die
37 - emake
38 + emake -C support
39 }
40
41 src_install() {
42 - cd support || die
43 -
44 - make DESTDIR="${D}" install
45 -
46 - # install manpages
47 - doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
48 - "${S}"/docs/man/{htcacheclean,rotatelogs}.8
49 + make -C support DESTDIR="${D}" install
50 + dodoc CHANGES
51 + doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
52 + docs/man/{htcacheclean,rotatelogs}.8
53
54 # Providing compatiblity symlinks for #177697 (which we'll stop to install
55 # at some point).
56 - pushd "${ED}"/usr/sbin/ >/dev/null
57 + pushd "${ED}"/usr/sbin >/dev/null
58 + local i
59 for i in *; do
60 - dosym /usr/sbin/${i} /usr/sbin/${i}2
61 + dosym ${i} /usr/sbin/${i}2
62 done
63 - popd "${ED}"/usr/sbin/ >/dev/null
64 + popd >/dev/null
65
66 # Provide a symlink for ab-ssl
67 if use ssl; then
68 - dosym /usr/bin/ab /usr/bin/ab-ssl
69 - dosym /usr/bin/ab /usr/bin/ab2-ssl
70 + dosym ab /usr/bin/ab-ssl
71 + dosym ab /usr/bin/ab2-ssl
72 fi
73 -
74 - dodoc "${S}"/CHANGES
75 }
76
77
78
79 1.174 app-admin/apache-tools/ChangeLog
80
81 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.174&view=markup
82 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?rev=1.174&content-type=text/plain
83 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/ChangeLog?r1=1.173&r2=1.174
84
85 Index: ChangeLog
86 ===================================================================
87 RCS file: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v
88 retrieving revision 1.173
89 retrieving revision 1.174
90 diff -u -r1.173 -r1.174
91 --- ChangeLog 31 Jan 2014 08:15:11 -0000 1.173
92 +++ ChangeLog 31 Jan 2014 08:17:39 -0000 1.174
93 @@ -1,6 +1,9 @@
94 # ChangeLog for app-admin/apache-tools
95 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
96 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.173 2014/01/31 08:15:11 vapier Exp $
97 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.174 2014/01/31 08:17:39 vapier Exp $
98 +
99 + 31 Jan 2014; Mike Frysinger <vapier@g.o> apache-tools-2.4.7.ebuild:
100 + Simplify src_compile/src_install a bit -- no real functional changes.
101
102 31 Jan 2014; Mike Frysinger <vapier@g.o> apache-tools-2.4.7.ebuild:
103 Convert myconf to an array to make it easier to maintain.