Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/sphinx: ChangeLog sphinx-0.9.9-r1.ebuild sphinx-1.10_beta.ebuild
Date: Tue, 02 Nov 2010 18:13:21
Message-Id: 20101102181316.46D1E20051@flycatcher.gentoo.org
1 grobian 10/11/02 18:13:16
2
3 Modified: ChangeLog sphinx-0.9.9-r1.ebuild
4 sphinx-1.10_beta.ebuild
5 Log:
6 Fix ebuilds for Prefix, keyworded 0.9.9-r1 ~ppc-macos
7
8 (Portage version: 2.2.01.17133-prefix/cvs/Darwin powerpc)
9
10 Revision Changes Path
11 1.30 app-misc/sphinx/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/ChangeLog?rev=1.30&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/ChangeLog?rev=1.30&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/ChangeLog?r1=1.29&r2=1.30
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v
20 retrieving revision 1.29
21 retrieving revision 1.30
22 diff -u -r1.29 -r1.30
23 --- ChangeLog 21 Jul 2010 13:02:45 -0000 1.29
24 +++ ChangeLog 2 Nov 2010 18:13:16 -0000 1.30
25 @@ -1,6 +1,10 @@
26 # ChangeLog for app-misc/sphinx
27 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.29 2010/07/21 13:02:45 graaff Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.30 2010/11/02 18:13:16 grobian Exp $
30 +
31 + 02 Nov 2010; Fabian Groffen <grobian@g.o> sphinx-0.9.9-r1.ebuild,
32 + sphinx-1.10_beta.ebuild:
33 + Fix ebuilds for Prefix, keyworded 0.9.9-r1 ~ppc-macos
34
35 *sphinx-1.10_beta (21 Jul 2010)
36
37
38
39
40 1.2 app-misc/sphinx/sphinx-0.9.9-r1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild?rev=1.2&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild?rev=1.2&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild?r1=1.1&r2=1.2
45
46 Index: sphinx-0.9.9-r1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild,v
49 retrieving revision 1.1
50 retrieving revision 1.2
51 diff -u -r1.1 -r1.2
52 --- sphinx-0.9.9-r1.ebuild 20 Jun 2010 15:25:25 -0000 1.1
53 +++ sphinx-0.9.9-r1.ebuild 2 Nov 2010 18:13:16 -0000 1.2
54 @@ -1,8 +1,8 @@
55 # Copyright 1999-2010 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild,v 1.1 2010/06/20 15:25:25 graaff Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.9-r1.ebuild,v 1.2 2010/11/02 18:13:16 grobian Exp $
59
60 -EAPI=2
61 +EAPI=3
62 inherit eutils autotools
63
64 MY_P=${P/_/-}
65 @@ -18,7 +18,7 @@
66
67 LICENSE="GPL-2"
68 SLOT="0"
69 -KEYWORDS="~amd64 ~x86"
70 +KEYWORDS="~amd64 ~x86 ~ppc-macos"
71 IUSE="debug id64 mysql postgres stemmer test"
72
73 RDEPEND="mysql? ( virtual/mysql )
74 @@ -37,12 +37,14 @@
75 }
76
77 src_prepare() {
78 + # drop nasty hardcoded search path breaking Prefix
79 + sed -i -e '/\/usr\/local\//d' configure.ac || die
80 eautoreconf
81 }
82
83 src_configure() {
84 econf \
85 - --sysconfdir="/etc/${PN}" \
86 + --sysconfdir="${EPREFIX}/etc/${PN}" \
87 $(use_enable id64) \
88 $(use_with debug) \
89 $(use_with mysql) \
90
91
92
93 1.2 app-misc/sphinx/sphinx-1.10_beta.ebuild
94
95 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild?rev=1.2&view=markup
96 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild?rev=1.2&content-type=text/plain
97 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild?r1=1.1&r2=1.2
98
99 Index: sphinx-1.10_beta.ebuild
100 ===================================================================
101 RCS file: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild,v
102 retrieving revision 1.1
103 retrieving revision 1.2
104 diff -u -r1.1 -r1.2
105 --- sphinx-1.10_beta.ebuild 21 Jul 2010 13:02:45 -0000 1.1
106 +++ sphinx-1.10_beta.ebuild 2 Nov 2010 18:13:16 -0000 1.2
107 @@ -1,8 +1,8 @@
108 # Copyright 1999-2010 Gentoo Foundation
109 # Distributed under the terms of the GNU General Public License v2
110 -# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild,v 1.1 2010/07/21 13:02:45 graaff Exp $
111 +# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-1.10_beta.ebuild,v 1.2 2010/11/02 18:13:16 grobian Exp $
112
113 -EAPI=2
114 +EAPI=3
115 inherit eutils autotools
116
117 MY_P=${P/_/-}
118 @@ -38,12 +38,14 @@
119 }
120
121 src_prepare() {
122 + # drop nasty hardcoded search path breaking Prefix
123 + sed -i -e '/\/usr\/local\//d' configure.ac || die
124 eautoreconf
125 }
126
127 src_configure() {
128 econf \
129 - --sysconfdir="/etc/${PN}" \
130 + --sysconfdir="${EPREFIX}/etc/${PN}" \
131 $(use_enable id64) \
132 $(use_with debug) \
133 $(use_with mysql) \