gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 54 insertions, 66 deletions

diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index db22b676cf21..e862c9369b3d 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,8 +1,8 @@
 AUX xalan-c-1.12-fix-lto.patch 823 BLAKE2B db4000d8959e5869d0f0afd92ede88f2bb279af6a9dfb1109655628a23357673dfe1594033d49eb595b8e0bfe1197ecb4492be81b47df6d367fa78378f3bae59 SHA512 efe6df198bd68ae4feb5f75e9679b57a2d53e21b1efa724889cb74a9fa90ac77fc598bada8042bac01e1a898a53ad0ef9e7b9bc3a328aab22b9c5506d477b671
 AUX xalan-c-1.12-fix-threads.patch 1074 BLAKE2B 086208fa8dbebc3b5edc5119386ba3976d7a939e505a81c625ab6fb7b8dddd198aa41bbc93177e575d8475a8ee4fdec62d27d4c3442121c29f72c341a123df8d SHA512 33aa9cc55bc4cc29e3d1fedd9dbd1792695ad52f50e2ed46f7872585892dca579d75622ad91d4d854d9ed1dabf38b282c69ef39a3d909321ad2b48e5e8244066
+AUX xalan-c-1.12-gcc-15.patch 1505 BLAKE2B f650d854f5e51d7a21bc5ace54a064cbe728e7cfb22b532d85eac0e436aeb5319744254b49404b1c7b7e4437c1e55106d0428bee9d8b437de7e0947ccb8931be SHA512 4edf0ba39a120588349fffecd7fef7526159d700d76dc385d2ecf21613330a10f421faf27639d7ae6223164c10f7a01400cbf5413d701ae37e613bf5bfbfb037
 AUX xalan-c-1.12-icu-75.patch 528 BLAKE2B 2c05baefa0dfaab7d279ed3e96de0781ce1c6bb75c520f9c8597d34f56c28414c513cd128be7edfec443ad548f81a59d25d69349e1b55ab0dac712db85637b86 SHA512 80fb2ede3454b240ceea45c2bc644b97d29b6d10866e3db9b8c445e6a3d78b34384a064a091bd8d8a409953b401fe65f71000c35a1b316a4b623e1b4289ea5f8
 DIST xalan_c-1.12.tar.gz 1130924 BLAKE2B c2f0fb98d39e516d5219ab0e075517c2c916b451bfce6d90399899870a8a73fb59f8d2465f58bd97208d19c5a7a18df5a49ece156d8dfe47bf57fc875793fb43 SHA512 a9f72f0e8e199ee2cfb4c19ecf390d5007f597aad96a53f55bc475805190302c7e0d800d776b7fb20fe8e2dddb6391e70aa3a8861a2303370135e8b0a5fd15fc
 DIST xalan_c-1.12.tar.gz.asc 488 BLAKE2B 1e5d7091ca184ac7e2897fe52417b01d9618ab0435f2bcc7748d563287ad81692e61bee92ec9bc71e5c21c11bc8245a4ec09ff7e6ed44a4b3113264b096ba277 SHA512 1c532367d5a3f16622cda3eaca05eac648b415a9de8685cf43f5e62683db30b396e669b6952f5bbe161327b8171cd1e54ad4dbefa54122243aa01298d53d400d
-EBUILD xalan-c-1.12-r2.ebuild 1278 BLAKE2B f509918805faa7f696a2bfbd21199267bd23aedff85b11b0077200c7ba4660c2ffdb4f725ddb17a242700ab76c146e92d346c49bf9bbaa2e30be2095db34f9fc SHA512 44896c2da3d5c1267f9498b9dc8119f540d2edc4b8719a93d4bdf445231e7547d02237b99d80289951a385975add1c4c1f864f384bb22aa7605d9d4d1c3ca208
-EBUILD xalan-c-9999.ebuild 1254 BLAKE2B 6e73e1f19a8e2cc25e1b40cf8a921637f41031369661c733694001da1c4b4c86a4fe97f25eba0000928f40f957219b9fbccd842c13b8a3d9044dd223c612bbca SHA512 f6bb25d7f9637d510db0a3f2f34024df8b676e8320421fd576381ddae17b458183cb995ea1b7fffebc5ae58cda731ce6bcb5316d65967dec33f943365dda11d6
+EBUILD xalan-c-1.12-r2.ebuild 1311 BLAKE2B 5f4670ab70bac397f6e317d59bb868319ebd67f3efaec0b3687f425ee56a409e3a8c2fc6c78f88d316c759e6bd3001a12187027bf8751c116cc818098a040298 SHA512 4d4dcca729f31fa449b9e2e7b3d9a04f199fd20fe38bfbd646ab6437abf7dc28ae30188f164f4e7ded2285e084a8ab58a3c7c70f85fe8dd5f432ce859c6c9196
 MISC metadata.xml 321 BLAKE2B a2e8e4499ce42f511537b6f3a1975f857ef40205dca2220536cc124bcb9f94c1017efe3f5e9124490f65758ac277b5db57bace8987e8118ea4a524b57d1a07a2 SHA512 af706a4b4d2a6e5f9ce31f83f367423097168c97fc8ca42e82a1c93a542329cd699d52902aaa63fc9b43cfc5a5c15cd26a87b754cc314d25131f9bb8652447ef
diff --git a/dev-libs/xalan-c/files/xalan-c-1.12-gcc-15.patch b/dev-libs/xalan-c/files/xalan-c-1.12-gcc-15.patch
new file mode 100644
index 000000000000..2b2f2b42c46f
--- /dev/null
+++ b/dev-libs/xalan-c/files/xalan-c-1.12-gcc-15.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/936501
+
+This function does not compile with gcc-15, but it was never instantiated, so just remove it.
+
+--- a/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp
++++ b/src/xalanc/XMLSupport/XalanOtherEncodingWriter.hpp
+@@ -301,44 +301,6 @@ public:
+         return write(chars, start, length, m_charRefFunctor);
+     }
+ 
+-    void
+-    writeSafe(
+-            const XalanDOMChar*     theChars,
+-            size_type               theLength)
+-    {
+-        for(size_type i = 0; i < theLength; ++i)
+-        {
+-            const XalanDOMChar  ch = theChars[i];
+-
+-            if (isUTF16HighSurrogate(ch) == true)
+-            {
+-                if (i + 1 >= theLength)
+-                {
+-                    throwInvalidUTF16SurrogateException(ch, 0,  getMemoryManager());
+-                }
+-                else 
+-                {
+-                    XalanUnicodeChar    value = decodeUTF16SurrogatePair(ch, theChars[i+1],  getMemoryManager());
+-
+-                    if (this->m_isPresentable(value))
+-                    {
+-                        write(value);
+-                    }
+-                    else
+-                    {
+-                        this->writeNumberedEntityReference(value);
+-                    }
+-
+-                    ++i;
+-                }
+-            }
+-            else
+-            {
+-                write(static_cast<XalanUnicodeChar>(ch));
+-            }
+-        }
+-    }
+-
+     void
+     write(const XalanDOMChar*     theChars)
+     {
diff --git a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
index beb96a63de6f..ce92a2b0e6c6 100644
--- a/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.12-r2.ebuild
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-lto.patch
 	"${FILESDIR}"/${P}-fix-threads.patch
 	"${FILESDIR}"/${P}-icu-75.patch
+	"${FILESDIR}"/${P}-gcc-15.patch
 )
 
 src_configure() {
diff --git a/dev-libs/xalan-c/xalan-c-9999.ebuild b/dev-libs/xalan-c/xalan-c-9999.ebuild
deleted file mode 100644
index 13753c18e646..000000000000
--- a/dev-libs/xalan-c/xalan-c-9999.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-MY_PN=${PN/-/_}
-DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
-HOMEPAGE="https://apache.github.io/xalan-c/"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apache/xalan-c.git"
-
-	SLOT="0"
-else
-	inherit verify-sig
-	SRC_URI="
-		https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz
-		verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/${MY_PN}-${PV}.tar.gz.asc )
-	"
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/apache-xalan-c.asc
-
-	SLOT="0/$(ver_cut 1-2)"
-	KEYWORDS="~amd64 ~ppc ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-	BDEPEND="
-		verify-sig? ( sec-keys/openpgp-keys-apache-xalan-c )
-	"
-fi
-
-LICENSE="Apache-2.0"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/icu:=
-	dev-libs/xerces-c[icu]
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? ( app-text/doxygen[dot] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12-fix-lto.patch
-	"${FILESDIR}"/${PN}-1.12-icu-75.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-Ddoxygen=$(usex doc)
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		docinto examples
-		dodoc -r samples/*/
-	fi
-}