Merge updates from master

8 files changed, 175 insertions, 4 deletions

diff --git a/dev-db/sqlmap/sqlmap-1.7.4.ebuild b/dev-db/sqlmap/sqlmap-1.7.4.ebuild
index 550ec7d5d4b0..ad6dac4b9230 100644
--- a/dev-db/sqlmap/sqlmap-1.7.4.ebuild
+++ b/dev-db/sqlmap/sqlmap-1.7.4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap"
 else
 	SRC_URI="https://github.com/sqlmapproject/sqlmap/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # sqlmap (GPL-2+)
diff --git a/media-libs/speex/files/speex-1.2.1-vla-detection.patch b/media-libs/speex/files/speex-1.2.1-vla-detection.patch
new file mode 100644
index 000000000000..1b3826f8b25e
--- /dev/null
+++ b/media-libs/speex/files/speex-1.2.1-vla-detection.patch
@@ -0,0 +1,27 @@
+https://gitlab.xiph.org/xiph/speex/-/commit/5b036b2ca5e27004502e67ee20490a16f5e68aa1
+
+From 5b036b2ca5e27004502e67ee20490a16f5e68aa1 Mon Sep 17 00:00:00 2001
+From: Kai Pastor <dg0yt@darc.de>
+Date: Wed, 24 Aug 2022 20:14:31 +0200
+Subject: [PATCH] Fix vla detection
+
+Signed-off-by: Tristan Matthews <tmatth@videolan.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d94c2feb..b8131482 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,7 @@ AC_C_RESTRICT
+ 
+ 
+ AC_MSG_CHECKING(for C99 variable-size arrays)
+-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+ int foo;
+ foo = 10;
+ int array[foo];
+-- 
+GitLab
diff --git a/media-libs/speex/speex-1.2.1-r1.ebuild b/media-libs/speex/speex-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..c966d61c2a6e
--- /dev/null
+++ b/media-libs/speex/speex-1.2.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multilib-minimal
+
+MY_P=${P/_}
+MY_P=${MY_P/_p/.}
+
+DESCRIPTION="Audio compression format designed for speech"
+HOMEPAGE="https://www.speex.org/"
+SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils valgrind +vbr"
+
+RDEPEND="
+	utils? (
+		media-libs/libogg:=
+		media-libs/speexdsp[${MULTILIB_USEDEP}]
+	)"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-configure.patch
+	"${FILESDIR}"/${P}-vla-detection.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		libspeex/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local myeconfargs=(
+		$(multilib_native_use_enable valgrind)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable vbr)
+		$(multilib_native_use_with utils speexdsp)
+		$(multilib_native_use_enable utils binaries)
+	)
+
+	local FIXED_ARG="--disable-fixed-point"
+	local ARM4_ARG="--disable-arm4-asm"
+	local ARM5_ARG="--disable-arm5e-asm"
+
+	if use arm && ! use cpu_flags_arm_v6; then
+		FIXED_ARG="--enable-fixed-point"
+
+		if use cpu_flags_arm_v5; then
+			ARM5_ARG="--enable-arm5e-asm"
+		elif use cpu_flags_arm_v4; then
+			ARM4_ARG="--enable-arm4-asm"
+		fi
+	fi
+
+	myeconfargs+=( ${FIXED_ARG} ${ARM4_ARG} ${ARM5_ARG} )
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/speex/speex-1.2.1.ebuild b/media-libs/speex/speex-1.2.1.ebuild
index 6bd0527aef26..eecc7ebf0031 100644
--- a/media-libs/speex/speex-1.2.1.ebuild
+++ b/media-libs/speex/speex-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,14 +15,17 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils +vbr"
+IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse utils valgrind +vbr"
 
 RDEPEND="
 	utils? (
 		media-libs/libogg:=
 		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)"
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
@@ -58,6 +61,7 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" econf \
 		--disable-static \
+		$(multilib_native_use_enable valgrind) \
 		$(use_enable cpu_flags_x86_sse sse) \
 		$(use_enable vbr) \
 		$(use_with utils speexdsp) \
diff --git a/sci-libs/seqeval/Manifest b/sci-libs/seqeval/Manifest
new file mode 100644
index 000000000000..509db7dd33b7
--- /dev/null
+++ b/sci-libs/seqeval/Manifest
@@ -0,0 +1 @@
+DIST seqeval-1.2.2.gh.tar.gz 42187 BLAKE2B c0ae8b71fab3d29381d5e2bc70f733b5d176b8a447ee7803a8b4681a1fbd9d197e288c1e3c1239454b5c669addc4977d8a3274c63884529d8c682bf584f2cd3a SHA512 794b817dcd19bc60ecc1c3c3f188bb17b2786dd3629691c43a594443b6dd2a3298b398309d5f14817ff1e0e37859fe109175b8bd48d0d30243de0ea4845c381a
diff --git a/sci-libs/seqeval/files/seqeval-1.2.2-gentoo.patch b/sci-libs/seqeval/files/seqeval-1.2.2-gentoo.patch
new file mode 100644
index 000000000000..17af496e249a
--- /dev/null
+++ b/sci-libs/seqeval/files/seqeval-1.2.2-gentoo.patch
@@ -0,0 +1,10 @@
+--- a/tests/test_metrics.py	2023-05-04 09:00:31.656558311 +0200
++++ b/tests/test_metrics.py	2023-05-04 09:02:09.151781216 +0200
+@@ -158,6 +158,7 @@
+             self.assertLess(abs(r_pred - r_pred_inv), 1e-4)
+             self.assertLess(abs(f1_pred - f1_pred_inv), 1e-4)
+ 
++    @pytest.mark.skip(reason="take too much time to finish")
+     def test_statistical_tests(self):
+         filepath = 'eval_data.txt'
+         for prefix in ['BIO', 'EIO']:
diff --git a/sci-libs/seqeval/metadata.xml b/sci-libs/seqeval/metadata.xml
new file mode 100644
index 000000000000..11047fcb8a30
--- /dev/null
+++ b/sci-libs/seqeval/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">seqeval</remote-id>
+		<remote-id type="github">chakki-works/seqeval</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-libs/seqeval/seqeval-1.2.2.ebuild b/sci-libs/seqeval/seqeval-1.2.2.ebuild
new file mode 100644
index 000000000000..a0b7601ae359
--- /dev/null
+++ b/sci-libs/seqeval/seqeval-1.2.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python framework for sequence labeling evaluation"
+HOMEPAGE="
+	https://pypi.org/project/seqeval/
+	https://github.com/chakki-works/seqeval
+"
+SRC_URI="https://github.com/chakki-works/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="test? ( dev-python/setuptools-scm )"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_compile() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+	distutils-r1_src_compile
+}
+
+src_test() {
+	cd tests
+	distutils-r1_src_test
+}