gentoo resync : 29.12.2022

6 files changed, 34 insertions, 270 deletions

diff --git a/dev-libs/marisa/Manifest b/dev-libs/marisa/Manifest
index 8944f6b9ef19..ad23c8ca841e 100644
--- a/dev-libs/marisa/Manifest
+++ b/dev-libs/marisa/Manifest
@@ -1,8 +1,7 @@
-AUX marisa-0.2.5-cpu_features_check.patch 4645 BLAKE2B 3ccd0b23d881d56d2341e1ed87f39acb0324440fd019b94fb7b846cedad756a9bd5c76fcbafac08ea7be294fb58334dfeda02d26ba575beb18df410dc921ca5d SHA512 5098491cddcd53451264d127373b29bed7e2260887494b1f562b94f1ab5d71962ee9fdc5d811d9ea0062c11c14d5cd4a81428da9f04d92ef2efe3a3810e844b2
+AUX marisa-0.2.6-loong_word_size.patch 565 BLAKE2B db3c245c896d265545a1b99202c60448b332384b3fd1edcc0c21fd517b3cb5e450ad8b6ed88308ac3c0c635ccf4e0abfdf4cb06dd4f76087ac38c54eea854f66 SHA512 16964170d1637c2ecb5fdd8cc93b890a72e80bde9991b5f52c979312bccc6b532416e1704047b8d8269698363c6622f825fbbc771844a7ece854af6c34dc6338
 AUX marisa-0.2.6-riscv_word_size.patch 486 BLAKE2B fef98bb16375bb482bfc5a219ecb61f9401e2bd560962f99e82c1725207c95a52c3ee9699d1fdc95bdfd972e15d6ca63e6c2e5c67938a385c592423205be8c08 SHA512 7da1120c5db4d8c902fd0bd16aa86f95cff09e8d81aa8d4140353eefbd2e3d7a100a9f38909193a5fd2333a652ce8b65198b0664792fe390790dd87883f6a7fa
-DIST marisa-0.2.5.tar.gz 167434 BLAKE2B 2b88e9f0060529c2180400290bb975a946666f58f77f7604cf3ea8ae0ad7e44e0d95e18c8911d9630561b9593eb2ec123b5c67d6d195dab480d86fe431ce2531 SHA512 62975a2dacd2a1072c990cd490f866cd5483c069c94a4706baf3ffc21ec43991583a8ef8721c3b841617b0654cbb894698c19759ff12b8887b6fd28939dfb547
+AUX marisa-0.2.6-sparc64_word_size.patch 783 BLAKE2B 339bbaecd8686e1af2f6bbcb9709020f2af0d13f9bef4fc49ffd2deb3096ab2ea556c0a32a8ae5b74555bf171c553a43c6bebb4ec05e9696d857c512525550d4 SHA512 d894d7a55cc9a617711a19c8be25a60eea9f808906be7f8ccca4d5cc970e9b5cb2b3e88fc111037e18f831e4c6a7b96c134eea5a2417edc89a402ef96e100689
 DIST marisa-0.2.6.tar.gz 168332 BLAKE2B 3b8a89a9a0b344d9de96edb5bf17c50db07da373e75eba098f48c9064321d579ac104db622608119377084c79165bf558c804eaff591903b67330b13bc8acf55 SHA512 c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
-EBUILD marisa-0.2.5.ebuild 2234 BLAKE2B 02ba56d816fab0c09264a98d4648060075504507028ff7e16da14c56b3863b5b9df3805ef1181d7330bf0bab94e182374444440e4c5f59e4bbd755b9c2c63a5d SHA512 a86361ab9bfe31aae2130a1e72498ca2096294442a27b2da8c81e68ab4f9e9a1c32d972f1f2b259ac5c3f4b141a473a0802fd6c70c0742695d51f73b4245430c
-EBUILD marisa-0.2.6.ebuild 2871 BLAKE2B 122e2fdbee0555fef41df4f69d07b70806da84aa1eecd930e2c70e5bca88080882db67c1e2380368425c333ec5a7ce5d27488cc2771ce1d9d116d8d4e0b425ae SHA512 3fbef4416cd17626d1a77c0013012ad42cb1ad9f1ad92cba89a1d41bc5b177b78cf1bb4919c52d8d9ef083f9b8f85438794d125f453de84870153618eb123c4c
+EBUILD marisa-0.2.6.ebuild 2977 BLAKE2B fa21be068a686178008773bf7b86e366b129405588f841866d76354030b6ebf42724925eb9fd41a1dd86fe466e463be88fa787943129cd1ccce4c6ba18fdd07e SHA512 45840c1c0681830c3d020cc3db041acb406262c38999bf5f0b0612ec901637a8542196c1f828305fa3e43ac0acaa51c4227df24c5f24dd1f69eae062ab4000e1
 EBUILD marisa-9999.ebuild 2764 BLAKE2B d4c3df20f134dac32608de57e70c7a372cf21b6a153ae959eb764bbfe66880be164ea597b55a28d95a90d4e3f349c79c684c0340d01271549d5f8c75eee52e06 SHA512 71b497e8e551d5dee341a06c369fff566c7bdeb3cdd0fec282c7c2585be0e669575325374b00179f8a40267506675608c65810aaa7077025f209da438be20448
 MISC metadata.xml 466 BLAKE2B 52091b0a7fff43b807097f38ccc624057f7cc8becbbb8c4efd2a461d62fbf0bd1498497683ca3ed6b7730768d0fc94d461c983ab1deef8ac156ac3f1bd86c0e7 SHA512 b5914b5a81efb935857a7088421fe765d89a8101cd2a38568c8a9903957fa92482ec7882d4ce4e9555c467e14e2a1fca74b3966d71c541a42cbb0c2880331b12
diff --git a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch b/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
deleted file mode 100644
index dba677221a19..000000000000
--- a/dev-libs/marisa/files/marisa-0.2.5-cpu_features_check.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-https://github.com/s-yata/marisa-trie/commit/d93f1b67f3aaa2d56bf20089c0ce9ef216da6cb7
-
---- /configure.ac
-+++ /configure.ac
-@@ -13,6 +13,56 @@
- 
- AC_CONFIG_MACRO_DIR([m4])
- 
-+# Macros for SSE availability check.
-+AC_DEFUN([MARISA_ENABLE_SSE2],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE2__
-+yes
-+#endif
-+          ], [enable_sse2="yes"], [enable_sse2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE3],
-+          [AC_EGREP_CPP([yes], [
-+#ifdef __SSE3__
-+yes
-+#endif
-+          ], [enable_sse3="yes"], [enable_sse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSSE3],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSSE3__
-+yes
-+#endif
-+         ], [enable_ssse3="yes"], [enable_ssse3="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_1],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_1__
-+yes
-+#endif
-+         ], [enable_sse4_1="yes"], [enable_sse4_1="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4_2],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4_2__
-+yes
-+#endif
-+         ], [enable_sse4_2="yes"], [enable_sse4_2="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4],
-+         [AC_EGREP_CPP([yes], [
-+#if defined(__POPCNT__) && defined(__SSE4_2__)
-+yes
-+#endif
-+         ], [enable_sse4="yes"], [enable_sse4="no"])])
-+AC_DEFUN([MARISA_ENABLE_SSE4A],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __SSE4A__
-+yes
-+#endif
-+         ], [enable_sse4a="yes"], [enable_sse4a="no"])])
-+AC_DEFUN([MARISA_ENABLE_POPCNT],
-+         [AC_EGREP_CPP([yes], [
-+#ifdef __POPCNT__
-+yes
-+#endif
-+         ], [enable_popcnt="yes"], [enable_popcnt="no"])])
-+
- # Checks for SSE availability.
- AC_MSG_CHECKING([whether to use SSE2])
- AC_ARG_ENABLE([sse2],
-@@ -20,9 +70,7 @@
-                               [use SSE2 [default=no]])],
-               [],
-               [enable_sse2="no"])
--AS_IF([test "x${enable_sse2}" != "xno"], [
--  enable_sse2="yes"
--])
-+AS_IF([test "x${enable_sse2}" != "xno"], [MARISA_ENABLE_SSE2])
- AC_MSG_RESULT([${enable_sse2}])
- 
- AC_MSG_CHECKING([whether to use SSE3])
-@@ -31,9 +79,7 @@
-                               [use SSE3 [default=no]])],
-               [],
-               [enable_sse3="no"])
--AS_IF([test "x${enable_sse3}" != "xno"], [
--  enable_sse3="yes"
--])
-+AS_IF([test "x${enable_sse3}" != "xno"], [MARISA_ENABLE_SSE3])
- AC_MSG_RESULT([${enable_sse3}])
- 
- AC_MSG_CHECKING([whether to use SSSE3])
-@@ -42,9 +88,7 @@
-                               [use SSSE3 [default=no]])],
-               [],
-               [enable_ssse3="no"])
--AS_IF([test "x${enable_ssse3}" != "xno"], [
--  enable_ssse3="yes"
--])
-+AS_IF([test "x${enable_ssse3}" != "xno"], [MARISA_ENABLE_SSSE3])
- AC_MSG_RESULT([${enable_ssse3}])
- 
- AC_MSG_CHECKING([whether to use SSE4.1])
-@@ -53,9 +97,7 @@
-                               [use SSE4.1 [default=no]])],
-               [],
-               [enable_sse4_1="no"])
--AS_IF([test "x${enable_sse4_1}" != "xno"], [
--  enable_sse4_1="yes"
--])
-+AS_IF([test "x${enable_sse4_1}" != "xno"], [MARISA_ENABLE_SSE4_1])
- AC_MSG_RESULT([${enable_sse4_1}])
- 
- AC_MSG_CHECKING([whether to use SSE4.2])
-@@ -64,9 +106,7 @@
-                               [use SSE4.2 [default=no]])],
-               [],
-               [enable_sse4_2="no"])
--AS_IF([test "x${enable_sse4_2}" != "xno"], [
--  enable_sse4_2="yes"
--])
-+AS_IF([test "x${enable_sse4_2}" != "xno"], [MARISA_ENABLE_SSE4_2])
- AC_MSG_RESULT([${enable_sse4_2}])
- 
- AC_MSG_CHECKING([whether to use SSE4])
-@@ -75,9 +115,7 @@
-                               [use SSE4 [default=no]])],
-               [],
-               [enable_sse4="no"])
--AS_IF([test "x${enable_sse4}" != "xno"], [
--  enable_sse4="yes"
--])
-+AS_IF([test "x${enable_sse4}" != "xno"], [MARISA_ENABLE_SSE4])
- AC_MSG_RESULT([${enable_sse4}])
- 
- AC_MSG_CHECKING([whether to use SSE4a])
-@@ -86,9 +124,7 @@
-                               [use SSE4a [default=no]])],
-               [],
-               [enable_sse4a="no"])
--AS_IF([test "x${enable_sse4a}" != "xno"], [
--  enable_sse4a="yes"
--])
-+AS_IF([test "x${enable_sse4a}" != "xno"], [MARISA_ENABLE_SSE4A])
- AC_MSG_RESULT([${enable_sse4a}])
- 
- AC_MSG_CHECKING([whether to use popcnt])
-@@ -97,9 +133,7 @@
-                               [use POPCNT [default=no]])],
-               [],
-               [enable_popcnt="no"])
--AS_IF([test "x${enable_popcnt}" != "xno"], [
--  enable_popcnt="yes"
--])
-+AS_IF([test "x${enable_popcnt}" != "xno"], [MARISA_ENABLE_POPCNT])
- AC_MSG_RESULT([${enable_popcnt}])
- 
- AS_IF([test "x${enable_popcnt}" != "xno"], [
-@@ -170,6 +204,7 @@
- AS_ECHO(["  LDFLAGS:   ${LDFLAGS}"])
- AS_ECHO(["  PREFIX:    ${prefix}"])
- AS_ECHO([])
-+AS_ECHO(["  NATIVE:    ${enable_native_code}"])
- AS_ECHO(["  SSE2:      ${enable_sse2}"])
- AS_ECHO(["  SSE3:      ${enable_sse3}"])
- AS_ECHO(["  SSSE3:     ${enable_ssse3}"])
diff --git a/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch
new file mode 100644
index 000000000000..2be85ba04ee4
--- /dev/null
+++ b/dev-libs/marisa/files/marisa-0.2.6-loong_word_size.patch
@@ -0,0 +1,12 @@
+--- a/include/marisa/base.h
++++ b/include/marisa/base.h
+@@ -31,7 +31,8 @@
+ #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
+     defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
+     defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \
+-    defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64))
++    defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \
++    defined(__loongarch64)
+  #define MARISA_WORD_SIZE 64
+ #else  // defined(_WIN64), etc.
+  #define MARISA_WORD_SIZE 32
diff --git a/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch
new file mode 100644
index 000000000000..ff789b1c9043
--- /dev/null
+++ b/dev-libs/marisa/files/marisa-0.2.6-sparc64_word_size.patch
@@ -0,0 +1,16 @@
+Originally reported in https://bugs.gentoo.org/show_bug.cgi?id=843422
+Upstream PR https://github.com/s-yata/marisa-trie/pull/46
+
+diff --git a/include/marisa/base.h b/include/marisa/base.h
+index bf4794e..95861b4 100644
+--- a/include/marisa/base.h
++++ b/include/marisa/base.h
+@@ -30,7 +30,7 @@ typedef uint64_t marisa_uint64;
+ 
+ #if defined(_WIN64) || defined(__amd64__) || defined(__x86_64__) || \
+     defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) || \
+-    defined(__sparc64__) || defined(__mips64__) || defined(__aarch64__) || \
++    (defined(__sparc__) && defined(__LP64__)) || defined(__mips64__) || defined(__aarch64__) || \
+     defined(__s390x__) || (defined(__riscv) && (__riscv_xlen == 64)) || \
+     defined(__loongarch64)
+  #define MARISA_WORD_SIZE 64
diff --git a/dev-libs/marisa/marisa-0.2.5.ebuild b/dev-libs/marisa/marisa-0.2.5.ebuild
deleted file mode 100644
index af6c3b508d46..000000000000
--- a/dev-libs/marisa/marisa-0.2.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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} )
-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="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
-
-PATCHES=(
-	"${FILESDIR}/${P}-cpu_features_check.patch"
-)
-
-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
-}
diff --git a/dev-libs/marisa/marisa-0.2.6.ebuild b/dev-libs/marisa/marisa-0.2.6.ebuild
index 2f47a949a3cf..7df3c25d5c77 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 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -40,6 +40,8 @@ fi
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.2.6-riscv_word_size.patch"
+	"${FILESDIR}/${PN}-0.2.6-loong_word_size.patch"
+	"${FILESDIR}/${PN}-0.2.6-sparc64_word_size.patch"
 )
 
 src_prepare() {