Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michal Gorny (mgorny)" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/marisa: marisa-0.2.4.ebuild metadata.xml ChangeLog
Date: Sun, 01 Feb 2015 12:26:05
Message-Id: 20150201122601.F381210D29@oystercatcher.gentoo.org
1 mgorny 15/02/01 12:26:01
2
3 Modified: marisa-0.2.4.ebuild metadata.xml ChangeLog
4 Log:
5 Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die.
6
7 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
8
9 Revision Changes Path
10 1.3 dev-libs/marisa/marisa-0.2.4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?r1=1.2&r2=1.3
15
16 Index: marisa-0.2.4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- marisa-0.2.4.ebuild 29 Nov 2014 10:42:23 -0000 1.2
23 +++ marisa-0.2.4.ebuild 1 Feb 2015 12:26:01 -0000 1.3
24 @@ -1,6 +1,6 @@
25 -# Copyright 1999-2014 Gentoo Foundation
26 +# Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.2 2014/11/29 10:42:23 pacho Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.3 2015/02/01 12:26:01 mgorny Exp $
30
31 EAPI=5
32
33 @@ -16,59 +16,69 @@
34 LICENSE="BSD"
35 SLOT="0"
36 KEYWORDS="~amd64 ~x86"
37 -IUSE="python doc static-libs sse2 sse3 ssse3 sse4.1 sse4.2 sse4 sse4a popcnt"
38 +IUSE="python doc static-libs cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_sse4a cpu_flags_x86_popcnt"
39
40 DEPEND="python? ( dev-lang/swig ${PYTHON_DEPS} )"
41 RDEPEND="python? ( ${PYTHON_DEPS} )"
42
43 +# implied by --enable switches
44 +REQUIRED_USE="
45 + cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 )
46 + cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 )
47 + cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 )
48 + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
49 + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
50 + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
51 +"
52 +
53 src_prepare() {
54 epatch "${FILESDIR}/${P}-python.patch"
55 if use python; then
56 - pushd bindings/python
57 - ln -sf ../marisa-swig.i marisa-swig.i
58 - ln -sf ../marisa-swig.h marisa-swig.h
59 - ln -sf ../marisa-swig.cxx marisa-swig.cxx
60 + pushd bindings/python || die
61 + ln -sf ../marisa-swig.i marisa-swig.i || die
62 + ln -sf ../marisa-swig.h marisa-swig.h || die
63 + ln -sf ../marisa-swig.cxx marisa-swig.cxx || die
64 distutils-r1_src_prepare
65 - popd
66 + popd || die
67 fi
68 }
69
70 src_configure() {
71 local myeconfargs=(
72 $(use_enable static-libs static)
73 - $(use_enable sse2)
74 - $(use_enable sse3)
75 - $(use_enable ssse3)
76 - $(use_enable sse4.1)
77 - $(use_enable sse4.2)
78 - $(use_enable sse4)
79 - $(use_enable sse4a)
80 - $(use_enable popcnt)
81 + $(use_enable cpu_flags_x86_sse2 sse2)
82 + $(use_enable cpu_flags_x86_sse3 sse3)
83 + $(use_enable cpu_flags_x86_ssse3 ssse3)
84 + $(use_enable cpu_flags_x86_sse4_1 sse4.1)
85 + $(use_enable cpu_flags_x86_sse4_2 sse4.2)
86 + # sse4 is just an alias to sse4.2
87 + $(use_enable cpu_flags_x86_sse4a sse4a)
88 + $(use_enable cpu_flags_x86_popcnt popcnt)
89 )
90 econf "${myeconfargs[@]}"
91
92 if use python; then
93 - pushd bindings/python
94 + pushd bindings/python || die
95 distutils-r1_src_prepare
96 - popd
97 + popd || die
98 fi
99 }
100
101 src_compile() {
102 default
103 if use python; then
104 - pushd bindings/python
105 + pushd bindings/python || die
106 distutils-r1_src_compile
107 - popd
108 + popd || die
109 fi
110 }
111
112 src_install() {
113 default
114 if use python; then
115 - pushd bindings/python
116 + pushd bindings/python || die
117 distutils-r1_src_install
118 - popd
119 + popd || die
120 fi
121 use doc && dohtml docs/readme.en.html
122 prune_libtool_files
123
124
125
126 1.2 dev-libs/marisa/metadata.xml
127
128 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?rev=1.2&view=markup
129 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?rev=1.2&content-type=text/plain
130 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?r1=1.1&r2=1.2
131
132 Index: metadata.xml
133 ===================================================================
134 RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/metadata.xml,v
135 retrieving revision 1.1
136 retrieving revision 1.2
137 diff -u -r1.1 -r1.2
138 --- metadata.xml 22 Aug 2014 02:45:53 -0000 1.1
139 +++ metadata.xml 1 Feb 2015 12:26:01 -0000 1.2
140 @@ -2,13 +2,4 @@
141 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
142 <pkgmetadata>
143 <herd>cjk</herd>
144 -<longdescription lang="en">
145 -</longdescription>
146 -<use>
147 - <flag name='sse4.1'>Enable sse4.1 instruction support</flag>
148 - <flag name='sse4.2'>Enable sse4.2 instruction support</flag>
149 - <flag name='sse4'>Enable sse4 instruction support</flag>
150 - <flag name='sse4a'>Enable sse4a instruction support</flag>
151 - <flag name='popcnt'>Enable popcnt instruction support</flag>
152 -</use>
153 </pkgmetadata>
154
155
156
157 1.3 dev-libs/marisa/ChangeLog
158
159 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?rev=1.3&view=markup
160 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?rev=1.3&content-type=text/plain
161 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?r1=1.2&r2=1.3
162
163 Index: ChangeLog
164 ===================================================================
165 RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v
166 retrieving revision 1.2
167 retrieving revision 1.3
168 diff -u -r1.2 -r1.3
169 --- ChangeLog 29 Nov 2014 10:42:23 -0000 1.2
170 +++ ChangeLog 1 Feb 2015 12:26:01 -0000 1.3
171 @@ -1,6 +1,10 @@
172 # ChangeLog for dev-libs/marisa
173 -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
174 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v 1.2 2014/11/29 10:42:23 pacho Exp $
175 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
176 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v 1.3 2015/02/01 12:26:01 mgorny Exp $
177 +
178 + 01 Feb 2015; Michał Górny <mgorny@g.o> marisa-0.2.4.ebuild,
179 + metadata.xml:
180 + Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die.
181
182 29 Nov 2014; Pacho Ramos <pacho@g.o> marisa-0.2.4.ebuild:
183 Support python 3.4
Report Message
Find on MARC Find on Google Groups