gentoo auto-resync : 12:11:2024 - 03:02:41

4 files changed, 132 insertions, 4 deletions

diff --git a/dev-cpp/folly/Manifest b/dev-cpp/folly/Manifest
index 6a0b76ad3b76..5392f9a36851 100644
--- a/dev-cpp/folly/Manifest
+++ b/dev-cpp/folly/Manifest
@@ -1,5 +1,8 @@
 AUX folly-2023.05.22.00-musl-fix.patch 895 BLAKE2B 72f3dde91fa7eabdc08c3375e660f31beb833835decc129570667984d973d8a71db37cdef3aaca28375a64e6afbd04df0849fc47798d7982556a84a028e034f4 SHA512 afdaa0edd233f21693b947d30d549ed13a8871bf49e05be97d8d86015452d85769c2e46929f5cce14c3cff8eb7000431638ee0c8fc3f97b0765a4b3aea3b20b9
 AUX folly-2023.06.19.00-fmt.patch 1970 BLAKE2B eb1cff98c8bbd779c6c402c75e6076a89853c79df975a65574ab4ee105d7bd124306d0e200b3f0d082da55be4a6b19bf431b5e3312cfa8bf5790c447998e5bbc SHA512 a0c77475cb0575d1d0e27299f7d47514157af51bda06c41fcc7742250ece11f7c858a43ef701f11951a069dbe311492472508f7055944ecece2c5d9ed3e6fdf1
+AUX folly-2024.11.04.00-musl-fix.patch 1033 BLAKE2B 362f7047998f5867e55ade0c89924863d9e86bb218db4456f6dace794fa94f45cf0f3032b10076efb262b5b2d5feb41b0fb52928374bfd050f1c32ff7b010f8c SHA512 7798e63f3f53e331c0895c98656b943e851a59e8b7b350477fb72ed120f12dba29011efa9cece5341e37eb6e97f3644512e88fc90ac92d28cd1c8e0beb9a6ca7
 DIST folly-v2023.06.19.00.tar.gz 3850872 BLAKE2B 6332b6de28fd4a0c19b20c4b23fa7093bded940fb07de92ad9fa7f44b8347fb5e5543e5a57c32d2414f345b4f7b306eed806c5d48a871a06833c1d2a71a34584 SHA512 9189adddf59019787969c7edb27a3e57436c2dca772f3142cdbf66e3a69b398be7ae4f2c36a9576c7ad9c51fd3703555e2a7ad6ed1ddce4036f8760d8095d371
+DIST folly-v2024.11.04.00.tar.gz 4185762 BLAKE2B 16eca3bde4320b2c5dd535afddb2640f567135ea90e7a270814bda56eb0d2ba4e864e07015879bb79d1146c68e05695eb06e2219e3dd3b4f71a1434e6f2998a5 SHA512 918ec7217a58789818c502c47302d9296867456bb3dd1c36480406905875eae9a7d52900def34ac1a936af9be6010b8b77897b351c36aa8ca09c16fe1775f508
 EBUILD folly-2023.06.19.00.ebuild 2187 BLAKE2B 9762344de8da033c64caf571b8fd02dcec83e57dea5f24d2d82f8101e37d9e6811d2f73046401991101e443152d3de97913fec061a4c2bb59363e66b9998b3de SHA512 5dceef2160a388b8599f28ec1545a64139fc0beab00147033319224743820636b4effb5d1fbf20c83af702396956c7504d7e2bd67d0cc3cafca76461f3316462
-MISC metadata.xml 319 BLAKE2B 0c8d18b906a50ee77fef7db1f99206b1c4d38dfa7913de363474609bcce38956be8d0958bc400c704ad743396db7230fb0098c83f1caa16ca998d6fd5576369c SHA512 8b077d5d5bf60f0ed5b36aef48188f431ca0675f80190beb407a58fa48fc6f8a48db161b8cde775ab6cfb54a01438fa5edddf0098e80a65b29a403a7f3a2c027
+EBUILD folly-2024.11.04.00.ebuild 1929 BLAKE2B ea1ac5dbe17f25b99b2c73fb5b56f40403269bfb7232b8308c3d70bef1ba2fe090e82c87bd864d4efdfebdf98a490b147a57841e5997b42ae239902beceb981c SHA512 b67e4e5b8e05f8b8f9cf6808b895b4a1612c6db77f93365623079601918d36f4c9ee64905ba6cb1311b5f6d9f759cc42ed48dd25e7bd6822847222b670aeddc1
+MISC metadata.xml 472 BLAKE2B c82d4f4d0a0cd409f77ab20853793e45c8c7adb97ad6bdddabf5eb69eb5a523909109da1f2b311694fc5bf5fbcf4dd330957859894eae46b1b24308a04f5b7b2 SHA512 22b8c645a91f91769cadecc7b905c0b365c252e49a63fe690fbd5db82a58afe27517561f01ca5b3f37543b69b5d60af472d86f74105a6baaeb236f1b32db29de
diff --git a/dev-cpp/folly/files/folly-2024.11.04.00-musl-fix.patch b/dev-cpp/folly/files/folly-2024.11.04.00-musl-fix.patch
new file mode 100644
index 000000000000..df9a1db734a3
--- /dev/null
+++ b/dev-cpp/folly/files/folly-2024.11.04.00-musl-fix.patch
@@ -0,0 +1,30 @@
+# Elf.cpp expects __ELF_NATIVE_CLASS to be defined at least for platforms
+# besides FreeBSD-based ones, and so it defines FOLLY_ELF_NATIVE_CLASS with it.
+# Without __ELF_NATIVE_CLASS (and apparently musl does not define it),
+# FOLLY_ELF_NATIVE_CLASS is also not defined so what was supposed to be
+# expanded to ELFCLASS32 or ELFCLASS64 ends up being
+# ELFCLASSFOLLY_ELF_NATIVE_CLASS.
+#
+# Please refer: https://github.com/facebook/folly/issues/1478
+#
+# Closes: https://bugs.gentoo.org/835744
+--- a/folly/debugging/symbolizer/Elf.cpp
++++ b/folly/debugging/symbolizer/Elf.cpp
+@@ -40,14 +40,12 @@
+ 
+ #if defined(__ELF_NATIVE_CLASS)
+ #define FOLLY_ELF_NATIVE_CLASS __ELF_NATIVE_CLASS
+-#elif defined(__FreeBSD__)
+-#if defined(__LP64__)
++#elif defined(__ANDROID__)
++#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
++#elif defined(__LP64__)
+ #define FOLLY_ELF_NATIVE_CLASS 64
+ #else
+ #define FOLLY_ELF_NATIVE_CLASS 32
+-#endif
+-#elif defined(__ANDROID__)
+-#define FOLLY_ELF_NATIVE_CLASS __WORDSIZE
+ #endif // __ELF_NATIVE_CLASS
+ 
+ namespace folly {
diff --git a/dev-cpp/folly/folly-2024.11.04.00.ebuild b/dev-cpp/folly/folly-2024.11.04.00.ebuild
new file mode 100644
index 000000000000..27be95cd3414
--- /dev/null
+++ b/dev-cpp/folly/folly-2024.11.04.00.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/fb303
+# dev-cpp/fbthrift
+# dev-cpp/fizz
+# dev-cpp/folly
+# dev-cpp/mvfst
+# dev-cpp/wangle
+# dev-util/watchman
+
+inherit cmake
+
+DESCRIPTION="An open-source C++ library developed and used at Facebook"
+HOMEPAGE="https://github.com/facebook/folly"
+SRC_URI="https://github.com/facebook/folly/releases/download/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="llvm-libunwind test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	app-arch/lz4:=
+	app-arch/snappy:=
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/fast_float:=
+	dev-cpp/gflags:=
+	dev-cpp/glog:=[gflags]
+	dev-libs/boost:=[context]
+	dev-libs/double-conversion:=
+	dev-libs/libaio
+	dev-libs/libevent:=
+	dev-libs/libfmt:=
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	>=sys-libs/liburing-2.3:=
+	sys-libs/zlib
+	llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	!llvm-libunwind? ( sys-libs/libunwind:= )
+"
+# libiberty is linked statically
+DEPEND="
+	${RDEPEND}
+	sys-libs/binutils-libs
+	test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2024.11.04.00-musl-fix.patch
+)
+
+src_unpack() {
+	# Workaround for bug #889420
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
+
+src_configure() {
+	# TODO: liburing could in theory be optional but fails to link
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+
+		-DBUILD_TESTS=$(usex test)
+
+		# https://github.com/gentoo/gentoo/pull/29393
+		-DCMAKE_LIBRARY_ARCHITECTURE=$(usex amd64 x86_64 ${ARCH})
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	CMAKE_SKIP_TESTS=(
+		# Mysterious "invalid json" failure
+		io_async_ssl_session_test.SSLSessionTest
+		singleton_thread_local_test.SingletonThreadLocalDeathTest
+		# TODO: All SIGSEGV, report upstream!
+		'concurrency_concurrent_hash_map_test.*'
+	)
+
+	cmake_src_test
+}
diff --git a/dev-cpp/folly/metadata.xml b/dev-cpp/folly/metadata.xml
index a512b80f6fcb..bb1ccfe101c1 100644
--- a/dev-cpp/folly/metadata.xml
+++ b/dev-cpp/folly/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
+	<maintainer type="person" proxied="yes">
+		<email>sin-ack@protonmail.com</email>
+		<name>sin-ack</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">facebook/folly</remote-id>