From 7698c1bfe75e64be60902b4149d1c93257ab7517 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Wed, 17 Jul 2024 10:31:58 +0200
Subject: [PATCH] dev-cpp/cpptrace: drop 0.5.2-r1

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-cpp/cpptrace/Manifest                     |   1 -
 dev-cpp/cpptrace/cpptrace-0.5.2-r1.ebuild     |  27 ---
 .../cpptrace/files/cpptrace-fix-zstd.patch    | 177 ------------------
 3 files changed, 205 deletions(-)
 delete mode 100644 dev-cpp/cpptrace/cpptrace-0.5.2-r1.ebuild
 delete mode 100644 dev-cpp/cpptrace/files/cpptrace-fix-zstd.patch

diff --git a/dev-cpp/cpptrace/Manifest b/dev-cpp/cpptrace/Manifest
index 6fdaf9aaa2..383eff5fe7 100644
--- a/dev-cpp/cpptrace/Manifest
+++ b/dev-cpp/cpptrace/Manifest
@@ -1,4 +1,3 @@
-DIST cpptrace-0.5.2.tar.gz 311215 BLAKE2B 77f5bce58ac088c5430cfa6b427bc8f019590520be8648a848108f4dbb23d3ce1260f6a3dd1d6bc9acf3a069218f3a25853083f88700d9dbdbeeadd20f9bc873 SHA512 e05a8a070ec7be0a1b36f25901c3ed7b566e4ca69e8e87cde558a0e65743d2dabd4cbad614af32d62a4da4b6a77144853adf7cb1be33335a86f7b1ef2d08c72f
 DIST cpptrace-0.6.0.tar.gz 318375 BLAKE2B 5c1694b6e579fb097379e9e9788ae84f89e1cd65848cf6fce79c8f9415e1b047fb018142a4d6fd868c021ae1d140d21e955d30f7eeb55f341f74ce7a4de68e32 SHA512 c5ebd1a733e22006abe2ef2b5e65a9f967ef2a433194d1c2dbed2dea7a81034a56717ad54698eaad20b3c53b941a2766587dc32936b3703ef87fda29eafc5dbf
 DIST cpptrace-0.6.2.tar.gz 319911 BLAKE2B 63531a4097f45dd5f24bc0b4227b7872c0b5303443bec7394da5dea3e25df56865673d3d0243fcb59213c00d2b6d3bb28fb525cf5d40ec639f686c4e552f6ca2 SHA512 aaf14207dbcb3e3fd551cfc4a4dbee265f9454f205362eb061fd5672ee54d19e3966a5f497bc90689a4c426ab4f9225f083d3a84bf4a0060b851cdf252f22615
 DIST cpptrace-0.6.3.tar.gz 321472 BLAKE2B 8f6fd949e8e30ae9860516d4ab20583606ace12d5c37b512e1940a472143e90befd7179591a2eba80f25545c2036775224b3a1644cb26c342618f6f85617dc5f SHA512 fbea457268fcf535c8295098c8e21a915cae408a253050d9c69d2d34758b2e3cc14d3cfc39ee2dbe9399f4363a4a1462447206067f794cbf88282b54a9a587e7
diff --git a/dev-cpp/cpptrace/cpptrace-0.5.2-r1.ebuild b/dev-cpp/cpptrace/cpptrace-0.5.2-r1.ebuild
deleted file mode 100644
index 263dff40eb..0000000000
--- a/dev-cpp/cpptrace/cpptrace-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Simple, portable, and self-contained stacktrace library for C++"
-HOMEPAGE="https://github.com/jeremy-rifkin/cpptrace"
-SRC_URI="https://github.com/jeremy-rifkin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-libs/libdwarf"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-zstd.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-cpp/cpptrace/files/cpptrace-fix-zstd.patch b/dev-cpp/cpptrace/files/cpptrace-fix-zstd.patch
deleted file mode 100644
index b05581fad4..0000000000
--- a/dev-cpp/cpptrace/files/cpptrace-fix-zstd.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From c73b3faf73c51c2c3bfe0e971e3ca527e4e5e5c7 Mon Sep 17 00:00:00 2001
-From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
-Date: Sun, 28 Apr 2024 20:18:13 -0500
-Subject: [PATCH 1/3] Remove find_dependency(zstd)
-
----
- cmake/in/cpptrace-config-cmake.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/cmake/in/cpptrace-config-cmake.in b/cmake/in/cpptrace-config-cmake.in
-index 412a9d0..0b25aac 100644
---- a/cmake/in/cpptrace-config-cmake.in
-+++ b/cmake/in/cpptrace-config-cmake.in
-@@ -4,7 +4,6 @@
- # Dependencies
- if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@)
-   include(CMakeFindDependencyMacro)
--  find_dependency(zstd REQUIRED)
-   find_dependency(libdwarf REQUIRED)
- endif()
- 
-
-From 8d66998a67fcdfbf362aca39c8cc67060cf7a6d1 Mon Sep 17 00:00:00 2001
-From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
-Date: Sun, 28 Apr 2024 22:38:45 -0500
-Subject: [PATCH 2/3] Provide a Findzstd script
-
----
- cmake/Findzstd.cmake              | 51 +++++++++++++++++++++++++++++++
- cmake/InstallRules.cmake          |  3 ++
- cmake/in/cpptrace-config-cmake.in |  5 +++
- 3 files changed, 59 insertions(+)
- create mode 100644 cmake/Findzstd.cmake
-
-diff --git a/cmake/Findzstd.cmake b/cmake/Findzstd.cmake
-new file mode 100644
-index 0000000..fc8eb52
---- /dev/null
-+++ b/cmake/Findzstd.cmake
-@@ -0,0 +1,51 @@
-+# Libdwarf needs zstd, cpptrace doesn't, and libdwarf has its own Findzstd but it doesn't define zstd::libzstd_static /
-+# zstd::libzstd_shared targets which leads to issues, necessitating a find_dependency(zstd) in cpptrace's cmake config
-+# and in order to support non-cmake-module installs we need to provide a Findzstd script.
-+# https://github.com/jeremy-rifkin/cpptrace/issues/112
-+
-+# This will define
-+# zstd_FOUND
-+# zstd_INCLUDE_DIR
-+# zstd_LIBRARY
-+
-+find_path(zstd_INCLUDE_DIR NAMES zstd.h)
-+
-+find_library(zstd_LIBRARY_DEBUG NAMES zstdd zstd_staticd)
-+find_library(zstd_LIBRARY_RELEASE NAMES zstd zstd_static)
-+
-+include(SelectLibraryConfigurations)
-+SELECT_LIBRARY_CONFIGURATIONS(zstd)
-+
-+include(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
-+  zstd DEFAULT_MSG
-+  zstd_LIBRARY zstd_INCLUDE_DIR
-+)
-+
-+if(zstd_FOUND)
-+  message(STATUS "Found Zstd: ${zstd_LIBRARY}")
-+endif()
-+
-+mark_as_advanced(zstd_INCLUDE_DIR zstd_LIBRARY)
-+
-+if(zstd_FOUND)
-+  # just defining them the same... cmake will figure it out
-+  if(NOT TARGET zstd::libzstd_static)
-+    add_library(zstd::libzstd_static UNKNOWN IMPORTED)
-+    set_target_properties(
-+      zstd::libzstd_static
-+      PROPERTIES
-+      IMPORTED_LOCATION "${zstd_LIBRARIES}"
-+      INTERFACE_INCLUDE_DIRECTORIES "${zstd_INCLUDE_DIR}"
-+    )
-+  endif()
-+  if(NOT TARGET zstd::libzstd_shared)
-+    add_library(zstd::libzstd_shared UNKNOWN IMPORTED)
-+    set_target_properties(
-+      zstd::libzstd_shared
-+      PROPERTIES
-+      IMPORTED_LOCATION "${zstd_LIBRARIES}"
-+      INTERFACE_INCLUDE_DIRECTORIES "${zstd_INCLUDE_DIR}"
-+    )
-+  endif()
-+endif()
-diff --git a/cmake/InstallRules.cmake b/cmake/InstallRules.cmake
-index b35c4d7..5087cbb 100644
---- a/cmake/InstallRules.cmake
-+++ b/cmake/InstallRules.cmake
-@@ -62,6 +62,9 @@ install(
-   COMPONENT ${package_name}-development
- )
- 
-+# Findzstd.cmake
-+install(FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}")
-+
- # support packaging library
- if(PROJECT_IS_TOP_LEVEL)
-   include(CPack)
-diff --git a/cmake/in/cpptrace-config-cmake.in b/cmake/in/cpptrace-config-cmake.in
-index 0b25aac..a128d52 100644
---- a/cmake/in/cpptrace-config-cmake.in
-+++ b/cmake/in/cpptrace-config-cmake.in
-@@ -4,6 +4,11 @@
- # Dependencies
- if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@)
-   include(CMakeFindDependencyMacro)
-+  set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
-+  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
-+  find_dependency(zstd)
-+  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}")
-+  unset(CMAKE_MODULE_PATH_OLD)
-   find_dependency(libdwarf REQUIRED)
- endif()
- 
-
-From 27438a34eb3534a9efe3733c67e629ed611facb2 Mon Sep 17 00:00:00 2001
-From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
-Date: Sun, 28 Apr 2024 23:13:12 -0500
-Subject: [PATCH 3/3] Update handling in vcpkg
-
----
- cmake/InstallRules.cmake          |  8 +++++++-
- cmake/in/cpptrace-config-cmake.in | 15 ++++++++++-----
- 2 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/InstallRules.cmake b/cmake/InstallRules.cmake
-index 5087cbb..529e51a 100644
---- a/cmake/InstallRules.cmake
-+++ b/cmake/InstallRules.cmake
-@@ -63,7 +63,13 @@ install(
- )
- 
- # Findzstd.cmake
--install(FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}")
-+# vcpkg doesn't like anything being put in share/, which is where this goes apparently on their setup
-+if(NOT CPPTRACE_VCPKG)
-+  install(
-+    FILES "${PROJECT_SOURCE_DIR}/cmake/Findzstd.cmake"
-+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}"
-+  )
-+endif()
- 
- # support packaging library
- if(PROJECT_IS_TOP_LEVEL)
-diff --git a/cmake/in/cpptrace-config-cmake.in b/cmake/in/cpptrace-config-cmake.in
-index a128d52..fc017ad 100644
---- a/cmake/in/cpptrace-config-cmake.in
-+++ b/cmake/in/cpptrace-config-cmake.in
-@@ -4,11 +4,16 @@
- # Dependencies
- if(@CPPTRACE_GET_SYMBOLS_WITH_LIBDWARF@)
-   include(CMakeFindDependencyMacro)
--  set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
--  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
--  find_dependency(zstd)
--  set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}")
--  unset(CMAKE_MODULE_PATH_OLD)
-+  # we don't go the Findzstd.cmake route on vcpkg
-+  if(@CPPTRACE_VCPKG@)
-+    find_dependency(zstd CONFIG REQUIRED)
-+  else()
-+    set(CMAKE_MODULE_PATH_OLD "${CMAKE_MODULE_PATH}")
-+    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
-+    find_dependency(zstd)
-+    set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH_OLD}")
-+    unset(CMAKE_MODULE_PATH_OLD)
-+  endif()
-   find_dependency(libdwarf REQUIRED)
- endif()
-