gentoo auto-resync : 10:01:2024 - 13:02:42

4 files changed, 150 insertions, 5 deletions

diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 5b6e9cb1643f..4b5b84cbbe4d 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,6 +1,8 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 737 BLAKE2B e0bdf1021d574b20f29793a757772b9229610ed7f7abf81f13f841c765f05a70e90286f58a904653a05c33274a193408a09b71cf733dbc7ed9c5b19e9c0f4e31 SHA512 8825f9387d7900c2486ecc0d196a3df67333fe27ae9ca83683a56ea57b79248d3da62f5a553664e2d348fb9ad05b651566eada56d26157b471e76b95a81df9a8
+AUX xerces-c-3.2.4-strict-aliasing.patch 386 BLAKE2B e46d17919a85cd4316a8de7f3694523d02bba740a39f2896677ea224e86854ef315b174d4cbd33d67dea445be8b8718c353535a592290e35e70d21213cb53c68 SHA512 fae2dac2de67d5f564088f1d810a26cadf00699a77146f2caed1ddddcd0732d518ad0ab6c1f052d30431da3e3fcf8721f0fffa011c354a9925066cf4d4683f0f
 DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf
 EBUILD xerces-c-3.2.4-r2.ebuild 2829 BLAKE2B 6e6639f71d0945462f22670d022c2f72a815f19bc9020de5966681c2f699972f8416d26ba5e1e901e7f551236f1db759b9a74036e1a8820c3b2005d056809d6d SHA512 5536ce6ffef882ae679540980af51b37828321fd01a9c8b1d3698db62faf9d321f9d1cc494dd3ff392ff465c59f0b71e2335e23e046418eb1e6389ada73f18aa
-EBUILD xerces-c-9999.ebuild 2836 BLAKE2B 0a9fc4b1e8148c1c298559ae94d3b91bdeb985fd08b3d218c3cddf6e7fac6d1d9e4342f063dc4cb2b4a66f0461f9fa2d5166531fbbbedabdb951e80afb9dd90c SHA512 9d91d6626b872e28b13502c1708bdb6f1ce578214e1f7066272242592c1e110ff99224ca2ffa40a23e9c6202e66611201ee51922a70946666e623e4de4eaad2c
+EBUILD xerces-c-3.2.4-r3.ebuild 2960 BLAKE2B 5a981fb26f0e3a2503cc56014e9269e462f9d89cf8aec9d079902c1bf0eee04a78c11df440b20a95f81b1d7334bd4b4ff606be7a881c6ca74cd754dda4b5f6ff SHA512 2f445d2403f60c56197f4820195d2cc6289a3c2a8b81e04e9e3b266357f2dd16b14b04dba8890c65c04407ce2e83db416acfd1d3686729919ab653669d1fb519
+EBUILD xerces-c-9999.ebuild 2960 BLAKE2B 5a981fb26f0e3a2503cc56014e9269e462f9d89cf8aec9d079902c1bf0eee04a78c11df440b20a95f81b1d7334bd4b4ff606be7a881c6ca74cd754dda4b5f6ff SHA512 2f445d2403f60c56197f4820195d2cc6289a3c2a8b81e04e9e3b266357f2dd16b14b04dba8890c65c04407ce2e83db416acfd1d3686729919ab653669d1fb519
 MISC metadata.xml 639 BLAKE2B 478311dd96d2a5938161f66cbcd3e0bbdb51bc5680c2bc9aaddcfef3921d356bb568fcf3047d181d54f3cf2560b547dcca3e964e064506c8bfccad9291c6d0da SHA512 8c8fd2d5a525000a06fb08b0cd20c4aefd6c9fb6554e7e8586bfc7a58be2884a629417035e0863950246bf12b756466c0453e2768a31678da002d029dceacb73
diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch b/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch
new file mode 100644
index 000000000000..18483070e736
--- /dev/null
+++ b/dev-libs/xerces-c/files/xerces-c-3.2.4-strict-aliasing.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/856100
+--- a/cmake/XercesWarnings.cmake
++++ b/cmake/XercesWarnings.cmake
+@@ -50,8 +50,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
+       -Wswitch-default
+       -Wunused-variable
+       -Wwrite-strings
+-      -Wno-variadic-macros
+-      -fstrict-aliasing)
++      -Wno-variadic-macros)
+   if(extra-warnings)
+     list(APPEND test_flags
+         -Wfloat-equal
diff --git a/dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild
new file mode 100644
index 000000000000..fea427072055
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.4-r3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Validating XML parser written in a portable subset of C++"
+HOMEPAGE="https://xerces.apache.org/xerces-c/"
+
+if [[ ${PV} == *9999 ]] ; then
+	ESVN_REPO_URI="https://svn.apache.org/repos/asf/xerces/c/trunk"
+	inherit subversion
+else
+	SRC_URI="mirror://apache/xerces/c/3/sources/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 curl doc examples iconv icu static-libs test threads"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:0= )
+	virtual/libiconv"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch
+	"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+)
+
+pkg_setup() {
+	export ICUROOT="${EPREFIX}/usr"
+
+	if use iconv && use icu; then
+		ewarn "This package can use iconv or icu for loading messages"
+		ewarn "and transcoding, but not both. ICU takes precedence."
+	fi
+}
+
+src_configure() {
+	# bug #856100
+	filter-lto
+	append-flags -fno-strict-aliasing
+
+	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
+	# But the docs aren't clear about it, so we would need some testing...
+	local netaccessor
+	if use curl; then
+		netaccessor="curl"
+	elif use elibc_Darwin; then
+		netaccessor="cfurl"
+	else
+		netaccessor="socket"
+	fi
+
+	local msgloader
+	if use icu; then
+		msgloader="icu"
+	elif use iconv; then
+		msgloader="iconv"
+	else
+		msgloader="inmemory"
+	fi
+
+	local transcoder
+	if use icu; then
+		transcoder="icu"
+	elif use elibc_Darwin; then
+		transcoder="macosunicodeconverter"
+	else
+		transcoder="gnuiconv"
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-Dnetwork-accessor="${netaccessor}"
+		-Dmessage-loader="${msgloader}"
+		-Dtranscoder="${transcoder}"
+		-Dthreads:BOOL="$(usex threads)"
+		-Dsse2:BOOL="$(usex cpu_flags_x86_sse2)"
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build doc-style createapidocs doc-xml
+}
+
+src_install() {
+	cmake_src_install
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		# clean out object files, executables, Makefiles
+		# and the like before installing examples
+		find samples/ \( -type f -executable -o -iname 'runConfigure' -o -iname '*.o' \
+			-o -iname '.libs' -o -iname 'Makefile*' \) -exec rm -rf '{}' + || die
+		docinto examples
+		dodoc -r samples/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	# To make sure an appropriate NLS msg file is around when using
+	# the iconv msgloader ICU has the messages compiled in.
+	if use iconv && ! use icu; then
+		doenvd "$(prefixify_ro "${FILESDIR}/50xerces-c")"
+	fi
+}
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 4b24ee3df5d8..fea427072055 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake prefix
+inherit cmake flag-o-matic prefix
 
-DESCRIPTION="A validating XML parser written in a portable subset of C++"
+DESCRIPTION="Validating XML parser written in a portable subset of C++"
 HOMEPAGE="https://xerces.apache.org/xerces-c/"
 
 if [[ ${PV} == *9999 ]] ; then
@@ -33,7 +33,10 @@ BDEPEND="
 
 DOCS=( CREDITS KEYS NOTICE README )
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.2-fix-XERCESC-2163.patch
+	"${FILESDIR}"/${PN}-3.2.4-strict-aliasing.patch
+)
 
 pkg_setup() {
 	export ICUROOT="${EPREFIX}/usr"
@@ -45,6 +48,10 @@ pkg_setup() {
 }
 
 src_configure() {
+	# bug #856100
+	filter-lto
+	append-flags -fno-strict-aliasing
+
 	# 'cfurl' is only available on OSX and 'socket' isn't supposed to work.
 	# But the docs aren't clear about it, so we would need some testing...
 	local netaccessor