gentoo auto-resync : 30:04:2024 - 00:00:01

2 files changed, 27 insertions, 19 deletions

diff --git a/sci-mathematics/stp/Manifest b/sci-mathematics/stp/Manifest
index b86e474e477a..d7e50d42d770 100644
--- a/sci-mathematics/stp/Manifest
+++ b/sci-mathematics/stp/Manifest
@@ -4,5 +4,5 @@ AUX stp-2.3.3-stp.py-library_path.patch 372 BLAKE2B 1e36f48d2c403cdea156157826a1
 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a
 DIST stp-2.3.3_OutputCheck.tar.gz 12002 BLAKE2B f8fafba8f7957f3d0ee480b9e1e8c8923c373cf134512d6329adf84a96f3177ad07d00eae4dc6dd8d4b09ca82dfc8b425602f1926e3f88ccb2556b4b7121e5b9 SHA512 36012ae2b2aee1ff3f36ba1678a4bcbfeb590e01c2042ca35eb2f49b6a890b767c1809d1415e7b03f2118204361f834ad9caf70319b59fd14b2c140bf858d16e
 DIST stp-2.3.3_gtest.tar.gz 469100 BLAKE2B 386444657d3f23e54f01dac8e0ac36da4d97c3eebcc8cf79bfc754c474a5ed64765a0ad389fef358667e468469c47d02a407e13e6882d426a4defb0102e4a758 SHA512 2fc79fe9c8a4e0487e7e76db9508fd2207df0cfe3940a51aeac32e4440afab9e265bfe553b1cd66086cd5a574d8bf99dbb9e1d9c4a70fafd7b31f38825914aa1
-EBUILD stp-2.3.3-r3.ebuild 2647 BLAKE2B 68f27fc8c9fc005aad547307226e33f257d0a4711025e15773b715c736816184f05fc1538f69374a1593ff4680e35c68a5b525807416d278afb81f9a3cc1f87a SHA512 c8756d525b05b48ff623dbe098495a8c2d610fbbda267918d93ac522c038aabdfa65d595959835aaa3983a667e04d75561339d25b34c56bfb4600694e9dc7387
+EBUILD stp-2.3.3-r3.ebuild 2672 BLAKE2B da4e83f06666631b8273f40616b1de06b11a3b3fd34f810cfe5c8d8d1f9f6b6aab53748e7a9bb550e22b6bda2db47deb4b7582a6897f0f5419d509af42984016 SHA512 aeb87a19f5c125d90f0ca8c54f80f3c7e87f4a991ea9b0aef1b5350aaf49c2db715a5ca4253d575e4a73c376867c92e5c547f141e6852afefd57fd7dbe7c3cbf
 MISC metadata.xml 1110 BLAKE2B e13b9420b7f730e6b9e2571e3f4e8a48cf7f54b16fa767fce48099549071c4c819e16a5da25b6779c77a5a7a7f21c3ec61eeb2719867f874a1c4fa21b84e32f2 SHA512 aa3ddfd8d3bf4647f230f0ca55b6f70f9f82f2ae63fe21edad637397fb1bd2779241a2e439a48bed59bd1de11ef3b4e275731c6a90873ec5d86bb5897bf2a9f0
diff --git a/sci-mathematics/stp/stp-2.3.3-r3.ebuild b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
index 3aa8309bf123..ae62721212d2 100644
--- a/sci-mathematics/stp/stp-2.3.3-r3.ebuild
+++ b/sci-mathematics/stp/stp-2.3.3-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-OC_COMMIT=119fe41a83bc455a24a11ecc9b78e7b13fcfcc45
-GT_COMMIT=2ad076167a676e3ed62f90b754b30fac5caa1f88
+OC_COMMIT="119fe41a83bc455a24a11ecc9b78e7b13fcfcc45"
+GT_COMMIT="2ad076167a676e3ed62f90b754b30fac5caa1f88"
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit flag-o-matic python-single-r1 cmake
 
@@ -16,6 +16,7 @@ HOMEPAGE="https://stp.github.io/
 SRC_URI="
 	https://github.com/stp/stp/archive/${PV}.tar.gz
 		-> ${P}.tar.gz
+
 	test? (
 		https://github.com/stp/OutputCheck/archive/${OC_COMMIT}.tar.gz
 			-> ${P}_OutputCheck.tar.gz
@@ -40,18 +41,24 @@ RDEPEND="
 		dev-libs/icu:=
 		sci-mathematics/cryptominisat:=
 	)
-	python? ( ${PYTHON_DEPS} )
+	python? (
+		${PYTHON_DEPS}
+	)
+"
+DEPEND="
+	${RDEPEND}
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	sys-apps/help2man
-	test? ( dev-python/lit )
+	test? (
+		dev-python/lit
+	)
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch
-	"${FILESDIR}"/${P}-cstdint.patch
-	"${FILESDIR}"/${P}-stp.py-library_path.patch
+	"${FILESDIR}/${P}-CMakeLists.txt-fix_cflags.patch"
+	"${FILESDIR}/${P}-cstdint.patch"
+	"${FILESDIR}/${P}-stp.py-library_path.patch"
 )
 
 pkg_setup() {
@@ -59,13 +66,14 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack "${P}.tar.gz"
 
 	if use test ; then
 		local i
 		for i in OutputCheck gtest ; do
-			tar xf "${DISTDIR}"/${P}_${i}.tar.gz --strip-components=1  \
-				-C "${S}"/utils/${i}  || die "failed to unpack ${i}"
+			tar xf "${DISTDIR}/${P}_${i}.tar.gz" --strip-components=1  \
+				-C "${S}/utils/${i}" \
+				|| die "failed to unpack ${i}"
 		done
 	fi
 }
@@ -75,7 +83,7 @@ src_prepare() {
 	sed -i "s/set(LIBDIR lib/set(LIBDIR $(get_libdir)/" CMakeLists.txt || die
 
 	# Remove problematic test
-	rm "${S}"/tests/query-files/misc-tests/no-query.cvc || die
+	rm "${S}/tests/query-files/misc-tests/no-query.cvc" || die
 
 	cmake_src_prepare
 }
@@ -86,9 +94,9 @@ src_configure() {
 
 	local CMAKE_BUILD_TYPE
 	if use debug ; then
-		CMAKE_BUILD_TYPE=Debug
+		CMAKE_BUILD_TYPE="Debug"
 	else
-		CMAKE_BUILD_TYPE=Release
+		CMAKE_BUILD_TYPE="Release"
 	fi
 
 	local -a mycmakeargs=(
@@ -107,8 +115,8 @@ src_install() {
 	# Because Python files for tests (in BUILD_DIR) and those installed on the
 	# system differ, and are generated upon install, we have to wait for CMake
 	# to install them into the temporary image.
-	use python && python_optimize "${D}/$(python_get_sitedir)"/stp
+	use python && python_optimize "${D}/$(python_get_sitedir)/stp"
 
-	mv "${D}"/usr/man "${D}"/usr/share/man || die
+	mv "${D}/usr/man" "${D}/usr/share/man" || die
 	dodoc -r papers
 }