From 83ecd0e3fb166631200d5facc0359e3057fa2aef Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Fri, 1 Mar 2024 13:41:17 +0100 Subject: [PATCH 01/16] dev-libs/unordered_dense: add 4.4.0 Signed-off-by: Steffen Winter --- dev-libs/unordered_dense/Manifest | 1 + .../unordered_dense-4.4.0.ebuild | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 dev-libs/unordered_dense/unordered_dense-4.4.0.ebuild diff --git a/dev-libs/unordered_dense/Manifest b/dev-libs/unordered_dense/Manifest index 6bdef4a155..732fcba6d7 100644 --- a/dev-libs/unordered_dense/Manifest +++ b/dev-libs/unordered_dense/Manifest @@ -2,3 +2,4 @@ DIST unordered_dense-2.0.0.tar.gz 307275 BLAKE2B d579740134a8e67e8487c1d6779bc5e DIST unordered_dense-2.0.1.tar.gz 307477 BLAKE2B bca5564eba6811cedc4fc392dcd3b273209262123d69dcf7d2f6950d90b6d9e6da5754f279b0bbac18e67fa37214a5bc31a11a79d3ddfe6db2e30e9ba8ef7906 SHA512 26ac0ab296b10b0668291370b43df9dcb37e5145328f77233f8fcc2ab9cb2df4d00489d80cde167c0a4ab868547bd3148ca80500400331c7fb0039adb122bfeb DIST unordered_dense-3.1.1.tar.gz 308854 BLAKE2B 3addc3f559cb9de37d0dfd6408b020b2f2d8cd066c565d3cae8b3c834a97c652a10f3272a628feaaddee2442132db8f196d326ee3a766e42841674ee5493c95a SHA512 5cab1affaa8e49e14c4db6c35bd00cf7f9c967e46be65a80b995b0bf78bea1a52d074abd43e4e65b8c102469ef07dface929f83920edef493e8b6af2eaeebafd DIST unordered_dense-4.0.1.tar.gz 364688 BLAKE2B 190ecdf53c2e476702e362e474dc2f692fd6dd6b15e9313a59710dce3f520aa3f53304e52a00f5d81194a6dbff7346c145be3ab0b083246df018e1bbedadb736 SHA512 105eb88deeb89c9424973d2b5425a6e176f3f66a45f11cf6ed520cce177918cd5345e840d10561f6f790b6cc11b7b6e1357bd2fc4d199254a360de88ce553fe0 +DIST unordered_dense-4.4.0.tar.gz 900081 BLAKE2B cffac8fa38ec4779a5d05e212d185a54e0d3014c894efaf0bd76bdc8408fed6b9cb8e01b0d2fd7cefbe1abe34cdff00c7f1df1f5627379afa1e2f830f2527c83 SHA512 82724dd3651f520a240b131fa7cac209d844b9f3a54ea36c8cbb125cb42fdbf5f38d96935f2999e5bf04c447b2b9fde4ebc740decfd7d3d4b7d45177d4f26b58 diff --git a/dev-libs/unordered_dense/unordered_dense-4.4.0.ebuild b/dev-libs/unordered_dense/unordered_dense-4.4.0.ebuild new file mode 100644 index 0000000000..90f7c5fd68 --- /dev/null +++ b/dev-libs/unordered_dense/unordered_dense-4.4.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="A fast and densely stored hashmap and hashset" +HOMEPAGE="https://github.com/martinus/unordered_dense" + +if [[ "${PV}" == "9999" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/martinus/${PN}.git" +else + SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + S="${WORKDIR}/${P}" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" + -D BUILD_SHARED_LIBS=ON + ) + cmake_src_configure +} From 28f1da46525581617a3156830f02c83477bcd4a6 Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Fri, 1 Mar 2024 13:45:51 +0100 Subject: [PATCH 02/16] dev-libs/unordered_dense: Update live ebuild Drop downstream patch and disable tests since they can't be run with cmake at the moment. Signed-off-by: Steffen Winter --- dev-libs/unordered_dense/Manifest | 3 --- .../unordered_dense/unordered_dense-9999.ebuild | 17 +++-------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dev-libs/unordered_dense/Manifest b/dev-libs/unordered_dense/Manifest index 732fcba6d7..efa8851a45 100644 --- a/dev-libs/unordered_dense/Manifest +++ b/dev-libs/unordered_dense/Manifest @@ -1,5 +1,2 @@ -DIST unordered_dense-2.0.0.tar.gz 307275 BLAKE2B d579740134a8e67e8487c1d6779bc5ea2bf0b3ab70ce60f3b8b68d1fdabc9b45a099e49500b417f21a3fc4c88d2aadbf96afa7b56a8d7d581a0d3f3f6badf61b SHA512 8c7d582abd2142310b50d835ce3cb9a0731a6f7bc6419d01742860cbcb0ade31aad393c93523b8ff82ce456f6cbab5a3d93f91f95c8eb5f7f960fa4793f57d8d -DIST unordered_dense-2.0.1.tar.gz 307477 BLAKE2B bca5564eba6811cedc4fc392dcd3b273209262123d69dcf7d2f6950d90b6d9e6da5754f279b0bbac18e67fa37214a5bc31a11a79d3ddfe6db2e30e9ba8ef7906 SHA512 26ac0ab296b10b0668291370b43df9dcb37e5145328f77233f8fcc2ab9cb2df4d00489d80cde167c0a4ab868547bd3148ca80500400331c7fb0039adb122bfeb -DIST unordered_dense-3.1.1.tar.gz 308854 BLAKE2B 3addc3f559cb9de37d0dfd6408b020b2f2d8cd066c565d3cae8b3c834a97c652a10f3272a628feaaddee2442132db8f196d326ee3a766e42841674ee5493c95a SHA512 5cab1affaa8e49e14c4db6c35bd00cf7f9c967e46be65a80b995b0bf78bea1a52d074abd43e4e65b8c102469ef07dface929f83920edef493e8b6af2eaeebafd DIST unordered_dense-4.0.1.tar.gz 364688 BLAKE2B 190ecdf53c2e476702e362e474dc2f692fd6dd6b15e9313a59710dce3f520aa3f53304e52a00f5d81194a6dbff7346c145be3ab0b083246df018e1bbedadb736 SHA512 105eb88deeb89c9424973d2b5425a6e176f3f66a45f11cf6ed520cce177918cd5345e840d10561f6f790b6cc11b7b6e1357bd2fc4d199254a360de88ce553fe0 DIST unordered_dense-4.4.0.tar.gz 900081 BLAKE2B cffac8fa38ec4779a5d05e212d185a54e0d3014c894efaf0bd76bdc8408fed6b9cb8e01b0d2fd7cefbe1abe34cdff00c7f1df1f5627379afa1e2f830f2527c83 SHA512 82724dd3651f520a240b131fa7cac209d844b9f3a54ea36c8cbb125cb42fdbf5f38d96935f2999e5bf04c447b2b9fde4ebc740decfd7d3d4b7d45177d4f26b58 diff --git a/dev-libs/unordered_dense/unordered_dense-9999.ebuild b/dev-libs/unordered_dense/unordered_dense-9999.ebuild index aeee6d9a07..90f7c5fd68 100644 --- a/dev-libs/unordered_dense/unordered_dense-9999.ebuild +++ b/dev-libs/unordered_dense/unordered_dense-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="8" +EAPI=8 inherit cmake @@ -19,18 +19,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" - -DEPEND=" - ${RDEPEND} -" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" -) +RESTRICT="test" src_configure() { local mycmakeargs=( From 9425143319287a4da8f735048d5b9807e38ffe21 Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Fri, 1 Mar 2024 13:46:53 +0100 Subject: [PATCH 03/16] dev-libs/unordered_dense: drop 2.0.0, 2.0.1, 3.1.1 Signed-off-by: Steffen Winter --- ...d_dense-2.0.0-fix-cmake-install-path.patch | 26 ------------ .../unordered_dense-2.0.0.ebuild | 41 ------------------- .../unordered_dense-2.0.1.ebuild | 37 ----------------- .../unordered_dense-3.1.1.ebuild | 37 ----------------- 4 files changed, 141 deletions(-) delete mode 100644 dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch delete mode 100644 dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild delete mode 100644 dev-libs/unordered_dense/unordered_dense-2.0.1.ebuild delete mode 100644 dev-libs/unordered_dense/unordered_dense-3.1.1.ebuild diff --git a/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch deleted file mode 100644 index bc7e4b1537..0000000000 --- a/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2991bc..16096fc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,18 +42,18 @@ if(_unordered_dense_is_toplevel_project) - configure_package_config_file( - "${PROJECT_SOURCE_DIR}/cmake/unordered_denseConfig.cmake.in" - "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" -- INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - - install( - EXPORT unordered_dense_Targets - FILE unordered_denseTargets.cmake - NAMESPACE unordered_dense:: -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - - install( - FILES "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" - "${PROJECT_BINARY_DIR}/unordered_denseConfigVersion.cmake" -- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - - install( - DIRECTORY ${PROJECT_SOURCE_DIR}/include/ankerl diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild deleted file mode 100644 index aeee6d9a07..0000000000 --- a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit cmake - -DESCRIPTION="A fast and densely stored hashmap and hashset" -HOMEPAGE="https://github.com/martinus/unordered_dense" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/martinus/${PN}.git" -else - SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" - -DEPEND=" - ${RDEPEND} -" - -PATCHES=( - "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" -) - -src_configure() { - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.1.ebuild b/dev-libs/unordered_dense/unordered_dense-2.0.1.ebuild deleted file mode 100644 index c2d63f1dc1..0000000000 --- a/dev-libs/unordered_dense/unordered_dense-2.0.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit cmake - -DESCRIPTION="A fast and densely stored hashmap and hashset" -HOMEPAGE="https://github.com/martinus/unordered_dense" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/martinus/${PN}.git" -else - SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" - -DEPEND=" - ${RDEPEND} -" - -src_configure() { - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} diff --git a/dev-libs/unordered_dense/unordered_dense-3.1.1.ebuild b/dev-libs/unordered_dense/unordered_dense-3.1.1.ebuild deleted file mode 100644 index c2d63f1dc1..0000000000 --- a/dev-libs/unordered_dense/unordered_dense-3.1.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -inherit cmake - -DESCRIPTION="A fast and densely stored hashmap and hashset" -HOMEPAGE="https://github.com/martinus/unordered_dense" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/martinus/${PN}.git" -else - SRC_URI="https://github.com/martinus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="" - -DEPEND=" - ${RDEPEND} -" - -src_configure() { - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - ) - cmake_src_configure -} From a402ee97f2f347d4c62d76f472cbd155c39d759d Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Fri, 1 Mar 2024 14:11:14 +0100 Subject: [PATCH 04/16] sci-electronics/slang: drop 1.0, 2.0-r2, 3.0 Signed-off-by: Steffen Winter --- sci-electronics/slang/Manifest | 3 - .../slang/files/slang-2.0-fix-pkgconfig.patch | 26 ------- .../files/slang-2.0-fix-unordered-dense.patch | 64 ----------------- .../files/slang-2.0-renamed-svlang.patch | 32 --------- sci-electronics/slang/slang-1.0.ebuild | 58 --------------- sci-electronics/slang/slang-2.0-r2.ebuild | 72 ------------------- sci-electronics/slang/slang-3.0.ebuild | 64 ----------------- 7 files changed, 319 deletions(-) delete mode 100644 sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch delete mode 100644 sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch delete mode 100644 sci-electronics/slang/files/slang-2.0-renamed-svlang.patch delete mode 100644 sci-electronics/slang/slang-1.0.ebuild delete mode 100644 sci-electronics/slang/slang-2.0-r2.ebuild delete mode 100644 sci-electronics/slang/slang-3.0.ebuild diff --git a/sci-electronics/slang/Manifest b/sci-electronics/slang/Manifest index 94b3e14ff6..c1278ad217 100644 --- a/sci-electronics/slang/Manifest +++ b/sci-electronics/slang/Manifest @@ -1,5 +1,2 @@ -DIST slang-1.0.tar.gz 1239664 BLAKE2B 98355987b5c355eb914dd0d38c7441d5d39b7a0259e557d9cfd6271fd35aab642db6036d55228f75522fef0c31a4c82dea4d09cdb04ea33c60d843a3ca14caf0 SHA512 25ef7f5abb1b73928f61b853db5462baf72077a47daa9419311aba1f8fdca0bd499518c2f64dfff95b3c0671e52f2b1cd37edb7d1c74fb983b74de08fe7eea37 -DIST slang-2.0.tar.gz 1026299 BLAKE2B d55e0f419e030a37ff80aef3c0b16a96ee402707c758797fea3d1914e29247d22d240693cd873f95f634438fad5b8ed65961a324c69788fc3e62f83ce0a94869 SHA512 3d18961cda7eb40877932e937364b19cfcef3127a8467fbfc70febd1d6ef8b267aeae8244355a4b0206197ef126ee5a65aa4a4fb49d0970fe6c626725b7e6b21 -DIST slang-3.0.tar.gz 1097223 BLAKE2B 87f7ac55fb719e64049e56792af9edbe20c39cebcd496f3fa3c980f54490a885f8bc3443b0c841930baf1d57854aba54747acf3f6a8debda3e1cb110dae364f0 SHA512 3d340ccdd7573d61b9e391861712d6b97a2c686b2bae351c1b25f11539146f6d00539b044c69f7dc362ed160828a1bb00f180553dcb760affe912e521bc56a8a DIST slang-4.0.tar.gz 1308308 BLAKE2B 99029a26b3fe86942abc33381f8f9ba050c09b390ed7fc54404f4054eb34a83e168d53096cad2e8f037954770a95009c701c86b1e59e1e9d02e1709fd120164c SHA512 043c053452b2d452875b2e3ed96be5b96275544e2a692bec8b170e01cefec6e5648a6681e3cac3afd2a68c8ec57f6461a9a73394d74abbc8627d49b66978808e DIST slang-5.0.tar.gz 1334032 BLAKE2B 08981f86d0be6a4a7d391a2b65d8f4e5bdab8e3ba50f6e847e2b25fec9d9345e806045faae3c74fd71db90f939d8668ff775465ea1e8433d660a0a53f20a358a SHA512 a1b7b9aac7357a9a7cc1818adbb5e9622234f607aba452ca57e3d28b31779339bb19557137cf37cdcc2abb2aba15eb6d2f580169322caf075a2518b3d8634a26 diff --git a/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch b/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch deleted file mode 100644 index 67b983a161..0000000000 --- a/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b821c33c391814ac332d6a85783179e084d1345a Mon Sep 17 00:00:00 2001 -From: Nick Gasson -Date: Sun, 20 Nov 2022 21:23:24 +0000 -Subject: [PATCH] Fix library name in sv-lang.pc.in (#661) - ---- - scripts/sv-lang.pc.in | 4 +- - 1 file changed, 2 insertion(+), 2 deletion(-) - -diff --git a/scripts/sv-lang.pc.in b/scripts/sv-lang.pc.in -index eabfbc9a..fc6191b7 100644 ---- a/scripts/sv-lang.pc.in -+++ b/scripts/sv-lang.pc.in -@@ -2,9 +2,9 @@ - includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" - libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" - --Name: @PROJECT_NAME@ -+Name: svlang - Description: @PROJECT_DESCRIPTION@ - URL: @PROJECT_HOMEPAGE_URL@ - Version: @PROJECT_VERSION@ - Cflags: -I"${includedir}" --Libs: -L"${libdir}" -lslang -+Libs: -L"${libdir}" -lsvlang - diff --git a/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch b/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch deleted file mode 100644 index 8aeb228fa9..0000000000 --- a/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 16ef772ec581e929197eae35ef99993e4d7c8dbb Mon Sep 17 00:00:00 2001 -From: Huang Rui -Date: Thu, 3 Nov 2022 12:04:42 +0800 -Subject: [PATCH] external/CMakeLists.txt: fix find_pkg when unordered_dense - installed - -If the user has already installed unordered_dense beforehand, -avoid downloading and installing again. -Applicable when the distribution has packaged unordered_dense. - -Signed-off-by: Huang Rui ---- - external/CMakeLists.txt | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt -index 97e0e79c7..6eb30989a 100644 ---- a/external/CMakeLists.txt -+++ b/external/CMakeLists.txt -@@ -27,11 +27,17 @@ if((SLANG_INCLUDE_PYLIB OR BUILD_SHARED_LIBS) AND NOT fmt_FOUND) - set_target_properties(fmt PROPERTIES POSITION_INDEPENDENT_CODE ON) - endif() - -+set(find_pkg_args "") -+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0") -+ set(find_pkg_args "FIND_PACKAGE_ARGS" "2.0.0") -+endif() -+ - FetchContent_Declare( - unordered_dense - GIT_REPOSITORY https://github.com/martinus/unordered_dense.git - GIT_TAG v2.0.0 -- GIT_SHALLOW ON) -+ GIT_SHALLOW ON -+ ${find_pkg_args}) - FetchContent_MakeAvailable(unordered_dense) - - if(SLANG_INCLUDE_INSTALL) -@@ -44,10 +50,12 @@ if(SLANG_INCLUDE_INSTALL) - ${PROJECT_SOURCE_DIR}/external/span.hpp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT slang_Development) -- install( -- DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -- COMPONENT slang_Development) -+ if(NOT unordered_dense_FOUND) -+ install( -+ DIRECTORY ${unordered_dense_SOURCE_DIR}/include/ankerl -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ COMPONENT slang_Development) -+ endif() - - if(NOT fmt_FOUND) - install( -@@ -59,5 +67,7 @@ if(SLANG_INCLUDE_INSTALL) - PRIVATE_HEADER EXCLUDE_FROM_ALL) - endif() - -- install(TARGETS unordered_dense EXPORT slangTargets) -+ if(NOT unordered_dense_FOUND) -+ install(TARGETS unordered_dense EXPORT slangTargets) -+ endif() - endif() diff --git a/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch deleted file mode 100644 index 6e60c31e81..0000000000 --- a/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a3bf429c886407198e7e3a292af80e6c60ee27d2 Mon Sep 17 00:00:00 2001 -From: jrudess -Date: Sat, 5 Nov 2022 16:24:04 -0700 -Subject: [PATCH] Provide cmake override for shared-lib name - ---- - source/CMakeLists.txt | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 58b73678..f9ac7cd4 100644 ---- a/source/CMakeLists.txt -+++ b/source/CMakeLists.txt -@@ -86,6 +86,7 @@ add_library( - - add_subdirectory(ast) - -+set(SLANG_SHARED_LIB_NAME svlang) - add_library(slang::slang ALIAS slang_slang) - set_target_properties( - slang_slang -@@ -93,8 +94,8 @@ set_target_properties( - VISIBILITY_INLINES_HIDDEN YES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR} -- EXPORT_NAME slang -- OUTPUT_NAME slang) -+ EXPORT_NAME ${SLANG_SHARED_LIB_NAME} -+ OUTPUT_NAME ${SLANG_SHARED_LIB_NAME}) - - # Compile options - target_compile_options(slang_slang PRIVATE ${SLANG_WARN_FLAGS}) diff --git a/sci-electronics/slang/slang-1.0.ebuild b/sci-electronics/slang/slang-1.0.ebuild deleted file mode 100644 index cddfba31c5..0000000000 --- a/sci-electronics/slang/slang-1.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-single-r1 - -DESCRIPTION="SystemVerilog compiler and language services" -HOMEPAGE=" - https://sv-lang.com - https://github.com/MikePopoloski/slang -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git" -else - SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="python test" -REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/libfmt -" - -DEPEND=" - ${RDEPEND} -" - -src_configure() { - python_setup - - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - -D SLANG_INCLUDE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - # fix libdir path - if [[ "$(get_libdir)" != "lib" ]] ; then - mv "${D}"/usr/lib "${D}"/usr/"$(get_libdir)" || die - fi - # file collisions of internal fmt - rm -r "${D}"/usr/include/fmt || die -} diff --git a/sci-electronics/slang/slang-2.0-r2.ebuild b/sci-electronics/slang/slang-2.0-r2.ebuild deleted file mode 100644 index 3e991aeacc..0000000000 --- a/sci-electronics/slang/slang-2.0-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-single-r1 - -DESCRIPTION="SystemVerilog compiler and language services" -HOMEPAGE=" - https://sv-lang.com - https://github.com/MikePopoloski/slang -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git" -else - SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="python test" -REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/catch-3.0.1 - >=dev-libs/libfmt-9.1.0 - >=dev-libs/unordered_dense-2.0.0 =dev-python/pybind11-2.10[${PYTHON_USEDEP}] - ') -" - -DEPEND=" - ${RDEPEND} -" - -PATCHES=( - "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" - "${FILESDIR}/${PN}-2.0-renamed-svlang.patch" - "${FILESDIR}/${PN}-2.0-fix-pkgconfig.patch" -) - -src_configure() { - python_setup - # SLANG_SHARED_LIB_NAME=svlang because of name collision - # https://github.com/MikePopoloski/slang/issues/646 - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - -D SLANG_INCLUDE_PYLIB=$(usex python) - -D SLANG_INCLUDE_TESTS=$(usex test) - -D SLANG_SHARED_LIB_NAME="svlang" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use python; then - # fix python unexpected paths QA - mkdir -p "${D}/$(python_get_sitedir)" || die - mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die - fi -} diff --git a/sci-electronics/slang/slang-3.0.ebuild b/sci-electronics/slang/slang-3.0.ebuild deleted file mode 100644 index e3d4bccf41..0000000000 --- a/sci-electronics/slang/slang-3.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..12} ) -inherit cmake python-single-r1 - -DESCRIPTION="SystemVerilog compiler and language services" -HOMEPAGE=" - https://sv-lang.com - https://github.com/MikePopoloski/slang -" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/MikePopoloski/${PN}.git" -else - SRC_URI="https://github.com/MikePopoloski/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" - S="${WORKDIR}/${P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="python test" -REQUIRED_USE=" ${PYTHON_REQUIRED_USE} " -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-cpp/catch-3.0.1 - >=dev-libs/libfmt-9.1.0 - >=dev-libs/unordered_dense-2.0.1 =dev-python/pybind11-2.10[${PYTHON_USEDEP}] - ') -" - -DEPEND=" - ${RDEPEND} -" - -src_configure() { - python_setup - local mycmakeargs=( - -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" - -D BUILD_SHARED_LIBS=ON - -D SLANG_USE_BOOST=OFF - -D SLANG_INCLUDE_PYLIB=$(usex python) - -D SLANG_INCLUDE_TESTS=$(usex test) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if use python; then - # fix python unexpected paths QA - mkdir -p "${D}/$(python_get_sitedir)" || die - mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die - fi -} From 54fbd24627346c1380b7731bc4be23045dd35776 Mon Sep 17 00:00:00 2001 From: Steffen Winter Date: Fri, 1 Mar 2024 15:11:08 +0100 Subject: [PATCH 05/16] sci-electronics/slang: Reorder deps, remove mimalloc dep mimalloc from ::gentoo doesn't install static libraries which would be required here. Fixes: https://bugs.gentoo.org/922041 Signed-off-by: Steffen Winter --- sci-electronics/slang/slang-4.0.ebuild | 11 +++++------ sci-electronics/slang/slang-5.0.ebuild | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/sci-electronics/slang/slang-4.0.ebuild b/sci-electronics/slang/slang-4.0.ebuild index 65c708aba3..8cf3c6e986 100644 --- a/sci-electronics/slang/slang-4.0.ebuild +++ b/sci-electronics/slang/slang-4.0.ebuild @@ -29,16 +29,14 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - >=dev-cpp/catch-3.0.1 - >=dev-libs/libfmt-9.1.0 - >=dev-libs/mimalloc-2.1.2 $(python_gen_cond_dep ' >=dev-python/pybind11-2.10[${PYTHON_USEDEP}] ') " - -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-libs/libfmt-9.1.0 + test? ( >=dev-cpp/catch-3.0.1 ) " PATCHES=( @@ -52,6 +50,7 @@ src_configure() { -D BUILD_SHARED_LIBS=ON -D SLANG_INCLUDE_PYLIB=$(usex python) -D SLANG_INCLUDE_TESTS=$(usex test) + -D SLANG_USE_MIMALLOC=OFF ) cmake_src_configure } diff --git a/sci-electronics/slang/slang-5.0.ebuild b/sci-electronics/slang/slang-5.0.ebuild index d910be8d22..671133d46c 100644 --- a/sci-electronics/slang/slang-5.0.ebuild +++ b/sci-electronics/slang/slang-5.0.ebuild @@ -29,16 +29,14 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} - >=dev-cpp/catch-3.0.1 - >=dev-libs/libfmt-9.1.0 - >=dev-libs/mimalloc-2.1.2 $(python_gen_cond_dep ' >=dev-python/pybind11-2.10[${PYTHON_USEDEP}] ') " - -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" + >=dev-libs/libfmt-9.1.0 + test? ( >=dev-cpp/catch-3.0.1 ) " PATCHES=( @@ -52,6 +50,7 @@ src_configure() { -D BUILD_SHARED_LIBS=ON -D SLANG_INCLUDE_PYLIB=$(usex python) -D SLANG_INCLUDE_TESTS=$(usex test) + -D SLANG_USE_MIMALLOC=OFF ) cmake_src_configure } From 1e5259bab37513c97dcc9f174b42ac0bb08814ec Mon Sep 17 00:00:00 2001 From: Alexey Zapparov Date: Fri, 1 Mar 2024 16:20:44 +0100 Subject: [PATCH 06/16] app-admin/pulumi-bin: add 3.108.0, drop 3.105.0 Signed-off-by: Alexey Zapparov --- app-admin/pulumi-bin/Manifest | 2 +- .../{pulumi-bin-3.105.0.ebuild => pulumi-bin-3.108.0.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app-admin/pulumi-bin/{pulumi-bin-3.105.0.ebuild => pulumi-bin-3.108.0.ebuild} (100%) diff --git a/app-admin/pulumi-bin/Manifest b/app-admin/pulumi-bin/Manifest index 063252a9cd..3b545a4622 100644 --- a/app-admin/pulumi-bin/Manifest +++ b/app-admin/pulumi-bin/Manifest @@ -1,3 +1,3 @@ -DIST pulumi-v3.105.0-linux-x64.tar.gz 155107676 BLAKE2B 29e55bdc259f5fe3c7b02b1c309c12aea5b607c43dd426071b5c9e3bf1cd580b03237d8487c0347ef5f181a814e032e0977c6ef6a38cfbd4a3a0f06f4eaa24e8 SHA512 c2c0d3572d26e7f9e3243ce07ac6130c60e8986684ad9c49833b814af07fadee4b7b2371427927c5b094719cfd41ea281fd71c866408a44129e7e35b6341ad3c DIST pulumi-v3.106.0-linux-x64.tar.gz 157770055 BLAKE2B a7dc4d5e5bd8756dbdbf906041934528c41fbc49afa0a387f61fd54ac0c87abf28f1ae2270f79bbf507c9028bc1c9fccbca8a75096a43e8d71e79650db1fce6a SHA512 6008714083062336f90b4409bb9fec924f1f62f4cc63456c9826e2aac4a99a9772a930642a0f42dcfa67a179dbc5e3b5492ebad9997476167aa5bb65dae57787 DIST pulumi-v3.107.0-linux-x64.tar.gz 157901430 BLAKE2B 70df3bd37659a2de9dcc1c6d2b9e752c6e123a0e8a8ea6e578e2b1a825e64ece28418097a3abb58f944bd33480948cf5431a0e9f6ad23ff0a1a27c0762bc3736 SHA512 cf6c683640bd327749bcce08f98cc4e4f95dfd64452fc7e216c19aa9713aeb65f0ba51d4ab74d8bd69c0fac94dae62cd49883958dc88f98c4c250558c6834fde +DIST pulumi-v3.108.0-linux-x64.tar.gz 157919986 BLAKE2B 970a368ba9888c87ff5bbb895708d93f18ecda4dc4f6979d3f5b4904d801c24dcc85b6245951ed09172d0f3cc746fdbea430f4def70c4e9e4ccdbb9368a3d428 SHA512 912ec0d3d1d0b15cab1314a6f429dc0744cc6da8cc9ff48db6502c123f764c2e292dfe698bfc21a049761e09acd798c218c0176e0caa95d91e3d224fd00889ac diff --git a/app-admin/pulumi-bin/pulumi-bin-3.105.0.ebuild b/app-admin/pulumi-bin/pulumi-bin-3.108.0.ebuild similarity index 100% rename from app-admin/pulumi-bin/pulumi-bin-3.105.0.ebuild rename to app-admin/pulumi-bin/pulumi-bin-3.108.0.ebuild From 2ac693cb42dfc872a451cc77a09818aa001e4e58 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:08:05 +0100 Subject: [PATCH 07/16] media-libs/dr_wav: add 0.13.16 Signed-off-by: Lucio Sauer --- media-libs/dr_wav/Manifest | 1 + media-libs/dr_wav/dr_wav-0.13.16.ebuild | 106 ++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 media-libs/dr_wav/dr_wav-0.13.16.ebuild diff --git a/media-libs/dr_wav/Manifest b/media-libs/dr_wav/Manifest index 10943227fd..04a0baf47d 100644 --- a/media-libs/dr_wav/Manifest +++ b/media-libs/dr_wav/Manifest @@ -1 +1,2 @@ DIST dr_wav-0.13.15.gh.tar.gz 518698 BLAKE2B 9598008c392fcb24448f15771bb47e6479c99b529164e28af00600d3eb7066ffb49f328bcaca88cb89ac0348551ff60cbf9c965d1f39e460319a0867b4141821 SHA512 8d6b8324db7a0864b1c264a1aea7f29eb282f726aa2d6ba8be8fb27892dd7c3c047b3b669bcc9744e52b4fb57899437bb42ba17b5cefd3520c98cb17570e68dd +DIST dr_wav-0.13.16.gh.tar.gz 518698 BLAKE2B 9598008c392fcb24448f15771bb47e6479c99b529164e28af00600d3eb7066ffb49f328bcaca88cb89ac0348551ff60cbf9c965d1f39e460319a0867b4141821 SHA512 8d6b8324db7a0864b1c264a1aea7f29eb282f726aa2d6ba8be8fb27892dd7c3c047b3b669bcc9744e52b4fb57899437bb42ba17b5cefd3520c98cb17570e68dd diff --git a/media-libs/dr_wav/dr_wav-0.13.16.ebuild b/media-libs/dr_wav/dr_wav-0.13.16.ebuild new file mode 100644 index 0000000000..79ac1a95ca --- /dev/null +++ b/media-libs/dr_wav/dr_wav-0.13.16.ebuild @@ -0,0 +1,106 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Single-header WAV audio loader and writer library" +HOMEPAGE="https://github.com/mackron/dr_libs/" +COMMIT="e4a7765e598e9e54dc0f520b7e4416359bee80cc" +SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="|| ( MIT-0 public-domain )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND="test? ( media-libs/libsndfile )" + +TESTCASES=( + dr_wav_encoding.c + dr_wav_{decoding,test_0}.{c,cpp} +) + +S="${WORKDIR}/dr_libs-${COMMIT}" + +src_prepare() { + if use test; then + # Unbundle library with incorrect include path. + sed -i 's,"../../../miniaudio/miniaudio.h",,' \ + tests/wav/dr_wav_playback.c || die + # Disable profiling tests as they are not relevant downstream. + sed -i 's/doProfiling = DRWAV_TRUE/doProfiling = DRWAV_FALSE/' \ + tests/wav/dr_wav_decoding.c || die + # Test cases dr_wav_{en,de}coding.{c,cpp} write and read a file from a + # missing directory. + mkdir tests/testvectors/wav/tests || die + fi + + awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md + assert + awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG + assert + default + +} + +src_compile() { + if use test; then + local MY_{C,CC,CXX,BUILD,FLAGS} + MY_CC=$(tc-getCC) + MY_CXX=$(tc-getCXX) + + pushd tests > /dev/null || die + for tcase in ${TESTCASES[@]}; do + case ${tcase} in + *.cpp) + MY_C=${MY_CXX} + MY_FLAGS=${CXXFLAGS} + ;; + *.c) + MY_C=${MY_CC} + MY_FLAGS=${CFLAGS} + ;; + *) + die "Unknown test case ${tcase}" + ;; + esac + MY_BUILD="${MY_C} wav/${tcase} -o bin/${tcase} ${MY_FLAGS} ${CPPFLAGS}" + case ${tcase%.*} in + dr_wav_encoding) + MY_BUILD="${MY_BUILD} -lm ${LDFLAGS}" + ;; + *) + ;; + esac + edo ${MY_BUILD} + done + popd || die + fi +} + +src_test() { + local MY_RUN + + pushd tests || die + for tcase in ${TESTCASES[@]}; do + MY_RUN="./bin/${tcase}" + case ${tcase%.*} in + dr_wav_encoding) + MY_RUN="${MY_RUN} testvectors/wav/tests/test_encode_gentoo" + ;; + *) + ;; + esac + edo ${MY_RUN} + done + popd || die +} + +src_install() { + einstalldocs + doheader dr_wav.h +} From 8fbe6ae70472aa3c0a5be34aa1048ef8e4b50fdb Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:08:30 +0100 Subject: [PATCH 08/16] media-libs/dr_wav: drop 0.13.15 Signed-off-by: Lucio Sauer --- media-libs/dr_wav/Manifest | 1 - media-libs/dr_wav/dr_wav-0.13.15.ebuild | 106 ------------------------ 2 files changed, 107 deletions(-) delete mode 100644 media-libs/dr_wav/dr_wav-0.13.15.ebuild diff --git a/media-libs/dr_wav/Manifest b/media-libs/dr_wav/Manifest index 04a0baf47d..0ab28d97c8 100644 --- a/media-libs/dr_wav/Manifest +++ b/media-libs/dr_wav/Manifest @@ -1,2 +1 @@ -DIST dr_wav-0.13.15.gh.tar.gz 518698 BLAKE2B 9598008c392fcb24448f15771bb47e6479c99b529164e28af00600d3eb7066ffb49f328bcaca88cb89ac0348551ff60cbf9c965d1f39e460319a0867b4141821 SHA512 8d6b8324db7a0864b1c264a1aea7f29eb282f726aa2d6ba8be8fb27892dd7c3c047b3b669bcc9744e52b4fb57899437bb42ba17b5cefd3520c98cb17570e68dd DIST dr_wav-0.13.16.gh.tar.gz 518698 BLAKE2B 9598008c392fcb24448f15771bb47e6479c99b529164e28af00600d3eb7066ffb49f328bcaca88cb89ac0348551ff60cbf9c965d1f39e460319a0867b4141821 SHA512 8d6b8324db7a0864b1c264a1aea7f29eb282f726aa2d6ba8be8fb27892dd7c3c047b3b669bcc9744e52b4fb57899437bb42ba17b5cefd3520c98cb17570e68dd diff --git a/media-libs/dr_wav/dr_wav-0.13.15.ebuild b/media-libs/dr_wav/dr_wav-0.13.15.ebuild deleted file mode 100644 index 79ac1a95ca..0000000000 --- a/media-libs/dr_wav/dr_wav-0.13.15.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -DESCRIPTION="Single-header WAV audio loader and writer library" -HOMEPAGE="https://github.com/mackron/dr_libs/" -COMMIT="e4a7765e598e9e54dc0f520b7e4416359bee80cc" -SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" - -LICENSE="|| ( MIT-0 public-domain )" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( media-libs/libsndfile )" - -TESTCASES=( - dr_wav_encoding.c - dr_wav_{decoding,test_0}.{c,cpp} -) - -S="${WORKDIR}/dr_libs-${COMMIT}" - -src_prepare() { - if use test; then - # Unbundle library with incorrect include path. - sed -i 's,"../../../miniaudio/miniaudio.h",,' \ - tests/wav/dr_wav_playback.c || die - # Disable profiling tests as they are not relevant downstream. - sed -i 's/doProfiling = DRWAV_TRUE/doProfiling = DRWAV_FALSE/' \ - tests/wav/dr_wav_decoding.c || die - # Test cases dr_wav_{en,de}coding.{c,cpp} write and read a file from a - # missing directory. - mkdir tests/testvectors/wav/tests || die - fi - - awk '/Introduction/,/\*\//' dr_wav.h | sed '$d' > README.md - assert - awk '/REVISION HISTORY/,/\*\//' dr_wav.h | sed '$d' > CHANGELOG - assert - default - -} - -src_compile() { - if use test; then - local MY_{C,CC,CXX,BUILD,FLAGS} - MY_CC=$(tc-getCC) - MY_CXX=$(tc-getCXX) - - pushd tests > /dev/null || die - for tcase in ${TESTCASES[@]}; do - case ${tcase} in - *.cpp) - MY_C=${MY_CXX} - MY_FLAGS=${CXXFLAGS} - ;; - *.c) - MY_C=${MY_CC} - MY_FLAGS=${CFLAGS} - ;; - *) - die "Unknown test case ${tcase}" - ;; - esac - MY_BUILD="${MY_C} wav/${tcase} -o bin/${tcase} ${MY_FLAGS} ${CPPFLAGS}" - case ${tcase%.*} in - dr_wav_encoding) - MY_BUILD="${MY_BUILD} -lm ${LDFLAGS}" - ;; - *) - ;; - esac - edo ${MY_BUILD} - done - popd || die - fi -} - -src_test() { - local MY_RUN - - pushd tests || die - for tcase in ${TESTCASES[@]}; do - MY_RUN="./bin/${tcase}" - case ${tcase%.*} in - dr_wav_encoding) - MY_RUN="${MY_RUN} testvectors/wav/tests/test_encode_gentoo" - ;; - *) - ;; - esac - edo ${MY_RUN} - done - popd || die -} - -src_install() { - einstalldocs - doheader dr_wav.h -} From fdbf051f39d274643870fe293ef80801a2a8c2e7 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:09:06 +0100 Subject: [PATCH 09/16] media-libs/dr_mp3: add 0.6.39 Signed-off-by: Lucio Sauer --- media-libs/dr_mp3/Manifest | 1 + media-libs/dr_mp3/dr_mp3-0.6.39.ebuild | 57 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 media-libs/dr_mp3/dr_mp3-0.6.39.ebuild diff --git a/media-libs/dr_mp3/Manifest b/media-libs/dr_mp3/Manifest index 3052d6bd7b..cfd7d3353c 100644 --- a/media-libs/dr_mp3/Manifest +++ b/media-libs/dr_mp3/Manifest @@ -1 +1,2 @@ DIST dr_mp3-0.6.38.gh.tar.gz 518478 BLAKE2B 4ef68a7ba24b84d5a3c87271d399b7abe9d367137d34b68f0533414f968315bafa59fc8ae6e9d40b6d82542060420e821c47ee3337fbd1589fceb0d0aded129f SHA512 2aa595a926bf72c56c3012fa7ea13ac7141952d1dc454f7135674286ba0df900554121624e7885fb242104c4bf0598826ed36952f591055033d419199a6b66fc +DIST dr_mp3-0.6.39.gh.tar.gz 518478 BLAKE2B 4ef68a7ba24b84d5a3c87271d399b7abe9d367137d34b68f0533414f968315bafa59fc8ae6e9d40b6d82542060420e821c47ee3337fbd1589fceb0d0aded129f SHA512 2aa595a926bf72c56c3012fa7ea13ac7141952d1dc454f7135674286ba0df900554121624e7885fb242104c4bf0598826ed36952f591055033d419199a6b66fc diff --git a/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild new file mode 100644 index 0000000000..224d735f02 --- /dev/null +++ b/media-libs/dr_mp3/dr_mp3-0.6.39.ebuild @@ -0,0 +1,57 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edo toolchain-funcs + +DESCRIPTION="Single-header MP3 audio decoder library" +HOMEPAGE="https://github.com/mackron/dr_libs/" +COMMIT="01d23df76776faccee3bc456f685900dcc273b4c" +SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +LICENSE="|| ( MIT-0 public-domain )" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="test" +RESTRICT="!test? ( test )" + +S="${WORKDIR}/dr_libs-${COMMIT}" + +# Unfortunately, the only other test is interactive. +TESTCASES=( + dr_mp3_test_0.c +) + +src_prepare() { + sed -n "36,83p" dr_mp3.h > README.md || die + sed -n "4496,4776p" dr_mp3.h > CHANGELOG || die + default +} + +src_compile() { + if use test; then + local MY_{CC,BUILD} + MY_CC=$(tc-getCC) + + pushd tests > /dev/null || die + for tcase in ${TESTCASES[@]}; do + MY_BUILD="${MY_CC} mp3/${tcase} -o bin/${tcase} ${CFLAGS} ${CPPFLAGS}" + edo ${MY_BUILD} + done + popd || die + fi +} + +src_test() { + pushd tests > /dev/null || die + for tcase in ${TESTCASES[@]}; do + edo bin/${tcase} + done + popd || die +} + +src_install() { + einstalldocs + doheader dr_mp3.h +} From 177bdd61aa9e0b6e909ff0af230a8875579dbd50 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:09:27 +0100 Subject: [PATCH 10/16] media-libs/dr_mp3: drop 0.6.38 Signed-off-by: Lucio Sauer --- media-libs/dr_mp3/Manifest | 1 - media-libs/dr_mp3/dr_mp3-0.6.38.ebuild | 57 -------------------------- 2 files changed, 58 deletions(-) delete mode 100644 media-libs/dr_mp3/dr_mp3-0.6.38.ebuild diff --git a/media-libs/dr_mp3/Manifest b/media-libs/dr_mp3/Manifest index cfd7d3353c..57e90a0368 100644 --- a/media-libs/dr_mp3/Manifest +++ b/media-libs/dr_mp3/Manifest @@ -1,2 +1 @@ -DIST dr_mp3-0.6.38.gh.tar.gz 518478 BLAKE2B 4ef68a7ba24b84d5a3c87271d399b7abe9d367137d34b68f0533414f968315bafa59fc8ae6e9d40b6d82542060420e821c47ee3337fbd1589fceb0d0aded129f SHA512 2aa595a926bf72c56c3012fa7ea13ac7141952d1dc454f7135674286ba0df900554121624e7885fb242104c4bf0598826ed36952f591055033d419199a6b66fc DIST dr_mp3-0.6.39.gh.tar.gz 518478 BLAKE2B 4ef68a7ba24b84d5a3c87271d399b7abe9d367137d34b68f0533414f968315bafa59fc8ae6e9d40b6d82542060420e821c47ee3337fbd1589fceb0d0aded129f SHA512 2aa595a926bf72c56c3012fa7ea13ac7141952d1dc454f7135674286ba0df900554121624e7885fb242104c4bf0598826ed36952f591055033d419199a6b66fc diff --git a/media-libs/dr_mp3/dr_mp3-0.6.38.ebuild b/media-libs/dr_mp3/dr_mp3-0.6.38.ebuild deleted file mode 100644 index 224d735f02..0000000000 --- a/media-libs/dr_mp3/dr_mp3-0.6.38.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edo toolchain-funcs - -DESCRIPTION="Single-header MP3 audio decoder library" -HOMEPAGE="https://github.com/mackron/dr_libs/" -COMMIT="01d23df76776faccee3bc456f685900dcc273b4c" -SRC_URI="https://github.com/mackron/dr_libs/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" -LICENSE="|| ( MIT-0 public-domain )" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/dr_libs-${COMMIT}" - -# Unfortunately, the only other test is interactive. -TESTCASES=( - dr_mp3_test_0.c -) - -src_prepare() { - sed -n "36,83p" dr_mp3.h > README.md || die - sed -n "4496,4776p" dr_mp3.h > CHANGELOG || die - default -} - -src_compile() { - if use test; then - local MY_{CC,BUILD} - MY_CC=$(tc-getCC) - - pushd tests > /dev/null || die - for tcase in ${TESTCASES[@]}; do - MY_BUILD="${MY_CC} mp3/${tcase} -o bin/${tcase} ${CFLAGS} ${CPPFLAGS}" - edo ${MY_BUILD} - done - popd || die - fi -} - -src_test() { - pushd tests > /dev/null || die - for tcase in ${TESTCASES[@]}; do - edo bin/${tcase} - done - popd || die -} - -src_install() { - einstalldocs - doheader dr_mp3.h -} From 20049e242c0fb8fc185ac5a4837406534d043d47 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:18:25 +0100 Subject: [PATCH 11/16] dev-python/pytest-mypy-plugins: add 3.1.0 Signed-off-by: Lucio Sauer --- dev-python/pytest-mypy-plugins/Manifest | 1 + .../pytest-mypy-plugins-3.1.0.ebuild | 52 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.1.0.ebuild diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest index 35c418d577..a4509d2f93 100644 --- a/dev-python/pytest-mypy-plugins/Manifest +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -1 +1,2 @@ DIST pytest-mypy-plugins-3.0.0.gh.tar.gz 20643 BLAKE2B e9b124b23f0e606b8d6f098c5834f8b70b44a6d7f374b0d4132c1fc47429a7a72a98ac96edd61a21969d4bc46a27c49cda35a9e0f71ed93361e0346debe643af SHA512 a2c35b4b57cf8eff6ac303a7394f798e3b96359c1e0e6424d57f0c5680cf00b6e84b7a11bb138c4ab3c7464f13ad0fd6358e9f2c5957b36eec1d2835e31edcd7 +DIST pytest-mypy-plugins-3.1.0.gh.tar.gz 24331 BLAKE2B b4cae94e254f8da0ef8cd081479cbee4522150843ef3bbbd16ae6efe6722e44e84aa49e761e99699b75c94f8b44963e8f9eeefb5c5b3352411df4801a1bbc5b4 SHA512 4892b653b9cd2bbe5cd253c5f0472d48a6eaf5e1261d53ef0f1c53470c2589baf21d428a0873c64acca71eec38ef9653ec501e0746ffc564d30830ba68148f91 diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.1.0.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.1.0.ebuild new file mode 100644 index 0000000000..240e457a1e --- /dev/null +++ b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.1.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{11,12} ) +inherit distutils-r1 + +DESCRIPTION="pytest plugin for testing mypy types, stubs, plugins" +HOMEPAGE=" + https://pypi.org/project/pytest-mypy-plugins/ + https://github.com/typeddjango/pytest-mypy-plugins/ +" + +SRC_URI="https://github.com/typeddjango/pytest-mypy-plugins/archive/refs/tags/${PV}.tar.gz + -> ${P}.gh.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DOCS="README* CHANGELOG*" + +RDEPEND=" + >=dev-python/mypy-1.3.0[${PYTHON_USEDEP}] + >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] + >=dev-python/tomlkit-0.11[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/jsonschema[${PYTHON_USEDEP}] + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/regex[${PYTHON_USEDEP}] +" + +distutils_enable_tests pytest + +python_prepare_all() { + # tests need pytest_mypy_plugins.tests on the modules search path and + # python -m pytest preprends sys.path with ${S} + sed "s/\"pytest\"/\"MY_EPYTHON\", \"-m\", \"pytest\"/" \ + -i pytest_mypy_plugins/tests/test_explicit_configs.py || die + distutils-r1_python_prepare_all +} + +python_test() { + # substitute the correct interpreter + sed "s/MY_EPYTHON/${EPYTHON}/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die + distutils-r1_python_test + # reset for next interpreter run + sed "s/${EPYTHON}/MY_EPYTHON/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die +} From 794a9be72a029e607fc38615911e3a7fe4794155 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Sat, 2 Mar 2024 00:18:54 +0100 Subject: [PATCH 12/16] dev-python/pytest-mypy-plugins: drop 3.0.0-r1 Signed-off-by: Lucio Sauer --- dev-python/pytest-mypy-plugins/Manifest | 1 - ...mypy-plugins-3.0.0-compat-mypy-1.8.0.patch | 51 ------------------ .../pytest-mypy-plugins-3.0.0-r1.ebuild | 52 ------------------- 3 files changed, 104 deletions(-) delete mode 100644 dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch delete mode 100644 dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild diff --git a/dev-python/pytest-mypy-plugins/Manifest b/dev-python/pytest-mypy-plugins/Manifest index a4509d2f93..a09bb2ad31 100644 --- a/dev-python/pytest-mypy-plugins/Manifest +++ b/dev-python/pytest-mypy-plugins/Manifest @@ -1,2 +1 @@ -DIST pytest-mypy-plugins-3.0.0.gh.tar.gz 20643 BLAKE2B e9b124b23f0e606b8d6f098c5834f8b70b44a6d7f374b0d4132c1fc47429a7a72a98ac96edd61a21969d4bc46a27c49cda35a9e0f71ed93361e0346debe643af SHA512 a2c35b4b57cf8eff6ac303a7394f798e3b96359c1e0e6424d57f0c5680cf00b6e84b7a11bb138c4ab3c7464f13ad0fd6358e9f2c5957b36eec1d2835e31edcd7 DIST pytest-mypy-plugins-3.1.0.gh.tar.gz 24331 BLAKE2B b4cae94e254f8da0ef8cd081479cbee4522150843ef3bbbd16ae6efe6722e44e84aa49e761e99699b75c94f8b44963e8f9eeefb5c5b3352411df4801a1bbc5b4 SHA512 4892b653b9cd2bbe5cd253c5f0472d48a6eaf5e1261d53ef0f1c53470c2589baf21d428a0873c64acca71eec38ef9653ec501e0746ffc564d30830ba68148f91 diff --git a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch b/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch deleted file mode 100644 index c39c21d2ed..0000000000 --- a/dev-python/pytest-mypy-plugins/files/pytest-mypy-plugins-3.0.0-compat-mypy-1.8.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/typeddjango/pytest-mypy-plugins/commit/97aff1e9ae5022384542ce98b8a401c7f4c420e7 -From: antecrescent -Date: Sun, 25 Feb 2024 20:53:26 +0100 -Subject: [PATCH] Test inline mypy configuration with more stable mypy option - (#138) - -* Test inline mypy configuration with more stable mypy option - -The mypy configuration --no-strict-optional is discouraged and not much -tested. It caused the test to fail with >=mypy-1.6.0. - -Closes #137 - -* Update flush_errors to match the signature of >=mypy-1.8.0 - -Necessity to bump to >=mypy-1.8.0 explained here: -https://github.com/typeddjango/pytest-mypy-plugins/pull/139 ---- a/pytest_mypy_plugins/item.py -+++ b/pytest_mypy_plugins/item.py -@@ -82,7 +82,10 @@ def run_mypy_typechecking(cmd_options: List[str], stdout: TextIO, stderr: TextIO - - error_messages = [] - -- def flush_errors(new_messages: List[str], serious: bool) -> None: -+ # discard filename parameter '_'. Mypy uses it to generate -+ # one junit-xml test entry per file with failures (--junit-format per_file) -+ # and we don't support mypy's --junit-xml option in the first place. -+ def flush_errors(_: str | None, new_messages: List[str], serious: bool) -> None: - error_messages.extend(new_messages) - f = stderr if serious else stdout - try: ---- a/pytest_mypy_plugins/tests/test-mypy-config.yml -+++ b/pytest_mypy_plugins/tests/test-mypy-config.yml -@@ -1,9 +1,9 @@ - # Also used in `test_explicit_configs.py` - --- case: custom_mypy_config_strict_optional_true_set -+- case: custom_mypy_config_disallow_any_explicit_set -+ expect_fail: yes - main: | -- from typing import Optional -- a: Optional[int] = None -- a + 1 # should not raise an error -+ from typing import Any -+ a: Any = None # should raise an error - mypy_config: | -- strict_optional = false -+ disallow_any_explicit = true --- -2.43.2 - diff --git a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild b/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild deleted file mode 100644 index 2564816f26..0000000000 --- a/dev-python/pytest-mypy-plugins/pytest-mypy-plugins-3.0.0-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11,12} ) -inherit distutils-r1 - -DESCRIPTION="pytest plugin for testing mypy types, stubs, plugins" -HOMEPAGE=" - https://pypi.org/project/pytest-mypy-plugins/ - https://github.com/typeddjango/pytest-mypy-plugins/ -" - -SRC_URI="https://github.com/typeddjango/pytest-mypy-plugins/archive/refs/tags/${PV}.tar.gz - -> ${P}.gh.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -PATCHES="${FILESDIR}"/${P}-compat-mypy-1.8.0.patch -DOCS="README* CHANGELOG*" - -RDEPEND=" - >=dev-python/mypy-1.8.0[${PYTHON_USEDEP}] - >=dev-python/pytest-7.0.0[${PYTHON_USEDEP}] - >=dev-python/tomlkit-0.11[${PYTHON_USEDEP}] - dev-python/decorator[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/packaging[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regex[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -python_prepare_all() { - # tests need pytest_mypy_plugins.tests on the modules search path and - # python -m pytest preprends sys.path with ${PWD}/${S} - sed "s/\"pytest\"/\"MY_EPYTHON\", \"-m\", \"pytest\"/" \ - -i pytest_mypy_plugins/tests/test_explicit_configs.py || die - distutils-r1_python_prepare_all -} - -python_test() { - # substitute the correct interpreter - sed "s/MY_EPYTHON/${EPYTHON}/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die - distutils-r1_python_test - # reset for next interpreter run - sed "s/${EPYTHON}/MY_EPYTHON/" -i pytest_mypy_plugins/tests/test_explicit_configs.py || die -} From a4c8910d88983ee218e2fc2c45e49daf9211baa6 Mon Sep 17 00:00:00 2001 From: Vitaly Zdanevich Date: Sat, 2 Mar 2024 05:14:25 +0400 Subject: [PATCH 13/16] sys-apps/corefreq: add QA_PREBUILT="usr/bin/${PN}d" Closes: https://bugs.gentoo.org/show_bug.cgi?id=914219 Signed-off-by: Vitaly Zdanevich --- sys-apps/corefreq/corefreq-1.96.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/corefreq/corefreq-1.96.3.ebuild b/sys-apps/corefreq/corefreq-1.96.3.ebuild index 31c1e8fc85..abbc008175 100644 --- a/sys-apps/corefreq/corefreq-1.96.3.ebuild +++ b/sys-apps/corefreq/corefreq-1.96.3.ebuild @@ -39,7 +39,7 @@ pkg_setup() { linux-mod_pkg_setup } -QA_FLAGS_IGNORED="usr/bin/.*" +QA_PREBUILT="usr/bin/${PN}d" src_install() { linux-mod_src_install From cee4e63668a82cc828fe09fe368e8c1cf4c89275 Mon Sep 17 00:00:00 2001 From: Yuan Liao Date: Fri, 1 Mar 2024 22:08:24 -0500 Subject: [PATCH 14/16] games-emulation/dosbox-x: Add 2024.03.01 Signed-off-by: Yuan Liao --- games-emulation/dosbox-x/Manifest | 1 + .../dosbox-x/dosbox-x-2024.03.01.ebuild | 215 ++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild diff --git a/games-emulation/dosbox-x/Manifest b/games-emulation/dosbox-x/Manifest index 2c97267c41..d222844723 100644 --- a/games-emulation/dosbox-x/Manifest +++ b/games-emulation/dosbox-x/Manifest @@ -1 +1,2 @@ DIST dosbox-x-v2023.10.06.tar.gz 119420489 BLAKE2B dca4d6c6639e9121d8b88843a04ffabd552d10614d36508996eeb99323b32f912c8e9673baf4e2f29d7cb280aba745c330170e209a9ab0a7befa0be231ca1cc9 SHA512 906907d0eb1c8b0c0646c82aeefca6457ba6a6e72044c6343cd334ccef6e6c6298d63405f24281a56d9eaf4c1073c141311063ea9d5a420abad8302cbab7ec21 +DIST dosbox-x-v2024.03.01.tar.gz 119593920 BLAKE2B 42c994247e55c1b2d67ed9e1bf90e99ddf9a08476b18ab802757becc0ee6959231d3665e39cfaef02a6b1c234e3faff10597d396d8d30ce01d8123b5107327bc SHA512 0eb835da3fdfd7f1c6160aa1a32a7eff7c38f46184f7cee088e0fb8edf09327f058fd45e7995955a7f335c704ddd69c1627731899a01687563990bb06f4d9cd1 diff --git a/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild b/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild new file mode 100644 index 0000000000..3a9d16acc2 --- /dev/null +++ b/games-emulation/dosbox-x/dosbox-x-2024.03.01.ebuild @@ -0,0 +1,215 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs xdg + +if [[ "${PV}" == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/joncampbell123/dosbox-x.git" +else + SRC_URI="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-v${PV}.tar.gz" + S="${WORKDIR}/${PN}-${PN}-v${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Complete, accurate DOS emulator forked from DOSBox" +HOMEPAGE="https://dosbox-x.com/" + +# Stay consistent with games-emulation/dosbox::gentoo even though source file +# headers specify the GPL version to be "either version 2 of the License, or +# (at your option) any later version." The same header is used in both the +# DOSBox source tree and the DOSBox-X source tree. +LICENSE="GPL-2" +SLOT="0" + +IUSE="X debug ffmpeg fluidsynth opengl png slirp truetype" +# Unit tests are only available in debug builds +RESTRICT="!debug? ( test )" + +BDEPEND=" + dev-lang/nasm + sys-libs/libcap +" + +# Unconditionally pulling in automagically-enabled optional dependencies: +# - media-libs/alsa-lib +# - media-libs/sdl2-net +# - net-libs/libpcap +# +# With media-libs/libsdl2[-X,wayland], this package does work on a Wayland +# desktop, but (at least on GNOME) the program does not launch in a movable +# and resizable window; whereas with media-libs/libsdl2[X], it does. Thus, +# unconditionally require media-libs/libsdl2[X] for better user experience. +# +# DOSBox-X works with multiple audio backends of SDL 2 but requires at least +# one available backend (https://bugs.gentoo.org/901303). Unconditionally +# depending on media-libs/libsdl2[alsa] to satisfy this requirement since +# this ebuild already unconditionally pulls in media-libs/alsa-lib. +COMMON_DEPEND=" + media-libs/alsa-lib + media-libs/libsdl2[X,alsa,opengl?,sound,threads,video] + media-libs/sdl2-net + net-libs/libpcap + sys-libs/zlib + X? ( + x11-libs/libX11 + x11-libs/libXrandr + x11-libs/libxkbfile + ) + debug? ( sys-libs/ncurses:= ) + ffmpeg? ( media-video/ffmpeg:= ) + fluidsynth? ( media-sound/fluidsynth:= ) + opengl? ( media-libs/libglvnd[X] ) + png? ( media-libs/libpng:= ) + slirp? ( net-libs/libslirp ) + truetype? ( media-libs/freetype ) +" + +DEPEND=" + ${COMMON_DEPEND} +" + +# DOSBox-X can still run normally without any of these dependencies -- +# it just cannot show a file dialog. However, upon the initial launch, +# DOSBox-X will try to show a file dialog to let the user choose the +# working directory; without one of these dependencies, the user would +# see nothing when they launch DOSBox-X for the first time. +FILE_DIALOG_DEPEND=" + || ( + gnome-extra/zenity + kde-apps/kdialog + x11-misc/xdialog + ) +" + +RDEPEND=" + ${COMMON_DEPEND} + ${FILE_DIALOG_DEPEND} +" + +pkg_pretend() { + if use ffmpeg && use !png; then + ewarn "Setting the 'ffmpeg' USE flag when the 'png' USE flag is" + ewarn "unset does not have any effect. Unsetting the 'png' USE" + ewarn "flag disables the video capture feature, so additional" + ewarn "video capture formats enabled by the 'ffmpeg' USE flag" + ewarn "will end up being unused." + fi +} + +src_prepare() { + default + + # https://bugs.gentoo.org/887669 + # Mask lines touching '-O*', and avoid creating an empty command + # list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/((C|CXX)FLAGS=.*-O)/: \1/' configure.ac || + die "Failed to stop configure.ac from touching '-O*' compiler flags" + + eautoreconf +} + +src_configure() { + local myconf=( + # Always use SDL 2, even though the package provides the option to + # build with SDL 1.x, because this package is expected to be built + # with the bundled, heavily-modified version of SDL 1.x if that + # branch is used. Compiler errors are likely to occur if the + # bundled version of SDL 1.x is not used. Bundled dependencies + # should be avoided on Gentoo, so SDL 2 is more preferable. + --enable-sdl2 + + # Explicitly enable ALSA MIDI support, same as default. As of + # v2022.08.0, even when it is disabled, media-libs/alsa-lib will + # still be automagically linked if it is present in the build + # environment (presumably for other components of this package), + # so the dependency cannot be made optional by disabling this + # option. Plus, disabling this option has no observable effect + # on build time, build size, or the program's functionality, as + # 'mididevice=alsa' still works with '--disable-alsa-midi'. + --enable-alsa-midi + + $(use_enable debug '' heavy) + + $(use_enable X x11) + $(use_enable ffmpeg avcodec) + $(use_enable fluidsynth libfluidsynth) + $(use_enable opengl) + $(use_enable png screenshots) + $(use_enable slirp libslirp) + $(use_enable truetype freetype) + ) + + econf "${myconf[@]}" +} + +src_compile() { + # https://bugs.gentoo.org/856352 + emake AR="$(tc-getAR)" +} + +src_test() { + set -- src/dosbox-x -tests + echo "${@}" >&2 + "${@}" || die "Unit tests failed" +} + +pkg_preinst() { + xdg_pkg_preinst + + # Returns whether or not the USE flag specified with the first positional + # argument is newly enabled for this installation of the package. + newuse() { + local flag="${1}" + + # The 'has_version' call tests if any USE flags are newly enabled. + # It is to extract information about any existing copy of this + # package installed on the system, which is why it should be made + # before the new copy of this package just built is merged. + use "${flag}" && ! has_version "${CATEGORY}/${PN}[${flag}]" + } + + newuse debug && PRINT_NOTES_FOR_DEBUGGER=1 + newuse fluidsynth && PRINT_NOTES_FOR_FLUIDSYNTH=1 +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ "${PRINT_NOTES_FOR_DEBUGGER}" ]]; then + elog + elog "Note on the Debugger" + elog + elog "The debugger can only be started when DOSBox-X is launched" + elog "from a terminal. Otherwise, the \"Start DOSBox-X Debugger\"" + elog "option in the \"Debug\" drop-down menu would be unavailable." + elog + elog "For more information about the debugger, please consult:" + elog " ${EPREFIX}/usr/share/doc/${PF}/README.debugger*" + fi + + if [[ "${PRINT_NOTES_FOR_FLUIDSYNTH}" ]]; then + elog + elog "Note on FluidSynth" + elog + elog "To use FluidSynth as the MIDI device for DOSBox-X, a soundfont" + elog "is required. If no existing soundfont is available, a new one" + elog "can be installed and configured for DOSBox-X very easily:" + elog + elog "1. Install the following package:" + elog " media-sound/fluid-soundfont" + elog "2. Add the following lines to DOSBox-X's configuration file:" + elog " [midi]" + elog " mididevice=fluidsynth" + elog + elog "Usually, there is no need to explicitly specify the soundfont" + elog "file's path because the package mentioned in step 1 installs" + elog "soundfont files to a standard location, allowing them to be" + elog "detected and selected automatically." + elog + elog "For advanced FluidSynth configuration, please consult:" + elog " https://dosbox-x.com/wiki/Guide%3ASetting-up-MIDI-in-DOSBox%E2%80%90X#_fluidsynth" + fi +} From 5c33852036c5d7d759ead8aba153abbe774ac8bb Mon Sep 17 00:00:00 2001 From: Victor Skovorodnikov Date: Fri, 1 Mar 2024 19:07:41 -0800 Subject: [PATCH 15/16] net-p2p/dogecoin-qt: 1.14.7 keyword amd64, arm64 - adding keywords for ~amd64 and ~arm64. - tested sucessfully on intel systems and on Raspberry Pi400 for arm64. Signed-off-by: Victor Skovorodnikov --- net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild index c621b84210..27cf4d9cf6 100644 --- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild +++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild @@ -7,7 +7,7 @@ inherit autotools desktop xdg-utils flag-o-matic DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure." HOMEPAGE="https://github.com/dogecoin" SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz" - +KEYWORDS="~amd64 ~arm64" LICENSE="MIT" SLOT="0" DB_VER="5.3" From a2d886e7b943c2e3eb41f80d94a951edf6b6bea6 Mon Sep 17 00:00:00 2001 From: Victor Skovorodnikov Date: Fri, 1 Mar 2024 19:34:57 -0800 Subject: [PATCH 16/16] net-p2p/dogecoin-qt: 1.14.7 add keyword for amd64 Signed-off-by: Victor Skovorodnikov --- net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild index 27cf4d9cf6..2a42d88d1a 100644 --- a/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild +++ b/net-p2p/dogecoin-qt/dogecoin-qt-1.14.7.ebuild @@ -7,7 +7,7 @@ inherit autotools desktop xdg-utils flag-o-matic DESCRIPTION="Dogecoin Core Qt for desktop. Downloaded blockchain is under 2.2GB. Much secure." HOMEPAGE="https://github.com/dogecoin" SRC_URI="https://github.com/dogecoin/dogecoin/archive/refs/tags/v${PV}.tar.gz -> ${PN}-v${PV}.tar.gz" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64" LICENSE="MIT" SLOT="0" DB_VER="5.3"