gentoo auto-resync : 21:09:2024 - 12:11:53

4 files changed, 198 insertions, 1 deletions

diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index d6da18b2bad0..d86de82879dd 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,8 +1,11 @@
 AUX breakpad-2022.06.04-gentoo.patch 3418 BLAKE2B cbcaabb31e17e45f7b2ed82a6bf6d0f0a587c205c4650d4ac813e8d44e7ac8b5cea7ea50836f40bd8175b96f8670522e09bc77826ab3af9bca45e98c32c529ff SHA512 424bbfd473acd5626abced365323282f95ccd95cd6bedaa30ffbb9d363ae42300dbe264e1d38d31ec8535b3730d42047a3a1b8f38ec845db1bb729be52375af1
 AUX breakpad-2022.07.12-gcc13.patch 340 BLAKE2B 60c71f3d7f3eaa69a40573daad827a7e030a4a5541e324fe7dcbc9e25b21f67c7f1b070b3bfef4f23c8c031e09f8184c3eb374956d6d48aabcbc8eef1e3e0e05 SHA512 8a0abbcd31e0d05563a7445a12c620b665c5d1dbbe57d36c0d81b78f126d0d253fb936e105bf056e9752556e26fad3e0984d626b6255f4ea27f810b0665904e3
 AUX breakpad-2023.01.27-gentoo.patch 3683 BLAKE2B a54a7a7dc740d2de99e58c9d73e64f7d952dc07f527436dd898d3cd427a16f1af988e11a376b9d2206870771b56c03b9648ba107614eee1c8a2701ae370704d2 SHA512 4e27315aa827feca3443af3310baab0d92e4c6366327d7b8979bc0135806253a8424ad514334016d4e0e28794bde5ce4be49da934dca735a5eaf5f2a3a76af57
+AUX breakpad-2023.06.01-gentoo.patch 3749 BLAKE2B 8240f1fee3b90f60e5ac2e8eef056cff15f1366c811a08cbfb3e8a6017804f8930bf9e0d8e760e5b8e5bdf566870bef919fb56026f6bbcd2ccb649d5593187a6 SHA512 7ef2915384e012a8c4b12f66b0edf1ef3e8afff1fcd626170a7bbbc8f33850c1f0caa20050738dede46e375df04035fc7b07c82ea9d5a49c33ec9cfdbee98ac7
 DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
 DIST breakpad-2023.01.27.tar.gz 5455242 BLAKE2B 650f9c2ff4ee5e50f9d51573706757cc56a4d64171a5aea7b825327c55b05b9122d375e718951eee26c2bde7aae69d385205fa777fa23e61e5c97683f3c76120 SHA512 c6802c55653289780232b20e2abc0458c49f3cdff108c3ddfd6e40a2f378da34adbc158548e9c88cbfdbba9526477da9b68c2c45e205231e2802fe533b6bd6a4
+DIST breakpad-2023.06.01.tar.gz 5472205 BLAKE2B c1cb70944d044a699f01eb7ad4d3fc0e743ca33c74613fdeb06930077279d6559d797e9e5ef437968f088657f5ae71b01e8824d63759e5b8244a8deac0aecd3e SHA512 7a231bbaf88f94c79b1ace1c3e66bd520595905bfc8a7ffa1aa453ea6f056136b82aea3a321d97db4ccfd1212a41e8790badcc43222564d861e9e5c35e40a402
 EBUILD breakpad-2022.07.12.ebuild 1051 BLAKE2B a4704c377b1a9ca11734b7a344b255a596496b7ceea914bfe2455fd3c54757c2d4e2aeec1f3ca9aef2b24968560f262a6ed5a8aa7a77d33e1fba6633ad23039b SHA512 cfcdbad15225e94150bc020978154595afe16d8f91277eb9932a3608cffee56b770f0add22e07a7991de6a3b7e43e256fb46641996b5bcce205f5bb44772ed0c
-EBUILD breakpad-2023.01.27.ebuild 1075 BLAKE2B 9d5845ce4ee220d3b02da8a2a5edbbd903a32b9afe192e2cd6575adf158310a01bc3f9ce2626e8819003d340f48c963327d8e7a9ed2604a7cf9a77ddc570c0a0 SHA512 2e07ad604fb8548379bb015c1aead3c90ef5a66b327af50d3fe96c5b8a6d2f0ff9e10767ca3aa7cff7a6bb010d5af1f606a3e41e4b501334a7ad381e96c640ed
+EBUILD breakpad-2023.01.27.ebuild 1185 BLAKE2B 940326f2dee4275e2fe05edc76253356d0be1e0c8d6ec7620c93071b46df66cd8aa9ba4251d803c4e58c975193f8617e5804b24dc034f8b978ce04b8b12c9a24 SHA512 48ade2fe66ad22597c87827db50aeff20540536c4247b86946b195b00293e1f91dab17107adbbd8895fea1344d9da3e17750d5d8c55633017cee5c6b33ea76e2
+EBUILD breakpad-2023.06.01.ebuild 1185 BLAKE2B 940326f2dee4275e2fe05edc76253356d0be1e0c8d6ec7620c93071b46df66cd8aa9ba4251d803c4e58c975193f8617e5804b24dc034f8b978ce04b8b12c9a24 SHA512 48ade2fe66ad22597c87827db50aeff20540536c4247b86946b195b00293e1f91dab17107adbbd8895fea1344d9da3e17750d5d8c55633017cee5c6b33ea76e2
 MISC metadata.xml 383 BLAKE2B c6b02910a824de40b239e310519be95898697b655baee86af55592163fda982708063c1d425220c0280cf2cb2d4ce50a4f80a463ef890a7254fc7ef34930bd2f SHA512 5f1622159fa76dd53ad185e642a680080ffcdda5905751fd39dad74b20d225ec9715c555cadaeaeaa4d6ada8037d8c845f8e26e4981672bf9fd15317a23becb8
diff --git a/dev-util/breakpad/breakpad-2023.01.27.ebuild b/dev-util/breakpad/breakpad-2023.01.27.ebuild
index f577690b56e5..a9c53669718b 100644
--- a/dev-util/breakpad/breakpad-2023.01.27.ebuild
+++ b/dev-util/breakpad/breakpad-2023.01.27.ebuild
@@ -46,6 +46,10 @@ src_prepare() {
 		-e "/AS_VAR_APPEND/d" \
 		configure.ac \
 		|| die
+	sed -i \
+		-e 's|reinterpret_cast|static_cast|g' \
+		src/processor/minidump_processor_unittest.cc \
+		|| die
 	eautoreconf
 }
 
diff --git a/dev-util/breakpad/breakpad-2023.06.01.ebuild b/dev-util/breakpad/breakpad-2023.06.01.ebuild
new file mode 100644
index 000000000000..a9c53669718b
--- /dev/null
+++ b/dev-util/breakpad/breakpad-2023.06.01.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="implement a crash-reporting system."
+HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="BSD BSD-4"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test tools"
+
+RDEPEND="
+	net-misc/curl
+"
+DEPEND="${RDEPEND}
+	dev-libs/linux-syscall-support
+	dev-embedded/libdisasm
+"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="elibc_musl? ( !tools )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's|"third_party/lss\(.*\)"|<lss\1>|' \
+		$(find src -name '*.cc' -o -name '*.h') \
+		|| die
+	sed -i \
+		-e '/includelss/d' \
+		-e '/third_party\/curl/d' \
+		Makefile.am \
+		|| die
+	sed -i \
+		-e "/AC_INIT/s:0.1:${PVR}:" \
+		-e "/AS_VAR_APPEND/d" \
+		configure.ac \
+		|| die
+	sed -i \
+		-e 's|reinterpret_cast|static_cast|g' \
+		src/processor/minidump_processor_unittest.cc \
+		|| die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-system-test-libs \
+		$(use_enable tools) \
+		|| die
+}
diff --git a/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch b/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch
new file mode 100644
index 000000000000..e12429add48e
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2023.06.01-gentoo.patch
@@ -0,0 +1,129 @@
+--- a/src/common/linux/libcurl_wrapper.h	2022-06-07 21:55:00.387396660 +0200
++++ b/src/common/linux/libcurl_wrapper.h	2022-06-07 21:55:18.450145751 +0200
+@@ -36,7 +36,7 @@
+ #include <map>
+ 
+ #include "common/using_std_string.h"
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+ 
+ namespace google_breakpad {
+ 
+--- a/src/common/linux/http_upload.cc	2022-06-07 21:53:55.505298529 +0200
++++ b/src/common/linux/http_upload.cc	2022-06-07 21:54:17.944986506 +0200
+@@ -34,7 +34,7 @@
+ 
+ #include <assert.h>
+ #include <dlfcn.h>
+-#include "third_party/curl/curl.h"
++#include <curl/curl.h>
+ 
+ namespace {
+ 
+--- a/src/processor/disassembler_x86.h	2022-06-08 08:41:45.569686249 +0200
++++ b/src/processor/disassembler_x86.h	2022-06-08 08:42:09.049377873 +0200
+@@ -42,7 +42,7 @@
+ #include "google_breakpad/common/breakpad_types.h"
+ 
+ namespace libdis {
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+ }
+ 
+ namespace google_breakpad {
+--- a/Makefile.am	2022-06-08 08:51:35.221948155 +0200
++++ b/Makefile.am	2022-06-08 08:53:21.679551745 +0200
+@@ -176,7 +176,6 @@
+ 
+ lib_LIBRARIES += src/libbreakpad.a
+ pkgconfig_DATA += breakpad.pc
+-noinst_LIBRARIES += src/third_party/libdisasm/libdisasm.a
+ 
+ ## Programs
+ bin_PROGRAMS += \
+@@ -957,7 +956,7 @@
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/symbolic_constants_win.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	-ldisasm \
+ 	$(TEST_LIBS) \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ if LINUX_HOST
+@@ -1006,7 +1005,7 @@
+ 	$(AM_CPPFLAGS) $(TEST_CFLAGS)
+ src_processor_disassembler_x86_unittest_LDADD = \
+ 	src/processor/disassembler_x86.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	-ldisasm \
+ 	$(TEST_LIBS) \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ 
+@@ -1118,7 +1117,7 @@
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/symbolic_constants_win.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	-ldisasm \
+ 	$(TEST_LIBS) \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ if LINUX_HOST
+@@ -1154,7 +1153,7 @@
+ src_processor_proc_maps_linux_unittest_LDADD = \
+ 	src/processor/logging.o \
+ 	src/processor/pathname_stripper.o \
+-	src/third_party/libdisasm/libdisasm.a \
++	-ldisasm \
+ 	$(TEST_LIBS) \
+ 	$(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
+ 
+@@ -1459,7 +1459,7 @@
+ 	src/processor/stackwalker_sparc.o \
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a
++	-ldisasm
+ if LINUX_HOST
+ src_processor_microdump_stackwalk_LDADD += \
+ 	src/common/linux/scoped_pipe.o \
+@@ -1507,7 +1507,7 @@
+ 	src/processor/stackwalker_x86.o \
+ 	src/processor/symbolic_constants_win.o \
+ 	src/processor/tokenize.o \
+-	src/third_party/libdisasm/libdisasm.a
++	-ldisasm
+ if LINUX_HOST
+ src_processor_minidump_stackwalk_LDADD += \
+ 	src/common/linux/scoped_pipe.o \
+--- a/src/processor/exploitability_win.cc	2022-06-08 08:59:44.437471336 +0200
++++ b/src/processor/exploitability_win.cc	2022-06-08 09:00:04.061210421 +0200
+@@ -43,7 +43,7 @@
+ #include "processor/disassembler_x86.h"
+ #include "processor/logging.h"
+ 
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+ 
+ namespace google_breakpad {
+ 
+--- a/src/processor/disassembler_x86_unittest.cc	2022-06-08 10:30:23.370615114 +0200
++++ b/src/processor/disassembler_x86_unittest.cc	2022-06-08 10:30:44.003341412 +0200
+@@ -30,7 +30,7 @@
+ 
+ #include "breakpad_googletest_includes.h"
+ #include "processor/disassembler_x86.h"
+-#include "third_party/libdisasm/libdis.h"
++#include <libdis.h>
+ 
+ namespace {
+ 
+--- a/src/common/module.cc	2023-11-09 06:57:57.891443802 +0100
++++ b/src/common/module.cc	2023-11-09 06:58:16.688120866 +0100
+@@ -42,6 +42,7 @@
+ #include <iostream>
+ #include <memory>
+ #include <utility>
++#include <algorithm>
+ 
+ namespace google_breakpad {
+