gentoo resync : 25.11.2020

5 files changed, 158 insertions, 17 deletions

diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 3c2e91bafaf2..916b21797738 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,5 +1,7 @@
 AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
 DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
-EBUILD marisa-0.2.5.ebuild 2228 BLAKE2B 9016cc0ae3419ac26b864ad5dd07edfc0d13a2bbb34ba1c6c76b6ba1c40a4616a6c4f417252390c515253f62059677223f26187be02a0f12b9e429b5133ba20a SHA512 8db639b8a07201e062395540eb84dd108865a4ee18e090b06dea15ab93468758a3aa354f20d3b14800393ef7542e55babcfff18079e97c02092ae0b58f4ba548
-EBUILD marisa-9999.ebuild 2139 BLAKE2B 08fe3511b7340f07991121f9d84e36bd69a0c6a479ecfdd5f4c044174b501fbe1ff6f44226c33aa7ac20fb2b554be3e038a3d2893476e81cb810cec7f61e2c7d SHA512 3306d92fb8d241f09ad57fd1a8f7004ea85be1481d3f808f07821ce295c42566fceb732e358bc49797617767bf06238fc349f48aa0fb0be3f6ce0570b85d3285
-MISC metadata.xml 317 BLAKE2B 16fd28ba01ffdf67af29ea7f6b41be190ecff6ab88706b0cb04b6e9dee5a623087652e666af02cff1c3ed3bd4b42f252adf5fce1b08c2eb9a998e8c112dba922 SHA512 0e782fba322f87cfc0f180f812d0e33630c4295df1f434d497aba1a7f9d922e9674a3c23a821211cbe11d419eee70c25dbabb7508abc7bd56267e9648a1e721c
+DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
+EBUILD marisa-0.2.5.ebuild 2266 BLAKE2B e836721e2037b072f10ce777fb0d8c9537d9dbee29a6b9f18557f5075ab1defca733602f404f3b456b1769a512e8db063582c36f2260995ca23b923edea750fe SHA512 be55ebe9def47cae022b93077fb4e1b10784ada22bbfa57a046bf60e1f1c32777400d4368d539304a835a71d0f82afeb182e44730e2ff7f4efe6935f37e9f8a1
+EBUILD marisa-0.2.6.ebuild 2837 BLAKE2B 8b142b74c27f5157541ec386d7ab72220ac39b028b7d2146eb71e5ba8dc40e7c544c5dd0288caf17df6cd9f9b2d27bf1c11c268719f9ca5d6afbd963af4d5bd8 SHA512 be53779909de5916e37d6abdbe1beafe438fd5a2f10bfd552a2d7e6693838dd98c07b11cf3ec38019fbd360079b8a18bac53fac46b305f7f60aa428cce84b404
+EBUILD marisa-9999.ebuild 2800 BLAKE2B 8ec417b61ffdf9b9157dce7bafd8096e29bddef82d4572a09073dfbbdef32569dfd1c01546acdbdb57869e31122d4d40984b1b3133b4296e1e5de13da24a5bef SHA512 1145f56bdb4c05854edbd3d711761f5dcd1eee3c3d9501d42d10baaa32fb4328cc9aabafe391576b8f652129b9ab63a46e91340b8af3ffe62379c39627401a10
+MISC metadata.xml 451 BLAKE2B 8aaf9cb592f2321adf8248800f6000e3988d55bacfbd8f880d3de788867262d921992cbdca3c449e2b4b2de7ecc152eff329cde05e54bea538d8fe0676d97e4a SHA512 d92d8194b791437a0e17e51f5678f852fc046785b495ce3aa95ead02ddd80d07dfca9d7cd7b43d0f061c9d4d0d45ca42852e0563dcef71204d352f977a78a6bd
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
index 4289f375ea65..11ab370eff6e 100644
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ b/dev-libs/marisa/marisa-0.2.5.ebuild
@@ -2,8 +2,9 @@
 # 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"
+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
new file mode 100644
index 000000000000..3f1328fe785d
--- /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 toolchain-funcs
+
+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
+}
diff --git a/dev-libs/marisa/marisa-9999.ebuild b/dev-libs/marisa/marisa-9999.ebuild
index 6942f85b198b..ac80bc2f0601 100644
--- a/dev-libs/marisa/marisa-9999.ebuild
+++ b/dev-libs/marisa/marisa-9999.ebuild
@@ -1,11 +1,12 @@
-# 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"
+DISTUTILS_USE_SETUPTOOLS="no"
 
-inherit autotools distutils-r1
+inherit autotools distutils-r1 toolchain-funcs
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -54,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)
 	)
 
@@ -89,7 +104,7 @@ src_compile() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -type f -delete || die
+	find "${ED}" -name "*.la" -delete || die
 
 	(
 		docinto html
diff --git a/dev-libs/marisa/metadata.xml b/dev-libs/marisa/metadata.xml
index 4aa8461d2b54..f8feae5e9c20 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>