diff --git a/app-cdr/redumper/Manifest b/app-cdr/redumper/Manifest index c8bbce0c4..e0f65115e 100644 --- a/app-cdr/redumper/Manifest +++ b/app-cdr/redumper/Manifest @@ -1,8 +1,5 @@ -AUX redumper-0001-system-fmt.patch 792 BLAKE2B 1928edc2c5317af5f771858fbe48ddcf9a8e46a3f67a280c8f203d4a3c08ee7a7e3d3d8d69f48e58ec27eef6e6b05f60a20a293552278876150acaf32752d30c SHA512 4dbbaad9c711b205ecb905a4c206b744df485dbab3d01755fd3e845e4cfc0febd4c4f11f7abef305849e2e5b3dbcdc8af8eba9aa910c593945c025d261ec3f0d -AUX redumper-0002-missing-header.patch 4940 BLAKE2B fe6f398e405ab546ac20b0ba2972ffa9968d3b93502e27aadf6f64fa65cc4734a8d5fdd09a27487914dd08bed877c6446768cb2a9885988db30dd50820d42721 SHA512 72e5de5e31303779b08ff2aebf14b126e25612f9be327ecaad49e3570ac3cfa798ba51fa04b63e45eaafc93f631b7905f1d8dd1c454b1fc7df603fc5acd5a928 -AUX redumper-0003-no-stdlib-libcxx.patch 601 BLAKE2B 4d03f583142aecc58cbcbefbc24c16e664562cedde3eafb7629c472fd79224529d2d780e5f7cc944aeec92fb66372153ce6c15e12b4bf448627ab3ea0adcb472 SHA512 dc65041120830252573bed26fcb1b72f2ec3c237fe3501486c812cad30cac978599709f964ee3b4bdba558b27c4ce2c7e22d7bf3fe0a378877b6044241ba7ce3 DIST redumper-416.tar.gz 265907 BLAKE2B 6bacea1ab8a30f12a43e318515824cfe0a816ef98ec0fe1392d23cee75c3621104eeca30e734a296abd8b1a192c15b6e040fe449358bd626ecbd5e4df00d4f83 SHA512 bfeb181935dbcd6adcf5c2f27843acaec7d40650ae4faf79bf33e7e348289c4faa5707fa2faa5bf80710bb4d987c5893436fb5074b563cb4177e0fe7eb118d58 -DIST redumper-428.tar.gz 267708 BLAKE2B f87d96f0d1fafbaa75eb646136cc672d0785f3ba196bce537c3d9db770af7175d88a12afb717f5cceb1d839fa52c4eaa6bd3a9a3bcda1d26ff0afe4514c07972 SHA512 41ac07307fd37fa7f35593aa29830ae5b503f9e29e7c9dd429ca68ea5c0c6ee13587239e242044c1261da3b186ba0a1be6f66bd679f3f0b89b5ce470a8906b43 +DIST redumper-437.tar.gz 267732 BLAKE2B 9b42c5fb98d0c596279379d7e4c650d184e51379492e4be5e54a906dc1ced4e86bc03cdf70409fb70b23d71a9b083b805657f5e0fa90f8f523509f1d58aa81f0 SHA512 ae45b269b0b22b33848195ed8de4db796b831e478a0a080497cda8eb2fae608f1aa43e76575b58a0fd3842022a81916e267f08052df36a62fb8704db4380942e EBUILD redumper-416.ebuild 862 BLAKE2B c5c3f694ad3383140e42c78101a6b9e3ac74fd5625d10c967f71e5d7ca45324c3b1c16d07cd5a0e62d875c86aacaf90879278d3daeea35344d5e1f6a83d8955b SHA512 af2919ec92c30424e4a02e04be75d307002e2cf7446779db36ee0b51aa9fa338c5db9cf3030c30f4cb94ac99bb0629e01ff1b8a3a5984f2680561e493700f8cb -EBUILD redumper-428.ebuild 1239 BLAKE2B 14ee8ca53a0b8174e035629b4795107b6d193fd8c11a8ee369d323ae0eddd5ffa1fb65c61a1c352c480c066b26a24919c988ca15ff7ef1c4e60cd242e37fda96 SHA512 f30e3edc73e4160732b476d0b5decea25ffac6708c05cf0e4a3569dcceb698612cbf7877d471c9d0f5d77f56dac31f88e9611e1b5bf3c68d291daed3f9be2c29 +EBUILD redumper-437.ebuild 921 BLAKE2B e0d0bcb378f98979c4fcf71fe8fba60ef305e1dac0983cb44fb33f40b2b055b0ab9c2947c2ea1dd61a6ef1199489cefe2a62f96353e70a939858607074207238 SHA512 b8e5f631388a61bd773efdae7fa37515ad27a3efb706a0bef58f38f3209c85776a720d3cafef1f87bc6d63e1514319d9905494161cec1888f01c35cba6da057c MISC metadata.xml 220 BLAKE2B 349b68eda6473bf8453065a6372b2d39b8dddf426ea73905f6cde3369b866dce2a1b2688bc3fd161077affd2e0acf90c0e037d97bc7323e4c3a5a88535a1a3d3 SHA512 c68098b413ad315aa9fe1de2c2c415c0501fc67d2dfd032d418c354f595bc2b123a258c42d7601ffab1f52394d664506b6dd5c1a62149889a512619bd5314f6f diff --git a/app-cdr/redumper/files/redumper-0001-system-fmt.patch b/app-cdr/redumper/files/redumper-0001-system-fmt.patch deleted file mode 100644 index 45ab473fb..000000000 --- a/app-cdr/redumper/files/redumper-0001-system-fmt.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b08d1a0f6ff05c43f3e220a1590e88ed0b1ebd35 Mon Sep 17 00:00:00 2001 -From: Andrew Udvare -Date: Sat, 4 Mar 2023 21:40:48 -0500 -Subject: [PATCH 2/2] System fmt - ---- - CMakeLists.txt | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d93dd4b..a32403f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,11 @@ add_definitions(-DREDUMPER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} - - # fmt - # remove this after gcc/clang gets full std::format support --set(FMT_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/fmt/include") -+if (NOT USE_SYSTEM_FMT) -+ set(FMT_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/fmt/include") -+else() -+ find_package(fmt) -+endif() - add_definitions(-DFMT_HEADER_ONLY) - - # Visual Studio settings --- -2.39.2 - diff --git a/app-cdr/redumper/files/redumper-0002-missing-header.patch b/app-cdr/redumper/files/redumper-0002-missing-header.patch deleted file mode 100644 index b1941855a..000000000 --- a/app-cdr/redumper/files/redumper-0002-missing-header.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff --git a/analyzers/sync.ixx b/analyzers/sync.ixx -index 15fdfcb..41d4ccc 100644 ---- a/analyzers/sync.ixx -+++ b/analyzers/sync.ixx -@@ -1,4 +1,5 @@ - module; -+#include - #include - #include - -diff --git a/cd/cd_dump.ixx b/cd/cd_dump.ixx -index c75ef65..a05c3c4 100644 ---- a/cd/cd_dump.ixx -+++ b/cd/cd_dump.ixx -@@ -2,6 +2,7 @@ module; - #include - #include - #include -+#include - #include - #include - #include -diff --git a/cd/fix_msf.ixx b/cd/fix_msf.ixx -index 2c31bcf..5a5345f 100644 ---- a/cd/fix_msf.ixx -+++ b/cd/fix_msf.ixx -@@ -1,5 +1,6 @@ - module; - -+#include - #include - #include - #include -diff --git a/cd/split.ixx b/cd/split.ixx -index 36b8c5b..406bfff 100644 ---- a/cd/split.ixx -+++ b/cd/split.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include -diff --git a/cd/toc.ixx b/cd/toc.ixx -index f2c0384..8f8aa82 100644 ---- a/cd/toc.ixx -+++ b/cd/toc.ixx -@@ -1,6 +1,8 @@ - module; - #include -+#include - #include -+#include - #include - #include - #include -diff --git a/debug.ixx b/debug.ixx -index 67e9948..af42649 100644 ---- a/debug.ixx -+++ b/debug.ixx -@@ -1,6 +1,7 @@ - module; - #include - #include -+#include - #include - #include - #include -diff --git a/drive.ixx b/drive.ixx -index 4bdb307..5c41a7d 100644 ---- a/drive.ixx -+++ b/drive.ixx -@@ -1,6 +1,7 @@ - module; - #include - #include -+#include - #include - #include - #include -diff --git a/dump.ixx b/dump.ixx -index 9028869..6112775 100644 ---- a/dump.ixx -+++ b/dump.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include -diff --git a/dvd/css/css.ixx b/dvd/css/css.ixx -index 4aa135b..e0ea7c2 100644 ---- a/dvd/css/css.ixx -+++ b/dvd/css/css.ixx -@@ -2,6 +2,7 @@ - - module; - #include -+#include - #include - #include "throw_line.hh" - -diff --git a/dvd/dvd_key.ixx b/dvd/dvd_key.ixx -index df39e85..b8c6a4c 100644 ---- a/dvd/dvd_key.ixx -+++ b/dvd/dvd_key.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include -diff --git a/filesystem/iso9660/iso9660_browser.ixx b/filesystem/iso9660/iso9660_browser.ixx -index e2a29f8..13ec64b 100644 ---- a/filesystem/iso9660/iso9660_browser.ixx -+++ b/filesystem/iso9660/iso9660_browser.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include -diff --git a/filesystem/iso9660/iso9660_map.ixx b/filesystem/iso9660/iso9660_map.ixx -index 1948b70..367dacf 100644 ---- a/filesystem/iso9660/iso9660_map.ixx -+++ b/filesystem/iso9660/iso9660_map.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include "throw_line.hh" -diff --git a/readers/image_bin_form1_reader.ixx b/readers/image_bin_form1_reader.ixx -index 86b7a4d..057fb49 100644 ---- a/readers/image_bin_form1_reader.ixx -+++ b/readers/image_bin_form1_reader.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - #include "utils/throw_line.hh" -diff --git a/scsi/cmd.ixx b/scsi/cmd.ixx -index 1719a6e..29072d2 100644 ---- a/scsi/cmd.ixx -+++ b/scsi/cmd.ixx -@@ -1,5 +1,6 @@ - module; - #include -+#include - #include - #include - -diff --git a/skeleton.ixx b/skeleton.ixx -index 18aefe5..ce236e6 100644 ---- a/skeleton.ixx -+++ b/skeleton.ixx -@@ -1,6 +1,7 @@ - module; - - #include -+#include - #include - #include - #include -diff --git a/systems/dc.ixx b/systems/dc.ixx -index c5ae187..537a999 100644 ---- a/systems/dc.ixx -+++ b/systems/dc.ixx -@@ -2,6 +2,7 @@ module; - - #include - #include -+#include - #include - #include - #include -diff --git a/systems/mcd.ixx b/systems/mcd.ixx -index 701c2aa..98cfc14 100644 ---- a/systems/mcd.ixx -+++ b/systems/mcd.ixx -@@ -2,6 +2,7 @@ module; - - #include - #include -+#include - #include - #include - #include -diff --git a/systems/sat.ixx b/systems/sat.ixx -index 490abce..25fd844 100644 ---- a/systems/sat.ixx -+++ b/systems/sat.ixx -@@ -2,6 +2,7 @@ module; - - #include - #include -+#include - #include - #include - #include -diff --git a/utils/misc.ixx b/utils/misc.ixx -index c4feb31..5f4aab1 100644 ---- a/utils/misc.ixx -+++ b/utils/misc.ixx -@@ -6,6 +6,7 @@ module; - #include - #include - #include -+#include - #include - #include - #include diff --git a/app-cdr/redumper/files/redumper-0003-no-stdlib-libcxx.patch b/app-cdr/redumper/files/redumper-0003-no-stdlib-libcxx.patch deleted file mode 100644 index 1e33e8299..000000000 --- a/app-cdr/redumper/files/redumper-0003-no-stdlib-libcxx.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8ad7aa7..82821cc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,8 +52,7 @@ add_definitions(-DREDUMPER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} - -DREDUMPER_VERSION_BUILD=${REDUMPER_VERSION_BUILD}) - - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- add_compile_options($<$:-stdlib=libc++>) -- add_link_options(-stdlib=libc++ ${REDUMPER_CLANG_LINK_OPTIONS}) -+ add_link_options(${REDUMPER_CLANG_LINK_OPTIONS}) - elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - add_compile_options(-Wall -Wextra -Werror) - diff --git a/app-cdr/redumper/redumper-428.ebuild b/app-cdr/redumper/redumper-437.ebuild similarity index 55% rename from app-cdr/redumper/redumper-428.ebuild rename to app-cdr/redumper/redumper-437.ebuild index 4b85f3ced..7e3ebc627 100644 --- a/app-cdr/redumper/redumper-428.ebuild +++ b/app-cdr/redumper/redumper-437.ebuild @@ -12,30 +12,22 @@ SRC_URI="https://github.com/superg/redumper/archive/refs/tags/build_${PV}.tar.gz LICENSE="GPL-3" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64" # Clang is forced due to ICE with GCC with -j1, failure otherwise IUSE="+clang" -REQUIRED_CLANG_MAJOR_VERSION="18" +MIN_CLANG_VERSION="18.1.8" -BDEPEND="sys-devel/clang:${REQUIRED_CLANG_MAJOR_VERSION} +BDEPEND=">=sys-devel/clang-${MIN_CLANG_VERSION} dev-build/ninja" -DEPEND=">=sys-libs/libcxx-${REQUIRED_CLANG_MAJOR_VERSION}[static-libs] - >=sys-libs/libcxxabi-${REQUIRED_CLANG_MAJOR_VERSION}[static-libs]" - -PATCHES=( - "${FILESDIR}/${PN}-0002-missing-header.patch" - "${FILESDIR}/${PN}-0003-no-stdlib-libcxx.patch" -) +DEPEND=">=sys-libs/libcxx-${MIN_CLANG_VERSION}[static-libs] + >=sys-libs/libcxxabi-${MIN_CLANG_VERSION}[static-libs]" S="${WORKDIR}/${PN}-build_${PV}" src_configure() { - # filter-lto - filter-flags -O* if use clang; then - append-ldflags -fuse-ld=lld # For now because it has better error messages - CC="clang-${REQUIRED_CLANG_MAJOR_VERSION}" - CXX="clang++-${REQUIRED_CLANG_MAJOR_VERSION}" + CC=clang + CXX=clang++ export CC CXX fi cmake_src_configure