Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-misc/htdig: ChangeLog htdig-3.2.0_beta6-r3.ebuild
Date: Fri, 01 Jan 2010 03:38:45
Message-Id: E1NQYLb-0000BU-89@stork.gentoo.org
1 abcd 10/01/01 03:38:43
2
3 Modified: ChangeLog htdig-3.2.0_beta6-r3.ebuild
4 Log:
5 Add prefix keywords
6 (Portage version: -svn/cvs/Linux i686)
7
8 Revision Changes Path
9 1.44 www-misc/htdig/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/ChangeLog?rev=1.44&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/ChangeLog?rev=1.44&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/ChangeLog?r1=1.43&r2=1.44
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v
18 retrieving revision 1.43
19 retrieving revision 1.44
20 diff -u -r1.43 -r1.44
21 --- ChangeLog 13 Dec 2009 21:57:34 -0000 1.43
22 +++ ChangeLog 1 Jan 2010 03:38:42 -0000 1.44
23 @@ -1,6 +1,10 @@
24 # ChangeLog for www-misc/htdig
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.43 2009/12/13 21:57:34 abcd Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.44 2010/01/01 03:38:42 abcd Exp $
29 +
30 + 01 Jan 2010; Jonathan Callen <abcd@g.o>
31 + htdig-3.2.0_beta6-r3.ebuild:
32 + Add prefix keywords
33
34 13 Dec 2009; Jonathan Callen <abcd@g.o> -files/3.1.6-ssl.patch,
35 -htdig-3.1.6-r7.ebuild, -htdig-3.1.6-r8.ebuild,
36
37
38
39 1.9 www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild?rev=1.9&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild?rev=1.9&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild?r1=1.8&r2=1.9
44
45 Index: htdig-3.2.0_beta6-r3.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v
48 retrieving revision 1.8
49 retrieving revision 1.9
50 diff -u -r1.8 -r1.9
51 --- htdig-3.2.0_beta6-r3.ebuild 13 Dec 2009 21:57:34 -0000 1.8
52 +++ htdig-3.2.0_beta6-r3.ebuild 1 Jan 2010 03:38:42 -0000 1.9
53 @@ -1,6 +1,6 @@
54 -# Copyright 1999-2009 Gentoo Foundation
55 +# Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.8 2009/12/13 21:57:34 abcd Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.9 2010/01/01 03:38:42 abcd Exp $
59
60 inherit eutils autotools
61
62 @@ -13,7 +13,7 @@
63
64 LICENSE="GPL-2"
65 SLOT="0"
66 -KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
67 +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
68 IUSE="ssl"
69
70 DEPEND=">=sys-libs/zlib-1.1.3
71 @@ -31,29 +31,33 @@
72 }
73
74 src_compile() {
75 + use prefix || EPREFIX=
76 +
77 econf \
78 - --with-config-dir=/etc/${PN} \
79 - --with-default-config-file=/etc/${PN}/${PN}.conf \
80 - --with-database-dir=/var/lib/${PN}/db \
81 - --with-cgi-bin-dir=/var/www/localhost/cgi-bin \
82 - --with-search-dir=/var/www/localhost/htdocs/${PN} \
83 - --with-image-dir=/var/www/localhost/htdocs/${PN} \
84 + --with-config-dir="${EPREFIX}"/etc/${PN} \
85 + --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
86 + --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
87 + --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
88 + --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
89 + --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
90 $(use_with ssl)
91
92 -# --with-image-url-prefix=file:///var/www/localhost/htdocs/${PN} \
93 +# --with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
94
95 emake || die "emake failed"
96 }
97
98 src_install () {
99 + use prefix || ED="${D}"
100 +
101 emake DESTDIR="${D}" install || die "make install failed"
102
103 dodoc ChangeLog README
104 dohtml -r htdoc
105
106 sed -i "s:${D}::g" \
107 - "${D}"/etc/${PN}/${PN}.conf \
108 - "${D}"/usr/bin/rundig \
109 + "${ED}"/etc/${PN}/${PN}.conf \
110 + "${ED}"/usr/bin/rundig \
111 || die "sed failed (removing \${D} from installed files)"
112
113 # symlink htsearch so it can be easily found. see bug #62087