Merge updates from master

2026-09-17 14:49:30 -07:00 · 2024-12-13 13:33:17 +00:00
parent 3f5e04c93f 9f7d6c384a
commit c32c2fb88a
6 changed files with 23 additions and 197 deletions
--- a/dev-ada/AdaSAT/AdaSAT-24.0.0-r2.ebuild
+++ b/dev-ada/AdaSAT/AdaSAT-24.0.0-r2.ebuild
@@ -3,8 +3,9 @@

 EAPI=8
 ADA_COMPAT=( gcc_12 gcc_13 )
+PYTHON_COMPAT=( python3_{10..12} )

-inherit ada multiprocessing
+inherit ada python-any-r1 multiprocessing

 DESCRIPTION="Implementation of a DPLL-based SAT solver in Ada"
 HOMEPAGE="https://github.com/AdaCore/AdaSAT"
@@ -17,13 +18,26 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs static-pic test"

 DEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-BDEPEND="test? ( dev-ada/e3-testsuite )"
+BDEPEND="test? (
+	$(python_gen_any_dep '
+		dev-ada/e3-testsuite[${PYTHON_USEDEP}]
+	')
+)"

 REQUIRED_USE="${ADA_REQUIRED_USE}
 	|| ( shared static-libs static-pic )
 	test? ( static-libs )"
 RESTRICT="!test? ( test )"

+python_check_deps() {
+	use test || return 0
+	python_has_version "dev-ada/e3-testsuite[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_compile() {
 	build () {
 		gprbuild -P adasat.gpr -p -v -j$(makeopts_jobs) \
@@ -52,5 +66,5 @@ src_install() {

 src_test() {
 	export ADA_PROJECT_PATH="${S}"
-	python3 testsuite/testsuite.py || die
+	${EPYTHON} testsuite/testsuite.py || die
 }
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@

 #--- END OF EXAMPLES ---

+# Ulrich Müller <ulm@gentoo.org> (2024-12-13)
+# Unmaintained upstream: last release (2.40) in 2009, last commit
+# to upstream repository in 2017. Broken with Emacs 29.
+# Removal on 2025-01-12. Bug #911288.
+app-emacs/ecb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2024-12-11)
 # Build system needs someone really dedicated to put up with it.
 # Version completely outdated, way too many bugs to list here.
@@ -280,11 +286,6 @@ dev-ruby/faker:2
 # version is no longer supported upstream. Removal on 2024-12-08.
 dev-ruby/jquery-ui-rails:6

-# Alfredo Tupone <tupone@gentoo.org> (2024-11-07)
-# No more used (caffe2 used to)
-# Removal on 2024-12-07.  Bug #942972.
-sci-libs/QNNPACK
-
 # Viorel Munteanu <ceamac@gentoo.org> (2024-10-18)
 # Experimental version, for testing purposes only.
 # Bug #941566.
--- a/sci-libs/QNNPACK/Manifest
+++ b/sci-libs/QNNPACK/Manifest
@@ -1 +0,0 @@
-DIST QNNPACK-2019.08.28.tar.gz 205600 BLAKE2B f174051cba9e3307633f0b12326a37d8fde23562d47e09d3c078350146439094ca6cb2f032cf3aa4af40e5968ee16b8847241f787f7c84ea501124e0528fb82d SHA512 437a835acfedae851a9a8572fa6eea9854dcb8bcca499bc4a2582314e44f5f199778e857932da4aecf943bea7cb2eb5b1c41d4b4ca6075bddbe0f18b2c7b9127
--- a/sci-libs/QNNPACK/QNNPACK-2019.08.28-r1.ebuild
+++ b/sci-libs/QNNPACK/QNNPACK-2019.08.28-r1.ebuild
@@ -1,47 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit cmake
-
-CommitId=7d2a4e9931a82adc3814275b6219a03e24e36b4c
-
-DESCRIPTION="Quantized Neural Networks PACKage"
-HOMEPAGE="https://github.com/pytorch/QNNPACK/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/cpuinfo
-	dev-libs/pthreadpool
-"
-DEPEND="${RDEPEND}
-	dev-libs/FP16
-	dev-libs/FXdiv
-	dev-libs/clog
-"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( static-libs )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DQNNPACK_BUILD_BENCHMARKS=OFF
-		-DQNNPACK_BUILD_TESTS=$(usex test ON OFF)
-		-DQNNPACK_LIBRARY_TYPE=$(usex static-libs static shared)
-	)
-
-	cmake_src_configure
-}
--- a/sci-libs/QNNPACK/files/QNNPACK-2019.08.28-gentoo.patch
+++ b/sci-libs/QNNPACK/files/QNNPACK-2019.08.28-gentoo.patch
@@ -1,130 +0,0 @@
--- a/CMakeLists.txt	2022-05-18 22:04:51.143871114 +0200
-+++ b/CMakeLists.txt	2022-05-18 22:05:11.998576858 +0200
-@@ -57,7 +57,7 @@
-   SET(CLOG_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/clog")
- ENDIF()
- 
-IF(NOT DEFINED CPUINFO_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading cpuinfo to ${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo (define CPUINFO_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadCpuinfo.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/cpuinfo-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -67,7 +67,7 @@
-   SET(CPUINFO_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/cpuinfo" CACHE STRING "cpuinfo source directory")
- ENDIF()
- 
-IF(NOT DEFINED FP16_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading FP16 to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16 (define FP16_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadFP16.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -77,7 +77,7 @@
-   SET(FP16_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fp16" CACHE STRING "FP16 source directory")
- ENDIF()
- 
-IF(NOT DEFINED FXDIV_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading FXdiv to ${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv (define FXDIV_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadFXdiv.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -87,7 +87,7 @@
-   SET(FXDIV_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/fxdiv" CACHE STRING "FXdiv source directory")
- ENDIF()
- 
-IF(NOT DEFINED PSIMD_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading PSimd to ${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd (define PSIMD_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadPSimd.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -97,7 +97,7 @@
-   SET(PSIMD_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/psimd" CACHE STRING "PSimd source directory")
- ENDIF()
- 
-IF(NOT DEFINED PTHREADPOOL_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading pthreadpool to ${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool (define PTHREADPOOL_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadPThreadPool.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/pthreadpool-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -107,7 +107,7 @@
-   SET(PTHREADPOOL_SOURCE_DIR "${CONFU_DEPENDENCIES_SOURCE_DIR}/pthreadpool" CACHE STRING "pthreadpool source directory")
- ENDIF()
- 
-IF(QNNPACK_BUILD_TESTS AND NOT DEFINED GOOGLETEST_SOURCE_DIR)
-+IF(FALSE)
-   MESSAGE(STATUS "Downloading Google Test to ${CONFU_DEPENDENCIES_SOURCE_DIR}/googletest (define GOOGLETEST_SOURCE_DIR to avoid it)")
-   CONFIGURE_FILE(cmake/DownloadGoogleTest.cmake "${CONFU_DEPENDENCIES_BINARY_DIR}/googletest-download/CMakeLists.txt")
-   EXECUTE_PROCESS(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
-@@ -272,7 +272,7 @@
- SET_TARGET_PROPERTIES(qnnpack PROPERTIES PUBLIC_HEADER include/qnnpack.h)
- 
- # ---[ Configure clog
-IF(NOT TARGET clog)
-+IF(FALSE)
-   SET(CLOG_BUILD_TESTS OFF CACHE BOOL "")
-   SET(CLOG_RUNTIME_TYPE "${CPUINFO_RUNTIME_TYPE}" CACHE STRING "")
-   ADD_SUBDIRECTORY(
-@@ -284,7 +284,7 @@
- TARGET_LINK_LIBRARIES(qnnpack PRIVATE clog)
- 
- # ---[ Configure cpuinfo
-IF(NOT TARGET cpuinfo)
-+IF(FALSE)
-   SET(CPUINFO_BUILD_TOOLS OFF CACHE BOOL "")
-   SET(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "")
-   SET(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "")
-@@ -296,7 +296,7 @@
- TARGET_LINK_LIBRARIES(qnnpack PRIVATE cpuinfo)
- 
- # ---[ Configure pthreadpool
-IF(NOT TARGET pthreadpool)
-+IF(FALSE)
-   SET(PTHREADPOOL_BUILD_TESTS OFF CACHE BOOL "")
-   SET(PTHREADPOOL_BUILD_BENCHMARKS OFF CACHE BOOL "")
-   ADD_SUBDIRECTORY(
-@@ -312,7 +312,7 @@
- ENDIF()
- 
- # ---[ Configure FXdiv
-IF(NOT TARGET fxdiv)
-+IF(FALSE)
-   SET(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
-   SET(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
-   ADD_SUBDIRECTORY(
-@@ -319,18 +319,16 @@
-     "${FXDIV_SOURCE_DIR}"
-     "${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
- ENDIF()
-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fxdiv)
- 
- # ---[ Configure psimd
-IF(NOT TARGET psimd)
-+IF(FALSE)
-   ADD_SUBDIRECTORY(
-     "${PSIMD_SOURCE_DIR}"
-     "${CONFU_DEPENDENCIES_BINARY_DIR}/psimd")
- ENDIF()
-TARGET_LINK_LIBRARIES(qnnpack PRIVATE psimd)
- 
- # ---[ Configure FP16
-IF(NOT TARGET fp16)
-+IF(FALSE)
-   SET(FP16_BUILD_TESTS OFF CACHE BOOL "")
-   SET(FP16_BUILD_BENCHMARKS OFF CACHE BOOL "")
-   ADD_SUBDIRECTORY(
-@@ -337,7 +335,6 @@
-     "${FP16_SOURCE_DIR}"
-     "${CONFU_DEPENDENCIES_BINARY_DIR}/fp16")
- ENDIF()
-TARGET_LINK_LIBRARIES(qnnpack PRIVATE fp16)
- 
- INSTALL(TARGETS qnnpack
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-@@ -347,7 +347,7 @@
- # ---[ QNNPACK unit tests
- IF(QNNPACK_BUILD_TESTS)
-   # ---[ Build google test
-  IF(NOT TARGET gtest)
-+  IF(FALSE)
-     SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-     ADD_SUBDIRECTORY(
-       "${GOOGLETEST_SOURCE_DIR}"
--- a/sci-libs/QNNPACK/metadata.xml
+++ b/sci-libs/QNNPACK/metadata.xml
@@ -1,11 +0,0 @@
-<?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="github">pytorch/QNNPACK</remote-id>
-	</upstream>
-</pkgmetadata>
				`@@ -1 +0,0 @@`
				`DIST QNNPACK-2019.08.28.tar.gz 205600 BLAKE2B f174051cba9e3307633f0b12326a37d8fde23562d47e09d3c078350146439094ca6cb2f032cf3aa4af40e5968ee16b8847241f787f7c84ea501124e0528fb82d SHA512 437a835acfedae851a9a8572fa6eea9854dcb8bcca499bc4a2582314e44f5f199778e857932da4aecf943bea7cb2eb5b1c41d4b4ca6075bddbe0f18b2c7b9127`