From 87d74c94493627d79da41e3960483c94c33ddda3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 1 Feb 2015 12:26:04 +0000 Subject: [PATCH] Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEFB4464E! --- dev-libs/marisa/ChangeLog | 8 +++-- dev-libs/marisa/Manifest | 24 +++++++++---- dev-libs/marisa/marisa-0.2.4.ebuild | 54 +++++++++++++++++------------ dev-libs/marisa/metadata.xml | 9 ----- 4 files changed, 56 insertions(+), 39 deletions(-) diff --git a/dev-libs/marisa/ChangeLog b/dev-libs/marisa/ChangeLog index 2ef05867f6c2..96b261df2827 100644 --- a/dev-libs/marisa/ChangeLog +++ b/dev-libs/marisa/ChangeLog @@ -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 marisa-0.2.4.ebuild, + metadata.xml: + Convert to CPU_FLAGS_X86. Add correct REQUIRED_USE. Add missing ||die. 29 Nov 2014; Pacho Ramos marisa-0.2.4.ebuild: Support python 3.4 diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest index ff5bf6419ba8..4d76742ea109 100644 --- a/dev-libs/marisa/Manifest +++ b/dev-libs/marisa/Manifest @@ -3,13 +3,25 @@ Hash: SHA256 AUX marisa-0.2.4-python.patch 683 SHA256 f04c4cd3fb7c24d5b1879cc39419d99a13eddc3e4563998aacc1355e3f469324 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700 WHIRLPOOL 37252e462eb368f86a1b6d844dc53f536b40c9ef78bbf555a7810d4f2090eb9237e906d815402baeada75114db4fa2bc36bc96e0b1d6322bc18e3a5763c0d3a6 DIST marisa-0.2.4.tar.gz 502552 SHA256 67a7a4f70d3cc7b0a85eb08f10bc3eaf6763419f0c031f278c1f919121729fb3 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4 WHIRLPOOL bf902c90b70bf81209e6e86fd15962c8ff7f811fb168fba0688200ab11f29c36199223311ea8d15a891fcb170745587cce7c2e3e4d2ed7e158af9d1d9841b3e4 -EBUILD marisa-0.2.4.ebuild 1625 SHA256 48fbda3e6ff502e9515acbc4aa4ee96c81353d62ad7453a47fe90fc6735a8fd6 SHA512 95b4d73079a04b4569312038c13886faa3bbab558ce543d80f88485cddec6bf3fcca4463ca565f6697745526eabac3a63cecbf0ff9de5d2c984a07a57a462af7 WHIRLPOOL d21086989ced0a5ae43156f0e7486fa06ac3990d5011a1bf702f97379a9738e93d10cd67909ec265510d985f50981babcd7171cc07be8d092c1d57febb01cd1c -MISC ChangeLog 472 SHA256 5b23f7480d8a5bfb70348cc97af8d5f41cbaf47b9f450490c506c091019621f8 SHA512 c23079a9baa2295e37fc76a960c7324736ab7a640eaa11aae9815cc1474802955573e085ef2e654f640f7e35232781c5e9a6889aca411a749f1fdf1f36c6eb96 WHIRLPOOL 04a9f7785e80a55a0b34cb4bbc4e585c51a04287485a7cf3a3684715e16675c50da24e01977a3f8b441a5bff834ecd8907e3f448aca186b5dd6d21b334c77b67 -MISC metadata.xml 520 SHA256 9ebd68aa16f8f9cda4f283f14352719fea8a965301667e8403234663343798ae SHA512 2796c108e08532f7a8b810de3bef9f84b108a921b88690065f69501a4445685792c8e735f7536ffedc3a4e2f30a9128702cc630deb852a8a6c4e059797516082 WHIRLPOOL 518c763c8245ceaa4f8d4f1c41a15d0611c772c88db715d647af2055a152cc8aca0fa7d117100ccbe65c943c7cc5ea01a1b72ae1ed8c9374f1f678f0e3ce6906 +EBUILD marisa-0.2.4.ebuild 2318 SHA256 4ef2f2f3b4a19d9ecae3f292d0259926669fec815c9ce01c3eb7eeb874a10d3c SHA512 7243998a8e071b77a07b21ef03429502912f037c48ccd2ff49c80791a676960a1afdb22177fa07fc2183e6ab20ce3cea1bb865c7188847df42a84588f1d3552c WHIRLPOOL 8c5da51a00710be8fc4e865f2b7318595990cdf7621176d6d37b65c06cb9ae2a7462ed18e955bd494325fc9c970f0e7cc81ebbbc2332232d44ea5fcec6604acb +MISC ChangeLog 634 SHA256 bbfe569bd87c3ccc48f951688283f24b35d361b5933b238ace508afbe58fe716 SHA512 81c8f69d698660861617a5b8bffd3f939e3504b3fd1c1b51185911003c0cb184d51ddc23be5766c9b762aa91c7c1adbef2cd03def86e3f3aee5fbdf10de56ac7 WHIRLPOOL 6c738ba28b2bb6acbdc5b1f86803ecf11f20ff9737b6ad06a249ff922560617fee36814de5f27ac4d0ed33b1936a6b546244d21e0fef2a485808fd8383b2b5df +MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlR5oxIACgkQCaWpQKGI+9QpVQCggoJ+ZYDjfTWcTjzPC5icu965 -Gs8An1dq6Bz1v+Y5CjSJMOgbrjvWteib -=zAst +iQJ8BAEBCABmBQJUzhtcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOpW8P/jXCabiv+xwruLpvEnwBnryb +HvOem6MguPWoWp0Drqj1vML/eYMAjfDC2oqL7NulohnBSsjaeB14bcwV/JjsXLtM +qS8/kqBgVHxX1ipEidKIBK/USE2slvybP8iRdEoK5MzbYz5f9ydeaZPseTbSHHrx +4cHcT6s0TomfaXoGz+yNS3z0QpwHMdrOVcaMEkCYasKZyWwCivP/M04qN0pigpU7 +XNIicKfK2nbebCWqsVMQTDne1HVljyDbQy1lumtLwHu1eD/9/a4kiIdPuOFoGqdW +2NU6EUqqBbf1AndLbEmJjSBrDcdXMibHIMpmhec6pCMZRPwel8Mzu3wbl+gZ12wu +wGzqsKap5/8jarqM5lqKx3QHzLYOj7anYzsFrpZyr8jogOFoLBbbzJTW+TxLElek +GZiPX9tj+dFjHfhnORu2N5u7Geudzd4iPOSfbjUCG6JGZvd531gZmZJCKCE5R+tI +oJBRQNBxw51muXzd+FPlVG6gVmX5BQxHNjOIGghepd0K8Au+v3P+1VLMFP3+R+bC +dSLK8TZu9kkCGpmKdwop1KIlohmQ/1w5w+tLUAQEY9oC4dm2dcIXez5xKbOv+P2/ +SpVnX4wyL08a5ub5819Dv5uyzf7kvMpu8IufRGYPKDazDpmTrPl8exTQrFAp4Kf1 +YUa5oLS6DmwILpMrsruM +=zT5B -----END PGP SIGNATURE----- diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild index b9bbecd58c93..e767a7643a70 100644 --- a/dev-libs/marisa/marisa-0.2.4.ebuild +++ b/dev-libs/marisa/marisa-0.2.4.ebuild @@ -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 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz" 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 diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml index 03958eb9d561..2d5852c16c60 100644 --- a/dev-libs/marisa/metadata.xml +++ b/dev-libs/marisa/metadata.xml @@ -2,13 +2,4 @@ cjk - - - - Enable sse4.1 instruction support - Enable sse4.2 instruction support - Enable sse4 instruction support - Enable sse4a instruction support - Enable popcnt instruction support - -- 2.26.2