[gentoo-commits] repo/proj/guru:dev commit in: app-misc/corectrl/files/, app-misc/corectrl/

[gentoo-commits] repo/proj/guru:dev commit in: app-misc/corectrl/files/, app-misc/corectrl/

[Quinet Charlie]

commit:     d0baf21da930c919c649559ee4939635b2743f1c
Author:     Charlie Quinet <w.iron.zombie <AT> gmail <DOT> com>
AuthorDate: Fri Feb 14 15:07:26 2025 +0000
Commit:     Quinet Charlie <w.iron.zombie <AT> gmail <DOT> com>
CommitDate: Fri Feb 14 15:07:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d0baf21d

app-misc/corectrl: replace patches with a simple sed

Signed-off-by: Charlie Quinet <w.iron.zombie <AT> gmail.com>

 app-misc/corectrl/corectrl-1.4.3.ebuild            |  4 +++-
 app-misc/corectrl/corectrl-9999.ebuild             |  4 +++-
 .../1.4.3-remove_libstdcxxfs_dependency.patch      | 24 ----------------------
 .../files/9999-remove_libstdcxxfs_dependency.patch | 24 ----------------------
 4 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/app-misc/corectrl/corectrl-1.4.3.ebuild b/app-misc/corectrl/corectrl-1.4.3.ebuild
index 97b0bd6b2..8f724ceeb 100644
--- a/app-misc/corectrl/corectrl-1.4.3.ebuild
+++ b/app-misc/corectrl/corectrl-1.4.3.ebuild
@@ -55,7 +55,9 @@ RDEPEND="${COMMON_DEPEND}
 CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG"
 
 src_prepare() {
-	! tc-is-gcc && (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/1.4.3-remove_libstdcxxfs_dependency.patch"
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]]; then
+		sed -i 's/stdc++fs//g' src/CMakeLists.txt src/helper/CMakeLists.txt || die
+	fi
 	cmake_src_prepare
 }
 

diff --git a/app-misc/corectrl/corectrl-9999.ebuild b/app-misc/corectrl/corectrl-9999.ebuild
index 93c9918ba..7e9fa9e0b 100644
--- a/app-misc/corectrl/corectrl-9999.ebuild
+++ b/app-misc/corectrl/corectrl-9999.ebuild
@@ -52,7 +52,9 @@ RDEPEND="${COMMON_DEPEND}
 CONFIG_CHECK="~CONNECTOR ~PROC_EVENTS ~NETLINK_DIAG"
 
 src_prepare() {
-	! tc-is-gcc && (clang++ --version 2>&1 | grep -q "libcxx") && eapply "${FILESDIR}/9999-remove_libstdcxxfs_dependency.patch"
+	if [[ $(tc-get-cxx-stdlib) == "libc++" ]]; then
+		sed -i 's/stdc++fs//g' src/CMakeLists.txt src/helper/CMakeLists.txt || die
+	fi
 	cmake_src_prepare
 }
 

diff --git a/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch b/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch
deleted file mode 100644
index ec620497e..000000000
--- a/app-misc/corectrl/files/1.4.3-remove_libstdcxxfs_dependency.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 789f15e..69504df 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -373,7 +373,6 @@ target_compile_definitions(corectrl_lib PRIVATE ${APP_COMPILE_DEFINITIONS})
- target_link_libraries(corectrl_lib PRIVATE
-   Qt5::Core
-   QuaZip::QuaZip
--  stdc++fs
-   pthread
-   spdlog::spdlog
-   pugixml::pugixml
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index c262086..2c5ffd8 100644
---- a/src/helper/CMakeLists.txt
-+++ b/src/helper/CMakeLists.txt
-@@ -101,7 +101,6 @@ target_compile_definitions(corectrl_helper PRIVATE ${HELPER_COMPILE_DEFINITIONS}
- target_link_libraries(corectrl_helper PRIVATE
-   Qt5::Core
-   Qt5::DBus
--  stdc++fs
-   pthread
-   spdlog::spdlog
-   ${Botan_LIBRARIES}

diff --git a/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch b/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch
deleted file mode 100644
index fa9f7f5ca..000000000
--- a/app-misc/corectrl/files/9999-remove_libstdcxxfs_dependency.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 361b4aa..1f61281 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -375,7 +375,6 @@ target_compile_definitions(corectrl_lib PRIVATE ${APP_COMPILE_DEFINITIONS})
- target_link_libraries(corectrl_lib PRIVATE
-   Qt6::Core
-   QuaZip::QuaZip
--  stdc++fs
-   pthread
-   spdlog::spdlog
-   pugixml::pugixml
-diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
-index 38deb12..b8ed17e 100644
---- a/src/helper/CMakeLists.txt
-+++ b/src/helper/CMakeLists.txt
-@@ -106,7 +106,6 @@ target_compile_definitions(corectrl_helper PRIVATE ${HELPER_COMPILE_DEFINITIONS}
- target_link_libraries(corectrl_helper PRIVATE
-   Qt6::Core
-   Qt6::DBus
--  stdc++fs
-   pthread
-   spdlog::spdlog
-   ${Botan_LIBRARIES}