* [gentoo-commits] gentoo-x86 commit in dev-libs/marisa: marisa-0.2.4.ebuild metadata.xml ChangeLog
@ 2015-02-01 12:26 99% Michal Gorny (mgorny)
0 siblings, 0 replies; 1+ results
From: Michal Gorny (mgorny) @ 2015-02-01 12:26 UTC (permalink / raw
To: gentoo-commits
mgorny 15/02/01 12:26:01
Modified: marisa-0.2.4.ebuild metadata.xml ChangeLog
Log:
Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.3 dev-libs/marisa/marisa-0.2.4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild?r1=1.2&r2=1.3
Index: marisa-0.2.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- marisa-0.2.4.ebuild 29 Nov 2014 10:42:23 -0000 1.2
+++ marisa-0.2.4.ebuild 1 Feb 2015 12:26:01 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.2 2014/11/29 10:42:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/marisa-0.2.4.ebuild,v 1.3 2015/02/01 12:26:01 mgorny Exp $
EAPI=5
@@ -16,59 +16,69 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="python doc static-libs sse2 sse3 ssse3 sse4.1 sse4.2 sse4 sse4a popcnt"
+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"
DEPEND="python? ( dev-lang/swig ${PYTHON_DEPS} )"
RDEPEND="python? ( ${PYTHON_DEPS} )"
+# implied by --enable switches
+REQUIRED_USE="
+ cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+"
+
src_prepare() {
epatch "${FILESDIR}/${P}-python.patch"
if use python; then
- pushd bindings/python
- ln -sf ../marisa-swig.i marisa-swig.i
- ln -sf ../marisa-swig.h marisa-swig.h
- ln -sf ../marisa-swig.cxx marisa-swig.cxx
+ pushd bindings/python || die
+ ln -sf ../marisa-swig.i marisa-swig.i || die
+ ln -sf ../marisa-swig.h marisa-swig.h || die
+ ln -sf ../marisa-swig.cxx marisa-swig.cxx || die
distutils-r1_src_prepare
- popd
+ popd || die
fi
}
src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
- $(use_enable sse2)
- $(use_enable sse3)
- $(use_enable ssse3)
- $(use_enable sse4.1)
- $(use_enable sse4.2)
- $(use_enable sse4)
- $(use_enable sse4a)
- $(use_enable popcnt)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_sse3 sse3)
+ $(use_enable cpu_flags_x86_ssse3 ssse3)
+ $(use_enable cpu_flags_x86_sse4_1 sse4.1)
+ $(use_enable cpu_flags_x86_sse4_2 sse4.2)
+ # sse4 is just an alias to sse4.2
+ $(use_enable cpu_flags_x86_sse4a sse4a)
+ $(use_enable cpu_flags_x86_popcnt popcnt)
)
econf "${myeconfargs[@]}"
if use python; then
- pushd bindings/python
+ pushd bindings/python || die
distutils-r1_src_prepare
- popd
+ popd || die
fi
}
src_compile() {
default
if use python; then
- pushd bindings/python
+ pushd bindings/python || die
distutils-r1_src_compile
- popd
+ popd || die
fi
}
src_install() {
default
if use python; then
- pushd bindings/python
+ pushd bindings/python || die
distutils-r1_src_install
- popd
+ popd || die
fi
use doc && dohtml docs/readme.en.html
prune_libtool_files
1.2 dev-libs/marisa/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/metadata.xml?r1=1.1&r2=1.2
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml 22 Aug 2014 02:45:53 -0000 1.1
+++ metadata.xml 1 Feb 2015 12:26:01 -0000 1.2
@@ -2,13 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<longdescription lang="en">
-</longdescription>
-<use>
- <flag name='sse4.1'>Enable sse4.1 instruction support</flag>
- <flag name='sse4.2'>Enable sse4.2 instruction support</flag>
- <flag name='sse4'>Enable sse4 instruction support</flag>
- <flag name='sse4a'>Enable sse4a instruction support</flag>
- <flag name='popcnt'>Enable popcnt instruction support</flag>
-</use>
</pkgmetadata>
1.3 dev-libs/marisa/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/marisa/ChangeLog?r1=1.2&r2=1.3
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog 29 Nov 2014 10:42:23 -0000 1.2
+++ ChangeLog 1 Feb 2015 12:26:01 -0000 1.3
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/marisa
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v 1.2 2014/11/29 10:42:23 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/marisa/ChangeLog,v 1.3 2015/02/01 12:26:01 mgorny Exp $
+
+ 01 Feb 2015; Michał Górny <mgorny@gentoo.org> marisa-0.2.4.ebuild,
+ metadata.xml:
+ Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die.
29 Nov 2014; Pacho Ramos <pacho@gentoo.org> marisa-0.2.4.ebuild:
Support python 3.4
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-02-01 12:26 99% [gentoo-commits] gentoo-x86 commit in dev-libs/marisa: marisa-0.2.4.ebuild metadata.xml ChangeLog Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox