3 files changed, 120 insertions, 1 deletions
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index d148a372fb71..84923a3f2e2a 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,6 +2,8 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
+DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
 EBUILD xerces-c-3.2.2-r1.ebuild 2974 BLAKE2B 086f8a100869f89bc9bbf294c2c699f624a4fb55c028239b0978676ee0c84808c85de9f9cd8eaecb5858f9d14dc8bdd9bd11fe5c431e71cdfc986449d28d9c9a SHA512 1dddd35573dbd3687de506cdf2970779d05a13ee15cdf80e80e2bf046d591719b4835f1465c0da37ddd93a5997179bd47a02156deabdbcdc6afdcc9131777f9a
-EBUILD xerces-c-9999.ebuild 2884 BLAKE2B a69a9d474232d4dce30c5e86f225e96c57b07aa18263d0de9e3afc1d56518da9c64876412f84b10c0825fe2c85abe1be54b2ed551c168cb7281b0e374468a553 SHA512 fbf54973cfd79e1b3f8a5b7a342a4b3ccdf4aa3e1e9485d5a1c9dc880fc716ef6a0e832be09ddbbedacf630c3dd72c69baefea2315595eb05f41411751f9d2bb
+EBUILD xerces-c-3.2.3.ebuild 2936 BLAKE2B c11fb739c9e6b8ff5e7ad789c9b9c0651dd569afc53d6a97334e5c5ef12b19f65e9cc63f478ad76606293297bf9c77347f448676bf76c415d42f0e0871ec9a53 SHA512 e119476f8a6fc10b4a4f043e530253f2035ebc264823b383090985b216a70815b95a8488fce42f0ac13a1196475d75403f160b0259933dc77450d4f82f1dbb86
+EBUILD xerces-c-9999.ebuild 2942 BLAKE2B c4fbaebdc301f12035ecca49b3b25308f647652cf84cb24e6b8eeb8e69db205ac53ba20d7460af12f9c44a571a86351526f2785c0cf6489665560d9b96f811ec SHA512 89c5ca69e61d4ac7e5984e5ae502a3265dbbab9d098501adfaecf6d21c1c24df7deabd419e3b2a8fb772c6d4f5aeae5416f9cbfd03f3daaa5ed9248e2a1e27eb
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
new file mode 100644
index 000000000000..c40bb0f65621
--- /dev/null
+++ b/dev-libs/xerces-c/xerces-c-3.2.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+
+inherit cmake-utils prefix
+
+DESCRIPTION="A 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.gz"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="icu? ( dev-libs/icu:0= )
+	curl? ( net-misc/curl )
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	test? ( dev-lang/perl )"
+
+DOCS=( CREDITS KEYS NOTICE README )
+
+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() {
+	# '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"
+	elif use elibc_FreeBSD; then
+		transcoder="iconv"
+	else
+		transcoder="gnuiconv"
+	fi
+	# for interix maybe: transcoder="windows"
+
+	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-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
+}
+
+src_install() {
+	cmake-utils_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 aaa442c31bfc..627bdbc2f2f9 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -75,6 +75,7 @@ src_configure() {
 	# for interix maybe: transcoder="windows"
 
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
 		-Dnetwork-accessor="${netaccessor}"
 		-Dmessage-loader="${msgloader}"
 		-Dtranscoder="${transcoder}"