* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2016-05-19 7:21 Naohiro Aota
0 siblings, 0 replies; 31+ messages in thread
From: Naohiro Aota @ 2016-05-19 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 21a10cf3f44ca29a2806500050aa6d3fc73c110c
Author: Naohiro Aota <naota <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 07:20:32 2016 +0000
Commit: Naohiro Aota <naota <AT> gentoo <DOT> org>
CommitDate: Thu May 19 07:20:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a10cf3
dev-libs/maris: fix calling distutils-r1_src_prepare in src_configure #583078
Package-Manager: portage-2.2.28
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index e1e0cdb..dc79664 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -59,7 +59,7 @@ src_configure() {
if use python; then
pushd bindings/python || die
- distutils-r1_src_prepare
+ distutils-r1_src_configure
popd || die
fi
}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2017-04-24 9:31 Pacho Ramos
0 siblings, 0 replies; 31+ messages in thread
From: Pacho Ramos @ 2017-04-24 9:31 UTC (permalink / raw
To: gentoo-commits
commit: 84b3bf404e12c72e1a3a264d79b66aade0719126
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 24 08:54:34 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Apr 24 09:31:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b3bf40
dev-libs/marisa: Support newer python
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 53e6787bcb3..36c191d1005 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 eutils
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2017-10-23 17:24 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2017-10-23 17:24 UTC (permalink / raw
To: gentoo-commits
commit: ef6577fbb5d94660ad21da9bd6d67a71aace0996
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Oct 19 19:31:38 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 17:24:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6577fb
dev-libs/marisa: Update HOMEPAGE.
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
dev-libs/marisa/metadata.xml | 11 +++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 36c191d1005..8a65a67a559 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_OPTIONAL=1
inherit distutils-r1 eutils
DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
-HOMEPAGE="https://code.google.com/p/marisa-trie/"
+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"
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index c921b96adf6..4aa8461d2b5 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>cjk@gentoo.org</email>
- <name>Cjk</name>
-</maintainer>
+ <maintainer type="project">
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">s-yata/marisa-trie</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2017-11-01 20:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2017-11-01 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 7270af956ce4c048c2097e3f1abd43ebfb064353
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Nov 1 11:36:07 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 1 20:54:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7270af95
dev-libs/marisa: Stabilize 0.2.4 on x86.
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 8a65a67a559..34a3dceb948 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ppc64 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} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2017-11-18 10:13 Sergei Trofimovich
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Trofimovich @ 2017-11-18 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 93c4b79ccf421916ad7abe2801b0879d94a26368
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 18 10:12:43 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 18 10:12:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c4b79c
dev-libs/marisa: stable 0.2.4 for ppc, bug #636226
Package-Manager: Portage-2.3.14, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 34a3dceb948..8f2ea0a1c7e 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 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} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-08-30 18:39 Sergei Trofimovich
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Trofimovich @ 2019-08-30 18:39 UTC (permalink / raw
To: gentoo-commits
commit: b8462bfc062bdfdf5c8e2edb65410935f1fbdbbd
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Aug 30 17:50:41 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 18:38:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8462bfc
dev-libs/marisa: keyworded 0.2.4 for sparc, bug #693040
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.4.ebuild b/dev-libs/marisa/marisa-0.2.4.ebuild
index 365ab5407b2..e9dfa471d31 100644
--- a/dev-libs/marisa/marisa-0.2.4.ebuild
+++ b/dev-libs/marisa/marisa-0.2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://marisa-trie.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+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} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-09-29 2:56 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2019-09-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 9197f5d0d6299d66d87c54b8c9f8aed2c1aa18e0
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 28 02:02:14 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 02:56:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9197f5d0
dev-libs/marisa: Version bump (0.2.5).
Drop support for Python 2.7.
Bug: https://bugs.gentoo.org/695004
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/Manifest | 1 +
dev-libs/marisa/marisa-0.2.5.ebuild | 106 ++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+)
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 2939d5c5499..816030c1f7a 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1 +1,2 @@
DIST marisa-0.2.4.tar.gz 502552 BLAKE2B aa8e6ce11c35db41f386d1c5d3ffdf56a940f298e10a7f6b1fa14cb80c27c9c4af1d4d61c58786f96e9598effe26379127c69b8fe72b1ca561a44ee2b9cddc61 SHA512 71aee3ae034d1ce725d986bef43472d61bd64f0af3ccda01bb019cce03f0872629b6a1b305e717056bef06e036372323b2a67e5dc69705d6a74e028b5e2553e4
+DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
new file mode 100644
index 00000000000..e7ec8bf4f0d
--- /dev/null
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+DISTUTILS_OPTIONAL="1"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="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 python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 )
+ cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 )
+ cpu_flags_x86_sse4_2? ( cpu_flags_x86_popcnt cpu_flags_x86_sse4_1 )
+ cpu_flags_x86_sse4a? ( cpu_flags_x86_popcnt cpu_flags_x86_sse3 )
+ cpu_flags_x86_popcnt? ( cpu_flags_x86_sse3 )"
+
+BDEPEND="python? (
+ ${PYTHON_DEPS}
+ dev-lang/swig
+ )"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+ S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ fi
+}
+
+src_configure() {
+ local options=(
+ $(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)
+ $(use_enable cpu_flags_x86_sse4a sse4a)
+ $(use_enable cpu_flags_x86_popcnt popcnt)
+ $(use_enable static-libs static)
+ )
+
+ econf "${options[@]}"
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ default
+
+ if use python; then
+ emake -C bindings swig-python
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -type f -delete || die
+
+ (
+ docinto html
+ dodoc docs/*
+ )
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+ fi
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-09-29 2:56 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2019-09-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 22f801fbd761ae7be0a824b1d336c0e3657408fd
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 28 02:15:03 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 02:56:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22f801fb
dev-libs/marisa: Add live ebuild.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-9999.ebuild | 104 +++++++++++++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
new file mode 100644
index 00000000000..6942f85b198
--- /dev/null
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2014-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7})
+DISTUTILS_OPTIONAL="1"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS=""
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+ ${PYTHON_DEPS}
+ dev-lang/swig
+ )"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+ S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ fi
+}
+
+src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+ local options=(
+ # Preprocessor macros dependent on CPPFLAGS are checked.
+ --enable-sse2
+ --enable-sse3
+ --enable-ssse3
+ --enable-sse4.1
+ --enable-sse4.2
+ --enable-sse4
+ --enable-sse4a
+ --enable-popcnt
+ $(use_enable static-libs static)
+ )
+
+ econf "${options[@]}"
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ default
+
+ if use python; then
+ emake -C bindings swig-python
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ default
+ find "${D}" -name "*.la" -type f -delete || die
+
+ (
+ docinto html
+ dodoc docs/*
+ )
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+ fi
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-12-06 20:25 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2019-12-06 20:25 UTC (permalink / raw
To: gentoo-commits
commit: e905c1f29000e88735f7e6483dfca70370c457ad
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Dec 6 07:02:27 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Dec 6 20:24:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e905c1f2
dev-libs/marisa: Stabilize 0.2.5 on amd64/x86.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 90b71175c86..df3af8c34a4 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-12-31 8:15 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2019-12-31 8:15 UTC (permalink / raw
To: gentoo-commits
commit: 324a9b1150707f84142b1df8692120b538674502
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 08:15:44 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 08:15:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324a9b11
dev-libs/marisa: ppc stable wrt bug #704258
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index df3af8c34a4..5415ea20119 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-12-31 8:18 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2019-12-31 8:18 UTC (permalink / raw
To: gentoo-commits
commit: ae7abb949875285d6c283f3fbbe23d7eebbf56c4
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 08:17:30 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 08:17:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae7abb94
dev-libs/marisa: ppc64 stable wrt bug #704258
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 5415ea20119..59f42daad26 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2019-12-31 18:08 Aaron Bauman
0 siblings, 0 replies; 31+ messages in thread
From: Aaron Bauman @ 2019-12-31 18:08 UTC (permalink / raw
To: gentoo-commits
commit: b545cc3797b8840f5fd3c9abb7d55b7604ceb143
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 18:07:19 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 18:07:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b545cc37
dev-libs/marisa: arm64 stable (bug #704258)
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 59f42daad26..3379c58070f 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-02-08 12:50 Sergei Trofimovich
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Trofimovich @ 2020-02-08 12:50 UTC (permalink / raw
To: gentoo-commits
commit: efe8f0b4be0b7947ad5dedd7b27e48ea0d4799a7
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Feb 8 12:32:58 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 12:50:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe8f0b4
dev-libs/marisa: stable 0.2.5 for sparc, bug #704258
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 3379c58070f..4289f375ea6 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-12 21:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: c3f8224ec74ed46fdb47e97ccfa737261f2d4fe4
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Nov 12 01:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f8224e
dev-libs/marisa: Set DISTUTILS_USE_SETUPTOOLS="no".
Closes: https://bugs.gentoo.org/746287
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 1 +
dev-libs/marisa/marisa-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index d01438d3317..11ab370eff6 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -4,6 +4,7 @@
EAPI="7"
PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
inherit autotools distutils-r1
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index fd55f427647..0450f64682a 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -4,6 +4,7 @@
EAPI="7"
PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
inherit autotools distutils-r1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-12 21:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 7c40ca160c208b9685d32c1bf812b59152772474
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Nov 12 00:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:54:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c40ca16
dev-libs/marisa: Add support for Python 3.8 and 3.9.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 2 +-
dev-libs/marisa/marisa-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 4289f375ea6..d01438d3317 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
inherit autotools distutils-r1
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 6942f85b198..fd55f427647 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
inherit autotools distutils-r1
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-12 21:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 3901a6f4b767074586f5f2cc4583285296ff1b25
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Nov 12 02:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3901a6f4
dev-libs/marisa: Update code for selection of CPU instructions.
https://github.com/s-yata/marisa-trie/commit/bbcff46114eaf306ed26ec9e55ee3f3e1dc54f16
Unconditionally passing --enable-sse2, --enable-sse3 etc. no longer works.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-9999.ebuild | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 0450f64682a..2458eb10f41 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -55,16 +55,30 @@ src_prepare() {
src_configure() {
local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+ cpu_instructions_option() {
+ local option="${1}"
+ local macros="${2}"
+ local result="--enable-${option}"
+ local macro
+ for macro in ${macros}; do
+ if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+ result="--disable-${option}"
+ fi
+ done
+ echo "${result}"
+ }
+
local options=(
- # Preprocessor macros dependent on CPPFLAGS are checked.
- --enable-sse2
- --enable-sse3
- --enable-ssse3
- --enable-sse4.1
- --enable-sse4.2
- --enable-sse4
- --enable-sse4a
- --enable-popcnt
+ $(cpu_instructions_option sse2 __SSE2__)
+ $(cpu_instructions_option sse3 __SSE3__)
+ $(cpu_instructions_option ssse3 __SSSE3__)
+ $(cpu_instructions_option sse4.1 __SSE4_1__)
+ $(cpu_instructions_option sse4.2 __SSE4_2__)
+ $(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+ $(cpu_instructions_option sse4a __SSE4A__)
+ $(cpu_instructions_option popcnt __POPCNT__)
+ $(cpu_instructions_option bmi __BMI__)
+ $(cpu_instructions_option bmi2 __BMI2__)
$(use_enable static-libs static)
)
@@ -90,7 +104,7 @@ src_compile() {
src_install() {
default
- find "${D}" -name "*.la" -type f -delete || die
+ find "${ED}" -name "*.la" -delete || die
(
docinto html
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-12 21:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 32a2403c867a29ab463214e3faf0f169999234c6
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Nov 12 04:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32a2403c
dev-libs/marisa: Set maintainer Arfrever.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 4aa8461d2b5..f8feae5e9c2 100644
--- a/dev-libs/marisa/metadata.xml
+++ b/dev-libs/marisa/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>arfrever.fta@gmail.com</email>
+ <name>Arfrever Frehtes Taifersar Arahesis</name>
+ </maintainer>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-12 21:54 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-12 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 16a4c00c233ba738b080d27cedd0fa2aaf5eba0f
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Nov 12 03:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 21:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a4c00c
dev-libs/marisa: Version bump (0.2.6).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/Manifest | 1 +
dev-libs/marisa/marisa-0.2.6.ebuild | 119 ++++++++++++++++++++++++++++++++++++
2 files changed, 120 insertions(+)
diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 1a55c59ef89..7b524798645 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1 +1,2 @@
DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
+DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
new file mode 100644
index 00000000000..00044d3bada
--- /dev/null
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -0,0 +1,119 @@
+# Copyright 2014-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_SETUPTOOLS="no"
+
+inherit autotools distutils-r1
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/s-yata/marisa-trie"
+fi
+
+DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
+HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( BSD-2 LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="python? (
+ ${PYTHON_DEPS}
+ dev-lang/swig
+ )"
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" != "9999" ]]; then
+ S="${WORKDIR}/marisa-trie-${PV}"
+fi
+
+src_prepare() {
+ default
+ eautoreconf
+
+ sed -e "s:^\([[:space:]]*\)libraries=:\1include_dirs=[\"../../include\"],\n\1library_dirs=[\"../../lib/marisa/.libs\"],\n&:" -i bindings/python/setup.py || die
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_prepare
+ popd > /dev/null || die
+ fi
+}
+
+src_configure() {
+ local -x CPPFLAGS="${CPPFLAGS} ${CXXFLAGS}"
+
+ cpu_instructions_option() {
+ local option="${1}"
+ local macros="${2}"
+ local result="--enable-${option}"
+ local macro
+ for macro in ${macros}; do
+ if ! $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -Eq "^#define ${macro}([[:space:]]|$)"; then
+ result="--disable-${option}"
+ fi
+ done
+ echo "${result}"
+ }
+
+ local options=(
+ $(cpu_instructions_option sse2 __SSE2__)
+ $(cpu_instructions_option sse3 __SSE3__)
+ $(cpu_instructions_option ssse3 __SSSE3__)
+ $(cpu_instructions_option sse4.1 __SSE4_1__)
+ $(cpu_instructions_option sse4.2 __SSE4_2__)
+ $(cpu_instructions_option sse4 __POPCNT__ __SSE4_2__)
+ $(cpu_instructions_option sse4a __SSE4A__)
+ $(cpu_instructions_option popcnt __POPCNT__)
+ $(cpu_instructions_option bmi __BMI__)
+ $(cpu_instructions_option bmi2 __BMI2__)
+ $(use_enable static-libs static)
+ )
+
+ econf "${options[@]}"
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_configure
+ popd > /dev/null || die
+ fi
+}
+
+src_compile() {
+ default
+
+ if use python; then
+ emake -C bindings swig-python
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_compile
+ popd > /dev/null || die
+ fi
+}
+
+src_install() {
+ default
+ find "${ED}" -name "*.la" -delete || die
+
+ (
+ docinto html
+ dodoc docs/*
+ )
+
+ if use python; then
+ pushd bindings/python > /dev/null || die
+ distutils-r1_src_install
+ popd > /dev/null || die
+ fi
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2020-11-16 19:51 Mike Gilbert
0 siblings, 0 replies; 31+ messages in thread
From: Mike Gilbert @ 2020-11-16 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 0a9ed3f8677492b58304b04b278e6542ebec45f9
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Nov 13 06:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 19:51:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a9ed3f8
dev-libs/marisa: Inherit toolchain-funcs.eclass explicitly.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
dev-libs/marisa/marisa-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 00044d3bada..3f1328fe785 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
DISTUTILS_USE_SETUPTOOLS="no"
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 2458eb10f41..ac80bc2f060 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
DISTUTILS_OPTIONAL="1"
DISTUTILS_USE_SETUPTOOLS="no"
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
if [[ "${PV}" == "9999" ]]; then
inherit git-r3
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2021-01-05 14:14 Sergei Trofimovich
0 siblings, 0 replies; 31+ messages in thread
From: Sergei Trofimovich @ 2021-01-05 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 9f62c12e8719cc051d0bf760f82bf8e216581154
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Jan 5 11:59:44 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 14:13:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f62c12e
dev-libs/marisa: keyworded 0.2.6 for hppa, bug #760803
Package-Manager: Portage-3.0.12, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 3f1328fe785..388b89f6d58 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -24,7 +24,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-29 15:20 Yixun Lan
0 siblings, 0 replies; 31+ messages in thread
From: Yixun Lan @ 2022-01-29 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 8cf2efc4b563886026de93809d9d7abff232e706
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 20 05:00:00 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:19:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf2efc4
dev-libs/marisa: Delete unused DISTUTILS_USE_SETUPTOOLS.
Closes: https://bugs.gentoo.org/800290
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.5.ebuild | 5 ++---
dev-libs/marisa/marisa-0.2.6.ebuild | 1 -
dev-libs/marisa/marisa-9999.ebuild | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index bac968c1f7a8..af6c3b508d46 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit autotools distutils-r1
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 92816ee83d33..64ca06a03dae 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -4,7 +4,6 @@
EAPI="7"
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit autotools distutils-r1 toolchain-funcs
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index d86351ef18fa..e6edbfbf8d5b 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -4,7 +4,6 @@
EAPI="7"
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
-DISTUTILS_USE_SETUPTOOLS="no"
inherit autotools distutils-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-29 15:20 Yixun Lan
0 siblings, 0 replies; 31+ messages in thread
From: Yixun Lan @ 2022-01-29 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 0674820255e41c2c6d7b356a4fa5492c10153bf7
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 20 02:00:00 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:18:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06748202
dev-libs/marisa: Add support for Python 3.10.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 6 +++---
dev-libs/marisa/marisa-9999.ebuild | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index c958dfd64c35..92816ee83d33 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2021 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
DISTUTILS_USE_SETUPTOOLS="no"
@@ -40,7 +40,7 @@ if [[ "${PV}" != "9999" ]]; then
fi
PATCHES=(
- "${FILESDIR}"/${PN}-0.2.6-riscv_word_size.patch
+ "${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch"
)
src_prepare() {
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 929e4c4fe299..d86351ef18fa 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
DISTUTILS_USE_SETUPTOOLS="no"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-29 15:20 Yixun Lan
0 siblings, 0 replies; 31+ messages in thread
From: Yixun Lan @ 2022-01-29 15:20 UTC (permalink / raw
To: gentoo-commits
commit: dc0caee86ee328981ecaa70e8fa707a8d19fa653
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Jan 27 02:00:00 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 15:19:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc0caee8
dev-libs/marisa: Use EAPI="8"
Closes: https://github.com/gentoo/gentoo/pull/23949
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
dev-libs/marisa/marisa-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 64ca06a03dae..16c1bd72e07d 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,7 +1,7 @@
# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index e6edbfbf8d5b..0d1643f7630f 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
+EAPI="8"
PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL="1"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-30 22:25 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2022-01-30 22:25 UTC (permalink / raw
To: gentoo-commits
commit: 6ea27488eb6d2d39f780bb43ae927f5b9a3ea373
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 22:22:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 22:23:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea27488
dev-libs/marisa: Stabilize 0.2.6 x86, #832393
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 16c1bd72e07d..0352a5f03dba 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-30 22:25 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2022-01-30 22:25 UTC (permalink / raw
To: gentoo-commits
commit: 0dd5219a65fb7b857328c0ab496f6aa8da79cd15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 22:24:11 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 22:24:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd5219a
dev-libs/marisa: Stabilize 0.2.6 amd64, #832393
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 0352a5f03dba..414e70e912cf 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-31 6:24 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2022-01-31 6:24 UTC (permalink / raw
To: gentoo-commits
commit: bf5bff911982ed632a419005932da7df141b7a28
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 06:23:42 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 06:23:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5bff91
dev-libs/marisa: Stabilize 0.2.6 arm64, #832393
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 414e70e912cf..8b9bf9b35444 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-31 18:51 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2022-01-31 18:51 UTC (permalink / raw
To: gentoo-commits
commit: f0d8180e5d85f7fff64feb7da708586902d6aeb7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 18:51:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 18:51:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d8180e
dev-libs/marisa: Stabilize 0.2.6 ppc, #832393
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 8b9bf9b35444..bc977874c41e 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-01-31 20:26 Arthur Zamarin
0 siblings, 0 replies; 31+ messages in thread
From: Arthur Zamarin @ 2022-01-31 20:26 UTC (permalink / raw
To: gentoo-commits
commit: d8219db34eec1139b012c36447778b7aaebdc455
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 20:26:01 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 20:26:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8219db3
dev-libs/marisa: Stabilize 0.2.6 ppc64, #832393
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index bc977874c41e..2f47a949a3cf 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2022-05-17 12:38 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2022-05-17 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 8779c3cf5c14187b85303829b6a315dcdbdebf1f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 12:38:42 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue May 17 12:38:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8779c3cf
dev-libs/marisa: sparc stable wrt bug #832393
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 2f47a949a3cf..0904ea709ca0 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm64 ~hppa ppc ppc64 ~riscv sparc x86"
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2023-06-08 10:50 Pacho Ramos
0 siblings, 0 replies; 31+ messages in thread
From: Pacho Ramos @ 2023-06-08 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 14310ef0268303acc8ac45b4eca1fdc8136517cc
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 8 10:27:01 2023 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Jun 8 10:50:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14310ef0
dev-libs/marisa: enable py3.11
Closes: https://bugs.gentoo.org/896728
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 3 ++-
dev-libs/marisa/marisa-9999.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 88ba4d121db3..6e587ffcb945 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_OPTIONAL="1"
+DISTUTILS_EXT=1
inherit autotools distutils-r1 toolchain-funcs
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index fada309d55ad..7731d92f28e3 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_OPTIONAL="1"
+DISTUTILS_EXT=1
inherit autotools distutils-r1 toolchain-funcs
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/
@ 2024-08-29 23:55 Yixun Lan
0 siblings, 0 replies; 31+ messages in thread
From: Yixun Lan @ 2024-08-29 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 7d54d1dc3397d96ff966101d843260e8a23df897
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Sat Aug 24 15:23:22 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 23:53:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d54d1dc
dev-libs/marisa: enable py3.12, also drop py3.9
Closes: https://bugs.gentoo.org/909909
Closes: https://bugs.gentoo.org/929426
Closes: https://github.com/gentoo/gentoo/38279
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
dev-libs/marisa/marisa-0.2.6.ebuild | 10 +++++-----
dev-libs/marisa/marisa-9999.ebuild | 11 +++++------
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 6e587ffcb945..47f2023b5fad 100644
--- a/dev-libs/marisa/marisa-0.2.6.ebuild
+++ b/dev-libs/marisa/marisa-0.2.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
DISTUTILS_OPTIONAL="1"
DISTUTILS_EXT=1
@@ -16,9 +17,7 @@ fi
DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
@@ -30,6 +29,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="python? (
${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
dev-lang/swig
)"
DEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 7731d92f28e3..45c481f3fb3a 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517="setuptools"
DISTUTILS_OPTIONAL="1"
DISTUTILS_EXT=1
@@ -16,20 +17,18 @@ fi
DESCRIPTION="Matching Algorithm with Recursively Implemented StorAge"
HOMEPAGE="https://github.com/s-yata/marisa-trie https://code.google.com/archive/p/marisa-trie/"
-if [[ "${PV}" == "9999" ]]; then
- SRC_URI=""
-else
+if [[ "${PV}" != "9999" ]]; then
SRC_URI="https://github.com/s-yata/marisa-trie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
LICENSE="|| ( BSD-2 LGPL-2.1+ )"
SLOT="0"
-KEYWORDS=""
IUSE="python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
BDEPEND="python? (
${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
dev-lang/swig
)"
DEPEND="python? ( ${PYTHON_DEPS} )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
end of thread, other threads:[~2024-08-29 23:55 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-29 23:55 [gentoo-commits] repo/gentoo:master commit in: dev-libs/marisa/ Yixun Lan
-- strict thread matches above, loose matches on Subject: below --
2023-06-08 10:50 Pacho Ramos
2022-05-17 12:38 Agostino Sarubbo
2022-01-31 20:26 Arthur Zamarin
2022-01-31 18:51 Sam James
2022-01-31 6:24 Sam James
2022-01-30 22:25 Sam James
2022-01-30 22:25 Sam James
2022-01-29 15:20 Yixun Lan
2022-01-29 15:20 Yixun Lan
2022-01-29 15:20 Yixun Lan
2021-01-05 14:14 Sergei Trofimovich
2020-11-16 19:51 Mike Gilbert
2020-11-12 21:54 Mike Gilbert
2020-11-12 21:54 Mike Gilbert
2020-11-12 21:54 Mike Gilbert
2020-11-12 21:54 Mike Gilbert
2020-11-12 21:54 Mike Gilbert
2020-02-08 12:50 Sergei Trofimovich
2019-12-31 18:08 Aaron Bauman
2019-12-31 8:18 Agostino Sarubbo
2019-12-31 8:15 Agostino Sarubbo
2019-12-06 20:25 Mike Gilbert
2019-09-29 2:56 Mike Gilbert
2019-09-29 2:56 Mike Gilbert
2019-08-30 18:39 Sergei Trofimovich
2017-11-18 10:13 Sergei Trofimovich
2017-11-01 20:54 Mike Gilbert
2017-10-23 17:24 Mike Gilbert
2017-04-24 9:31 Pacho Ramos
2016-05-19 7:21 Naohiro Aota
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox