public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/
@ 2022-11-03  7:10 Rui Huang
  0 siblings, 0 replies; 5+ messages in thread
From: Rui Huang @ 2022-11-03  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2174b583aaa54f035fb1a1ebbe1a64d72e21f74e
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 07:09:54 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Nov  3 07:09:54 2022 +0000
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 <vowstar <AT> 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-9999.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 000000000..8aeb228fa
--- /dev/null
+++ b/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch
@@ -0,0 +1,64 @@
+From 16ef772ec581e929197eae35ef99993e4d7c8dbb Mon Sep 17 00:00:00 2001
+From: Huang Rui <vowstar@gmail.com>
+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 <vowstar@gmail.com>
+---
+ 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
--- a/sci-electronics/slang/slang-1.0.ebuild
+++ b/sci-electronics/slang/slang-2.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="
@@ -29,19 +29,29 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/libfmt
+	>=dev-cpp/catch-3.0.1
+	>=dev-libs/libfmt-9.1.0
+	>=dev-libs/unordered_dense-2.0.0
+	$(python_gen_cond_dep '
+		>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
+	')
 "
 
 DEPEND="
 	${RDEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+)
+
 src_configure() {
 	python_setup
-
+	# BUILD_SHARED_LIBS=OFF 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 BUILD_SHARED_LIBS=OFF
 		-D SLANG_INCLUDE_PYLIB=$(usex python)
 		-D SLANG_INCLUDE_TESTS=$(usex test)
 	)
@@ -50,10 +60,8 @@ 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
+
+	# fix python unexpected paths QA
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die
 }

diff --git a/sci-electronics/slang/slang-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild
index 1e1d7d743..4a9134e0f 100644
--- a/sci-electronics/slang/slang-9999.ebuild
+++ b/sci-electronics/slang/slang-9999.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="
@@ -29,19 +29,29 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/libfmt
+	>=dev-cpp/catch-3.0.1
+	>=dev-libs/libfmt-9.1.0
+	>=dev-libs/unordered_dense-2.0.0
+	$(python_gen_cond_dep '
+		>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
+	')
 "
 
 DEPEND="
 	${RDEPEND}
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+)
+
 src_configure() {
 	python_setup
-
+	# BUILD_SHARED_LIBS=OFF 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 BUILD_SHARED_LIBS=OFF
 		-D SLANG_INCLUDE_PYLIB=$(usex python)
 		-D SLANG_INCLUDE_TESTS=$(usex test)
 	)
@@ -50,10 +60,8 @@ 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
+
+	# fix python unexpected paths QA
+	mkdir -p "${D}/$(python_get_sitedir)" || die
+	mv "${D}"/usr/pyslang* "${D}/$(python_get_sitedir)" || die
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/
@ 2022-11-07  2:47 Rui Huang
  0 siblings, 0 replies; 5+ messages in thread
From: Rui Huang @ 2022-11-07  2:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f1e1607db814cc9869b457ffe7394d7c96f34fa8
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Nov  7 02:47:14 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Mon Nov  7 02:47:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f1e1607d

sci-electronics/slang: rename libslang to libsvlang

Issue: https://github.com/MikePopoloski/slang/issues/646
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 ...h.patch => slang-2.0-fix-unordered-dense.patch} |  0
 .../slang/files/slang-2.0-renamed-svlang.patch     | 32 ++++++++++++++++++++++
 sci-electronics/slang/slang-2.0.ebuild             |  8 ++++--
 sci-electronics/slang/slang-9999.ebuild            |  8 ++++--
 4 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/sci-electronics/slang/files/slang-2.0-fix-lib-path.patch b/sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch
similarity index 100%
rename from sci-electronics/slang/files/slang-2.0-fix-lib-path.patch
rename to sci-electronics/slang/files/slang-2.0-fix-unordered-dense.patch

diff --git a/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch
new file mode 100644
index 000000000..107b69d36
--- /dev/null
+++ b/sci-electronics/slang/files/slang-2.0-renamed-svlang.patch
@@ -0,0 +1,32 @@
+From a3bf429c886407198e7e3a292af80e6c60ee27d2 Mon Sep 17 00:00:00 2001
+From: jrudess <jordan.r.rudess@gmail.com>
+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 slang)
+ 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-2.0.ebuild b/sci-electronics/slang/slang-2.0.ebuild
index ed4201ed5..21f8cc2ac 100644
--- a/sci-electronics/slang/slang-2.0.ebuild
+++ b/sci-electronics/slang/slang-2.0.ebuild
@@ -42,18 +42,20 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+	"${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch"
+	"${FILESDIR}/${PN}-2.0-renamed-svlang.patch"
 )
 
 src_configure() {
 	python_setup
-	# BUILD_SHARED_LIBS=OFF because of name collision
+	# 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=OFF
+		-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
 }

diff --git a/sci-electronics/slang/slang-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild
index ed4201ed5..21f8cc2ac 100644
--- a/sci-electronics/slang/slang-9999.ebuild
+++ b/sci-electronics/slang/slang-9999.ebuild
@@ -42,18 +42,20 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0-fix-lib-path.patch"
+	"${FILESDIR}/${PN}-2.0-fix-unordered-dense.patch"
+	"${FILESDIR}/${PN}-2.0-renamed-svlang.patch"
 )
 
 src_configure() {
 	python_setup
-	# BUILD_SHARED_LIBS=OFF because of name collision
+	# 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=OFF
+		-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
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/
@ 2023-03-15 11:49 Rui Huang
  0 siblings, 0 replies; 5+ messages in thread
From: Rui Huang @ 2023-03-15 11:49 UTC (permalink / raw
  To: gentoo-commits

commit:     d41dc78fb2b884572e7f8120f83cb133b25f1321
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Mar 15 11:47:32 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Mar 15 11:49:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d41dc78f

sci-electronics/slang: fix pkgconfig

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 .../slang/files/slang-2.0-fix-pkgconfig.patch         | 19 +++++++++++++++++++
 sci-electronics/slang/slang-2.0.ebuild                |  3 ++-
 sci-electronics/slang/slang-9999.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 000000000..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 <nick@nickg.me.uk>
+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 | 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-9999.ebuild b/sci-electronics/slang/slang-9999.ebuild
index b6c5846a5..37cbea2e0 100644
--- a/sci-electronics/slang/slang-9999.ebuild
+++ b/sci-electronics/slang/slang-9999.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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/
@ 2024-03-01 13:12 Steffen Winter
  0 siblings, 0 replies; 5+ messages in thread
From: Steffen Winter @ 2024-03-01 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a402ee97f2f347d4c62d76f472cbd155c39d759d
Author:     Steffen Winter <steffen.winter <AT> proton <DOT> me>
AuthorDate: Fri Mar  1 13:11:14 2024 +0000
Commit:     Steffen Winter <stffn.mobil <AT> freenet <DOT> 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 <steffen.winter <AT> 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 <nick@nickg.me.uk>
-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 <vowstar@gmail.com>
-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 <vowstar@gmail.com>
----
- 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 <jordan.r.rudess@gmail.com>
-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-libs/unordered_dense-2.0.1
-	$(python_gen_cond_dep '
-		>=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-libs/unordered_dense-2.0.2
-	$(python_gen_cond_dep '
-		>=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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/
@ 2024-10-09  4:32 Rui Huang
  0 siblings, 0 replies; 5+ messages in thread
From: Rui Huang @ 2024-10-09  4:32 UTC (permalink / raw
  To: gentoo-commits

commit:     425ff04616d03d9e5bb24881eeabf261026ad9bc
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Oct  9 04:32:31 2024 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Wed Oct  9 04:32:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=425ff046

sci-electronics/slang: drop 4.0, 5.0, 6.0

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sci-electronics/slang/Manifest                     |  3 -
 .../files/slang-4.0-fix-gentoo-libfmt-depend.patch | 26 ---------
 .../files/slang-5.0-fix-gentoo-libfmt-depend.patch | 26 ---------
 .../files/slang-6.0-fix-gentoo-libfmt-depend.patch | 26 ---------
 sci-electronics/slang/slang-4.0.ebuild             | 66 ----------------------
 sci-electronics/slang/slang-5.0.ebuild             | 66 ----------------------
 sci-electronics/slang/slang-6.0.ebuild             | 66 ----------------------
 7 files changed, 279 deletions(-)

diff --git a/sci-electronics/slang/Manifest b/sci-electronics/slang/Manifest
index 79d507e11..4e63f0a74 100644
--- a/sci-electronics/slang/Manifest
+++ b/sci-electronics/slang/Manifest
@@ -1,4 +1 @@
-DIST slang-4.0.tar.gz 1308308 BLAKE2B 99029a26b3fe86942abc33381f8f9ba050c09b390ed7fc54404f4054eb34a83e168d53096cad2e8f037954770a95009c701c86b1e59e1e9d02e1709fd120164c SHA512 043c053452b2d452875b2e3ed96be5b96275544e2a692bec8b170e01cefec6e5648a6681e3cac3afd2a68c8ec57f6461a9a73394d74abbc8627d49b66978808e
-DIST slang-5.0.tar.gz 1334032 BLAKE2B 08981f86d0be6a4a7d391a2b65d8f4e5bdab8e3ba50f6e847e2b25fec9d9345e806045faae3c74fd71db90f939d8668ff775465ea1e8433d660a0a53f20a358a SHA512 a1b7b9aac7357a9a7cc1818adbb5e9622234f607aba452ca57e3d28b31779339bb19557137cf37cdcc2abb2aba15eb6d2f580169322caf075a2518b3d8634a26
-DIST slang-6.0.tar.gz 1401115 BLAKE2B 77c6359e8de39216bef553ec832a643397e83847146223acf2512efbbb2cd15eb0b874ff8f021adb72472ce5bb77ca33648ed8c392b21df7ed349110f5654d17 SHA512 bd9e24abc6e83ca2ca0527271754bd0312e094c040feccbf95852a84dba486addd2ed0a40e5a855c1b41918061a6a7c34ca1a4f6610b1e941e50e1b74402cb5c
 DIST slang-7.0.tar.gz 1461841 BLAKE2B d4ba3abb891f3ebbc73f6d69ae78d180cef8dc8d4041f192be162d73664ba4dbe19d7deb65a0d4498c3e3df8b7412904724dab6c518c73f3541e90a8a9925da2 SHA512 657c2a12beac5fe190be77953836320903c4492004b6877e0e5ef1be42516184048e1caed30aa8d4f89a9a20651389d1baab76ccb82e9c7d9a6fdf4e29815239

diff --git a/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch b/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch
deleted file mode 100644
index bae727659..000000000
--- a/sci-electronics/slang/files/slang-4.0-fix-gentoo-libfmt-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001
-From: Huang Rui <vowstar@gmail.com>
-Date: Fri, 15 Sep 2023 19:38:34 +0800
-Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend
-
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- external/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 9341eb2e2ffa..4ea7429a69a8 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # ~~~
- 
- # Required minimum versions for dependencies
--set(fmt_min_version "10.0")
-+set(fmt_min_version "9.0")
- set(mimalloc_min_version "2.1")
- set(catch2_min_version "3.0")
- 
--- 
-2.42.0
-

diff --git a/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch b/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch
deleted file mode 100644
index 5a94a3058..000000000
--- a/sci-electronics/slang/files/slang-5.0-fix-gentoo-libfmt-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001
-From: Huang Rui <vowstar@gmail.com>
-Date: Fri, 15 Sep 2023 19:38:34 +0800
-Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend
-
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- external/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 9341eb2e2ffa..4ea7429a69a8 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # ~~~
- 
- # Required minimum versions for dependencies
--set(fmt_min_version "10.1")
-+set(fmt_min_version "9.0")
- set(mimalloc_min_version "2.1")
- set(catch2_min_version "3.0")
- 
--- 
-2.42.0
-

diff --git a/sci-electronics/slang/files/slang-6.0-fix-gentoo-libfmt-depend.patch b/sci-electronics/slang/files/slang-6.0-fix-gentoo-libfmt-depend.patch
deleted file mode 100644
index 59d9166d1..000000000
--- a/sci-electronics/slang/files/slang-6.0-fix-gentoo-libfmt-depend.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4be4a956ad1a1ff767dcc91c88fac103d5780578 Mon Sep 17 00:00:00 2001
-From: Huang Rui <vowstar@gmail.com>
-Date: Fri, 15 Sep 2023 19:38:34 +0800
-Subject: [PATCHv1] external/CMakeLists.txt: fix gentoo libfmt depend
-
-Signed-off-by: Huang Rui <vowstar@gmail.com>
----
- external/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index 9341eb2e2ffa..4ea7429a69a8 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # ~~~
- 
- # Required minimum versions for dependencies
--set(fmt_min_version "10.2")
-+set(fmt_min_version "9.0")
- set(mimalloc_min_version "2.1")
- set(catch2_min_version "3.0")
- 
--- 
-2.42.0
-

diff --git a/sci-electronics/slang/slang-4.0.ebuild b/sci-electronics/slang/slang-4.0.ebuild
deleted file mode 100644
index 6ce4a98d1..000000000
--- a/sci-electronics/slang/slang-4.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..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}
-	$(python_gen_cond_dep '
-		>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-libs/libfmt-9.1.0
-	test? ( >=dev-cpp/catch-3.0.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0-fix-gentoo-libfmt-depend.patch"
-)
-
-src_configure() {
-	python_setup
-	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_USE_MIMALLOC=OFF
-	)
-	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-5.0.ebuild b/sci-electronics/slang/slang-5.0.ebuild
deleted file mode 100644
index 6bba9883c..000000000
--- a/sci-electronics/slang/slang-5.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..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}
-	$(python_gen_cond_dep '
-		>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-libs/libfmt-9.1.0
-	test? ( >=dev-cpp/catch-3.0.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.0-fix-gentoo-libfmt-depend.patch"
-)
-
-src_configure() {
-	python_setup
-	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_USE_MIMALLOC=OFF
-	)
-	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-6.0.ebuild b/sci-electronics/slang/slang-6.0.ebuild
deleted file mode 100644
index a1660d0a4..000000000
--- a/sci-electronics/slang/slang-6.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{10..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}
-	$(python_gen_cond_dep '
-		>=dev-python/pybind11-2.10[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-libs/libfmt-9.1.0
-	test? ( >=dev-cpp/catch-3.0.1 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0-fix-gentoo-libfmt-depend.patch"
-)
-
-src_configure() {
-	python_setup
-	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_USE_MIMALLOC=OFF
-	)
-	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
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-09  4:33 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-03  7:10 [gentoo-commits] repo/proj/guru:dev commit in: sci-electronics/slang/, sci-electronics/slang/files/ Rui Huang
  -- strict thread matches above, loose matches on Subject: below --
2022-11-07  2:47 Rui Huang
2023-03-15 11:49 Rui Huang
2024-03-01 13:12 Steffen Winter
2024-10-09  4:32 Rui Huang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox