[gentoo-commits] repo/proj/guru:master commit in: sci-electronics/slang/, sci-electronics/slang/files/
commit: a402ee97f2f347d4c62d76f472cbd155c39d759d Author: Steffen Winter proton me> AuthorDate: Fri Mar 1 13:11:14 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 1 13:11:14 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a402ee97 sci-electronics/slang: drop 1.0, 2.0-r2, 3.0 Signed-off-by: Steffen Winter proton.me> sci-electronics/slang/Manifest | 3 - .../slang/files/slang-2.0-fix-pkgconfig.patch | 26 .../files/slang-2.0-fix-unordered-dense.patch | 64 --- .../slang/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(-) 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..00 --- 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 + -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..00 --- a/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 16ef772ec581e929197eae35ef3e4d7c8dbb 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"
[gentoo-commits] repo/proj/guru:master commit in: sci-electronics/slang/, sci-electronics/slang/files/
commit: d41dc78fb2b884572e7f8120f83cb133b25f1321 Author: Huang Rui gmail com> AuthorDate: Wed Mar 15 11:47:32 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Mar 15 11:49:38 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d41dc78f sci-electronics/slang: fix pkgconfig Signed-off-by: Huang Rui gmail.com> .../slang/files/slang-2.0-fix-pkgconfig.patch | 19 +++ sci-electronics/slang/slang-2.0.ebuild| 3 ++- sci-electronics/slang/slang-.ebuild | 7 +-- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch b/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch new file mode 100644 index 0..8f0a1378f --- /dev/null +++ b/sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch @@ -0,0 +1,19 @@ +From b821c33c391814ac332d6a85783179e084d1345a Mon Sep 17 00:00:00 2001 +From: Nick Gasson +Date: Sun, 20 Nov 2022 21:23:24 + +Subject: [PATCH] Fix library name in sv-lang.pc.in (#661) + +--- + scripts/sv-lang.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 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 +@@ -7,4 +7,4 @@ 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/slang-2.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild index b6c5846a5..bdbf27dfd 100644 --- a/sci-electronics/slang/slang-2.0.ebuild +++ b/sci-electronics/slang/slang-2.0.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" @@ -44,6 +44,7 @@ DEPEND=" 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() { diff --git a/sci-electronics/slang/slang-.ebuild b/sci-electronics/slang/slang-.ebuild index b6c5846a5..37cbea2e0 100644 --- a/sci-electronics/slang/slang-.ebuild +++ b/sci-electronics/slang/slang-.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" @@ -41,11 +41,6 @@ DEPEND=" ${RDEPEND} " -PATCHES=( - "${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch" - "${FILESDIR}/${PN}-2.0-renamed-svlang.patch" -) - src_configure() { python_setup # SLANG_SHARED_LIB_NAME=svlang because of name collision
[gentoo-commits] repo/proj/guru:master commit in: sci-electronics/slang/, sci-electronics/slang/files/
commit: 2174b583aaa54f035fb1a1ebbe1a64d72e21f74e Author: Huang Rui gmail com> AuthorDate: Thu Nov 3 07:09:54 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Nov 3 07:09:54 2022 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2174b583 sci-electronics/slang: fix bugs and bump to 2.0 Signed-off-by: Huang Rui gmail.com> sci-electronics/slang/Manifest | 1 + .../slang/files/slang-2.0-fix-lib-path.patch | 64 ++ sci-electronics/slang/slang-1.0.ebuild | 3 +- .../slang/{slang-1.0.ebuild => slang-2.0.ebuild} | 28 ++ sci-electronics/slang/slang-.ebuild| 28 ++ 5 files changed, 102 insertions(+), 22 deletions(-) diff --git a/sci-electronics/slang/Manifest b/sci-electronics/slang/Manifest index db3d59054..37c981edb 100644 --- a/sci-electronics/slang/Manifest +++ b/sci-electronics/slang/Manifest @@ -1 +1,2 @@ DIST slang-1.0.tar.gz 1239664 BLAKE2B 98355987b5c355eb914dd0d38c7441d5d39b7a0259e557d9cfd6271fd35aab642db6036d55228f75522fef0c31a4c82dea4d09cdb04ea33c60d843a3ca14caf0 SHA512 25ef7f5abb1b73928f61b853db5462baf72077a47daa9419311aba1f8fdca0bd499518c2f64dfff95b3c0671e52f2b1cd37edb7d1c74fb983b74de08fe7eea37 +DIST slang-2.0.tar.gz 1026299 BLAKE2B d55e0f419e030a37ff80aef3c0b16a96ee402707c758797fea3d1914e29247d22d240693cd873f95f634438fad5b8ed65961a324c69788fc3e62f83ce0a94869 SHA512 3d18961cda7eb40877932e937364b19cfcef3127a8467fbfc70febd1d6ef8b267aeae8244355a4b0206197ef126ee5a65aa4a4fb49d0970fe6c626725b7e6b21 diff --git a/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch b/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch new file mode 100644 index 0..8aeb228fa --- /dev/null +++ b/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch @@ -0,0 +1,64 @@ +From 16ef772ec581e929197eae35ef3e4d7c8dbb 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/slang-1.0.ebuild b/sci-electronics/slang/slang-1.0.ebuild index 1e1d7d743..d788704f4 100644 --- a/sci-electronics/slang/slang-1.0.ebuild +++ b/sci-electronics/slang/slang-1.0.ebuild @@ -4,7 +4,7 @@ EAPI="8" PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake python-r1 +inherit cmake python-single-r1 DESCRIPTION="SystemVerilog compiler and language services" HOMEPAGE=" @@ -42,7 +42,6 @@ src_configure() { 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) ) cmake_src_configure diff --git a/sci-electronics/slang/slang-1.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild similarity index 65% copy from sci-electronics/slang/slang-1.0.ebuild copy to sci-electronics/slang/slang-2.0.ebuild index 1e1d7d743..4a9134e0f 100644 ---