From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA8A6158041 for ; Fri, 1 Mar 2024 13:12:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C1C2E2A1C; Fri, 1 Mar 2024 13:12:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E4580E2A1C for ; Fri, 1 Mar 2024 13:12:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2A4A23430CE for ; Fri, 1 Mar 2024 13:12:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B848514A8 for ; Fri, 1 Mar 2024 13:12:12 +0000 (UTC) From: "Steffen Winter" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steffen Winter" Message-ID: <1709298674.a402ee97f2f347d4c62d76f472cbd155c39d759d.stffn.mobil@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-electronics/slang/Manifest sci-electronics/slang/files/slang-2.0-fix-pkgconfig.patch sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch sci-electronics/slang/files/slang-2.0-renamed-svlang.patch sci-electronics/slang/slang-1.0.ebuild sci-electronics/slang/slang-2.0-r2.ebuild sci-electronics/slang/slang-3.0.ebuild X-VCS-Directories: sci-electronics/slang/ sci-electronics/slang/files/ X-VCS-Committer: stffn.mobil X-VCS-Committer-Name: Steffen Winter X-VCS-Revision: a402ee97f2f347d4c62d76f472cbd155c39d759d X-VCS-Branch: dev Date: Fri, 1 Mar 2024 13:12:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6435a7a3-229f-4313-8f7f-2cae8e243483 X-Archives-Hash: d6b1cd985b1358a4ce9acccc9cf57caf commit: a402ee97f2f347d4c62d76f472cbd155c39d759d Author: Steffen Winter proton me> AuthorDate: Fri Mar 1 13:11:14 2024 +0000 Commit: Steffen Winter freenet de> CommitDate: Fri Mar 1 13:11:14 2024 +0000 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..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 -}