From 52f895faaaf01579a8d9528cafec20bf2c873f5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Jan 2020 22:43:15 +0000 Subject: gentoo resync : 17.01.2010 --- dev-libs/marisa/Manifest | 3 - dev-libs/marisa/files/marisa-0.2.4-python.patch | 15 ----- dev-libs/marisa/marisa-0.2.4.ebuild | 86 ------------------------- 3 files changed, 104 deletions(-) delete mode 100644 dev-libs/marisa/files/marisa-0.2.4-python.patch delete mode 100644 dev-libs/marisa/marisa-0.2.4.ebuild (limited to 'dev-libs/marisa') diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest index 21378a470c88..f0804870a160 100644 --- a/dev-libs/marisa/Manifest +++ b/dev-libs/marisa/Manifest @@ -1,8 +1,5 @@ -AUX marisa-0.2.4-python.patch 683 BLAKE2B 5d26607877b3f4614a558d085de11360783d2a448749e7a7fed2ac805e4b6dc5d4b89c29c37fe70a34cc4745789b9ff93b4f398860d8014303a4290bbd1196c5 SHA512 fa718a385cfef196833f5a9aa23c31839505a0101df3d25a73616942845668891f818213b89a36689ec93e678289128add1f6450e15fb995233621faaa76d700 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2 -DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547 -EBUILD marisa-0.2.4.ebuild 2304 BLAKE2B d6a532c61ce90997b21f0fe4ba78921cfed56a0cb37fd581104a4f5ad4dfc0d344fffea0e06522ef95c2dfb9a1ba61587521da0ea5b93d7fd79c67bb526f06e2 SHA512 36954927ec4154e43b01f7498dcc25ad5d6f46e463af3bd82275a3bd3adc1a010f783a05881537de801582df5d8795c53c627016cb77620d0741edeab47f9a8e EBUILD marisa-0.2.5.ebuild 2229 BLAKE2B 892624c70436db9f826a843def566b081a5062ceee70f59d59fd5f2c63944c1fe05d8cef3c0da48cbd259f6c42e07815042d06eace22cd81820a8ec192887db6 SHA512 07e5e79b72d0d8b0a6b77c39741fcfb58dc9b03b5bf6493005a060ff0e28e26f4ecfdf3e490fdfd0d67dbed90fa86d5afdf4f70bafb3bf13970b19221875c337 EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285 MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c diff --git a/dev-libs/marisa/files/marisa-0.2.4-python.patch b/dev-libs/marisa/files/marisa-0.2.4-python.patch deleted file mode 100644 index fba0e016d475..000000000000 --- a/dev-libs/marisa/files/marisa-0.2.4-python.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- bindings/python/setup.py 2011-05-14 07:20:52.000000000 +0200 -+++ bindings/python/setup.py 2013-08-02 17:04:16.423771834 +0200 -@@ -1,8 +1,10 @@ - from distutils.core import setup, Extension - - marisa_module = Extension("_marisa", -- sources=["marisa-swig_wrap.cxx", "marisa-swig.cxx"], -- libraries=["marisa"]) -+ sources=["marisa-swig.i", "marisa-swig.cxx"], -+ swig_opts=["-c++"], -+ libraries=["marisa"], library_dirs=["../../lib/.libs"], -+ include_dirs=["../../lib"]) - - setup(name = "marisa", - ext_modules = [marisa_module], diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild deleted file mode 100644 index 94066df3c186..000000000000 --- a/dev-libs/marisa/marisa-0.2.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_6} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 eutils - -DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge" -HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/" -SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86" -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" - -RDEPEND="python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - python? ( dev-lang/swig )" - -# 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 ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -src_prepare() { - epatch "${FILESDIR}/${P}-python.patch" - if use python; then - 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 || die - fi -} - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(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 || die - distutils-r1_src_configure - popd || die - fi -} - -src_compile() { - default - if use python; then - pushd bindings/python || die - distutils-r1_src_compile - popd || die - fi -} - -src_install() { - default - if use python; then - pushd bindings/python || die - distutils-r1_src_install - popd || die - fi - use doc && dohtml docs/readme.en.html - prune_libtool_files -} -- cgit v1.2.3