gentoo auto-resync : 18:12:2022 - 09:41:22

9 files changed, 186 insertions, 9 deletions

diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index 489d6afa7a65..2e0b431d7864 100644
--- a/sci-misc/Manifest.gz
+++ b/sci-misc/Manifest.gz
diff --git a/sci-misc/apertium/Manifest b/sci-misc/apertium/Manifest
index 9a678affcc87..69ba57b7b66b 100644
--- a/sci-misc/apertium/Manifest
+++ b/sci-misc/apertium/Manifest
@@ -2,6 +2,9 @@ AUX 3.2.0-datadir.patch 1315 BLAKE2B 011d2670fafed5ef1a891c39a6c6f084156f1f14a69
 AUX 3.2.0-flags.patch 2163 BLAKE2B 213aa7a6cd5dd9c5e068f5bfe96d5dbe3640e6c231230a912996e705efbe37ba486e962da9b7b5473b8b38ed1861eee3d2f3565ca5a5764433792ab0264c4266 SHA512 25a1e8687c38091b249fbbef4dac01c95f4b446ad7e3ffd829b8803d056e34ec49057855af80f8ec578d83894234ab0c87b900daec759a6fd3ba8ae3fc736fce
 AUX apertium-3.2.0-autotools.patch 3814 BLAKE2B b5e621bde3986220b2e624234e5a865d4ed4f114412aa8e822d587eb12f66f8549fc7b083b52340bea36f18001e42f8e32a034127ec43ff70f94674b821b853f SHA512 b5ff3fe8820aff1d7f10eb38ba5b921c87a780c6e146f316a43f8436facb1671b873d22a0b8cd9b0d7f1fda53db9db9b291cd0083d848d039a91aeeaf82d8b30
 AUX apertium-3.2.0-libpcre.patch 1480 BLAKE2B 218a59978c694b1cbd4a6fcad2e80e0abf30be9f89f4f6180e6a94ff8a399ef7e60790b74a661866bef5dd09dfa7b0ed5cdb17027c2539659ca9eaaf816042eb SHA512 e8816e99ea2e2c0c027e498d77bf6948002f84781a3af77bb6cf570dfbf29a4a111b94abadfd4b8e4c35737c17abc51c89d880ee938a71fd7a2e57fe88ac081b
+AUX apertium-3.8.3-bashism.patch 1118 BLAKE2B c85794029961ee2ceae993fc02807fac3b18f7fd86c7bd094401e77e7d633b7b5ea6d5d38f45311df4e783196e9b88ab590d1e4c787ff87cc0f3e3a09d0aa605 SHA512 0140595bc652df6b8584c3d3f7fd071a9ee545063a0baa0b0a553e10db32cb1f4e9d9fe578ebe3612c7583bf65b500e7170a64240735dd2951e97808545ec132
 DIST apertium-3.2.0.tar.gz 767311 BLAKE2B 03069a0839d0ad61db12aea977e0847b3093a46becd7c36e3bb7b483242986f8f1b4a94c6c64bdfc94f11d13353fbdb6835ff032158d9a05151342606fdd57a1 SHA512 ec80d72480e414eb9a169241d0921b21009dde7c1da9a773f500f16ac785741be1f4a221c25b3b32e7847405f76e93b5feadb6f541170c0742718e27dfa1fb25
+DIST apertium-3.8.3.tar.bz2 560957 BLAKE2B c610395fb1e725ddc628a15b1234c434d174c5b5664ed8fa2d1480d438e143bcd194b6f5a2e79ede6fec0d4fa156be2b7725134727e2f976fe7ecd053a88c520 SHA512 78da8ffcc01706563c4e34c73355b3c65bc2b22abf1501169638b89eae95cd0a4bff095eef5488cba58d0e67b8dd7efd93759981ebd28a9115028e7ad75fa551
 EBUILD apertium-3.2.0.ebuild 849 BLAKE2B 74e1005c7d0aef3da2ab440ac3f0b2257e7856516349a0fafaa24d68a2fb64ae7414f2554e661328ae4857d19b2ccd82090d1df5adf7810aa78f33921dff1ab8 SHA512 03159002f7f18a42b06aa67bb414140129ec370327b4401f65191ec01771f15483eabea16b8c5cf8bd332d9edb9acdc3ae85c697bb61926091a25b29e558deed
-MISC metadata.xml 332 BLAKE2B 47c233bd4ceeeece485ff4de5251d291a6b3b476e1664a8352b9ff23bec8ab4ace9d12ac0ed60b339e216d780bac16fa4f3c71176ae5f7356d3529ab9b83b8f1 SHA512 088b56ef272e39fc3081bb78fc71aad937b40542008c15868dcade946825154ab7436df2ade131d6b4e2f032883b4a50edbe5e122e83c7238665a45fa9f03166
+EBUILD apertium-3.8.3.ebuild 1161 BLAKE2B c3d5272bd106ebadc31d37f77cbab280c02e918c8d879a6772c4835457fec2abe79ca77e12f84d3f50a20b166f43e041b6ae5542f945754e1065138499c6ebe2 SHA512 135c4b42cd0659228e809d8ed21791cc4e6e01dc765386749bb0640f9d2cf76e175a1693927f77da7fb2e4418b00e5ecd0bbe8c66a181e87295e406d2f251292
+MISC metadata.xml 389 BLAKE2B 9674e02a0086439f5df797f8951d470efbc238f8bd4ba18ac45de8cb37142b6925fa83a0e4f8cc9895ed4f22d31fa61b7bad86e54cdd99938dd73d1523b0c170 SHA512 0622d3671a133e98538ee98d68db414e1eab4da2dde733d6406e25771651e8a0713c107120a3796484cc9d0f45504b5ea8d463e5a4e9127378c58dfb9b5cf18d
diff --git a/sci-misc/apertium/apertium-3.8.3.ebuild b/sci-misc/apertium/apertium-3.8.3.ebuild
new file mode 100644
index 000000000000..9a7357b9d220
--- /dev/null
+++ b/sci-misc/apertium/apertium-3.8.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools python-any-r1
+
+DESCRIPTION="Shallow-transfer machine Translation engine and toolbox"
+HOMEPAGE="http://apertium.sourceforge.net/"
+SRC_URI="https://github.com/apertium/apertium/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+# PKG_VERSION_ABI in configure.ac
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+# TODO: test_null_flush fails
+RESTRICT="!test? ( test ) test"
+
+RDEPEND="
+	dev-libs/icu:=
+	>=dev-libs/libxml2-2.6.17
+	dev-libs/utfcpp
+	>=sci-misc/lttoolbox-3.7.1:=
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libzip[tools]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.8.3-bashism.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Requires shellcheck, not useful for us in Gentoo
+	cat <<-EOF > tests/sh/run || die
+	#!/usr/bin/env bash
+	exit 77
+	EOF
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-python-bindings
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-misc/apertium/files/apertium-3.8.3-bashism.patch b/sci-misc/apertium/files/apertium-3.8.3-bashism.patch
new file mode 100644
index 000000000000..ca479d9cc134
--- /dev/null
+++ b/sci-misc/apertium/files/apertium-3.8.3-bashism.patch
@@ -0,0 +1,30 @@
+https://github.com/apertium/apertium/pull/181
+
+From 08578745ba3988ece9596eaca734d08e64bae4e1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 18 Dec 2022 03:39:58 +0000
+Subject: [PATCH] configure.ac: fix bashism
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -95,7 +95,7 @@ for version in 23 2b 20 2a 17; do
+   version_flag="-std=c++${version}"
+   AX_CHECK_COMPILE_FLAG([${version_flag}], [break], [version_flag=none])
+ done
+-AS_IF([test "$version_flag" == none], [
++AS_IF([test "$version_flag" = none], [
+   AC_MSG_ERROR([Could not enable at least C++17 - upgrade your compiler])
+ ])
+ CXXFLAGS="$CXXFLAGS ${version_flag}"
diff --git a/sci-misc/apertium/metadata.xml b/sci-misc/apertium/metadata.xml
index 495d10250ad8..fd76f5b4b927 100644
--- a/sci-misc/apertium/metadata.xml
+++ b/sci-misc/apertium/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Science Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">apertium/apertium</remote-id>
 		<remote-id type="sourceforge">apertium</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-misc/lttoolbox/Manifest b/sci-misc/lttoolbox/Manifest
index f7058c009f8f..a98fa96a7351 100644
--- a/sci-misc/lttoolbox/Manifest
+++ b/sci-misc/lttoolbox/Manifest
@@ -1,3 +1,6 @@
+AUX lttoolbox-3.7.1-bashism.patch 1120 BLAKE2B 3925954a42ae22d01f4990e6a82e7a62348cb83fe0cf9c2f03b04649ccf97afe9929567fd8413ce631e58ff65d87edd103da3b3ee938eea2632de172f8b1f861 SHA512 eebc8a0eef8c09a1921a627f4d01c970eb40cdcb48a5b28109b12f5433395f174a4be3dbd1ab2544159f08380fb4703db3f711f5bb7c6445bd4d049167826816
 DIST lttoolbox-3.3.3.tar.gz 454916 BLAKE2B 20def8f733a979621944e41011838430302140b93ec16e4315b39f60c77d6665c2c553196aea12f1c59ce4172cf3032c867317b8085b1e976fee540a9642d2c9 SHA512 2e6338d39d2f16641c408076bd1d3b29fcd11e2d83e622b93fb7b91bae8eb92f58eacf978c72647d2872119be28b76093fc4afbfe22d7e9a62e1a87d818f9a3c
+DIST lttoolbox-3.7.1.tar.bz2 174427 BLAKE2B 33e2a25f11d4badd30835ff60eeb82dc1f95550ef6814a086115c2279551c0067f2ebdc46574d07d6e01ca459ee41f1f0ea512fae0c1e21e7db6e4b04e70dcad SHA512 e86c5479bf14289a91a9de2a528ebc82ef2df39c39e16b26972b3fc90b372903afd36659be8b9d6c4e5f73b7b40ac6aea8bf56ce58d334462aaddcfc44918724
 EBUILD lttoolbox-3.3.3.ebuild 611 BLAKE2B 0083def0cf29a355d35f17e11e210a2c3ffa362d2eeffd556935f3f7edf481a18b53e6fbc8d2bd37b9c00327efe9ea92d1dda1b74ba120d08c71f3ea75cb0b8f SHA512 4d7f40617b65a20cce88a20a1a4799aea6b1cee7f6239cae81677c16c51953fc0c7396f1caa0c4c3a7b51a3787ff62f17d94ef0b09cb09611da9911c166ad00d
-MISC metadata.xml 342 BLAKE2B f4893e78c91384748bdace8043af069c75ecb90ebc763d733d21fb10a279f6f56a418af01c67ee19cda682bdbe7e8de2e1acd222d68428e6ba81066dd32c0232 SHA512 4800255cda592e77967662463add69be6e54c9d313f4a341eda40adbf123e026eeb9bd7f1f3f3ccbb76c665c5c80613657c8e67a7221a3941ccd1cbfd1cdda03
+EBUILD lttoolbox-3.7.1.ebuild 767 BLAKE2B 0979aa9a0f971a7c3f13b1aa4c9fb69f77ac96fc7f3871d274f383958c4b8166170bd6015ce9618136b64e4071fd84aa4843413e9b3ef01bca1bfc7a5cb5e8a5 SHA512 8d1d9f70b2b7df2cc4f1620d58fc23beb5e20550b9ded77df360d4747e4226fbdf55f43cf90f95a932a56980fe4688f353f490d1604cb3ea59e321f9b2160d3e
+MISC metadata.xml 390 BLAKE2B 34592720be72d744adf2e5370fea1602e493b4c8c1144f805faf4df8e54a370db946ae4d443d9d3217512b75c5e6dfbfd2d4c8d5bcf2303dabcd4455cc5b7b0d SHA512 cbc50e89fd7bb8816e3c2eae4cf072b1499b2ee83120db18abab5d22af1b6868bce19c8b3029894518f92610fceeaed5bda286410ba7b6410fa164af50a28758
diff --git a/sci-misc/lttoolbox/files/lttoolbox-3.7.1-bashism.patch b/sci-misc/lttoolbox/files/lttoolbox-3.7.1-bashism.patch
new file mode 100644
index 000000000000..9727c018b142
--- /dev/null
+++ b/sci-misc/lttoolbox/files/lttoolbox-3.7.1-bashism.patch
@@ -0,0 +1,31 @@
+https://github.com/apertium/lttoolbox/pull/171
+
+From 80408b137ceca94d9dab188277ffa3933b148f3d Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 18 Dec 2022 03:33:03 +0000
+Subject: [PATCH] configure.ac: fix bashism
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -74,7 +74,7 @@ for version in 23 2b 20 2a 17; do
+   version_flag="-std=c++${version}"
+   AX_CHECK_COMPILE_FLAG([${version_flag}], [break], [version_flag=none])
+ done
+-AS_IF([test "$version_flag" == none], [
++AS_IF([test "$version_flag" = none], [
+   AC_MSG_ERROR([Could not enable at least C++17 - upgrade your compiler])
+ ])
+ CXXFLAGS="$CXXFLAGS ${version_flag}"
+
diff --git a/sci-misc/lttoolbox/lttoolbox-3.7.1.ebuild b/sci-misc/lttoolbox/lttoolbox-3.7.1.ebuild
new file mode 100644
index 000000000000..f06d069fc3c1
--- /dev/null
+++ b/sci-misc/lttoolbox/lttoolbox-3.7.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Toolbox for lexical processing, morphological analysis and generation of words"
+HOMEPAGE="https://www.apertium.org"
+SRC_URI="https://github.com/apertium/lttoolbox/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+# PKG_VERSION_ABI in configure.ac
+SLOT="0/3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/utfcpp
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.7.1-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-python-bindings
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-misc/lttoolbox/metadata.xml b/sci-misc/lttoolbox/metadata.xml
index 0f2b58fa0f24..54c528001f48 100644
--- a/sci-misc/lttoolbox/metadata.xml
+++ b/sci-misc/lttoolbox/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">apertium</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">apertium/lttoolbox</remote-id>
+		<remote-id type="sourceforge">apertium</remote-id>
+	</upstream>
 </pkgmetadata>