gentoo resync : 12.03.2021

3 files changed, 2 insertions, 123 deletions

diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 6e33d2953e93..a61aaf78aeab 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -1,7 +1,6 @@
 AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19b39b9a67b88fc1d5ddfce5203b1c226f80ca8e1b6cc06897f3ce8eee11eb1bd923c702b8ce SHA512 030808e28a2095ecc143e4b5add8577eceb599e43eca6a59ed874d64a042b263245116e539791dca697f74e9336b23561321b16417e42d5b56c5b21597e1c3eb
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.3.tar.gz 7120270 BLAKE2B d622621657f33ada75a9ef330e77772b8f9cff717d8efc06f2a1fffea77360596e5192b48a6a015403a1045aa2492c626ba05f1de15eb5b997a80ca19b032db8 SHA512 206c5c31510224b8f6963b051f27968e4fe70374a0adb2c2990ac1f865b3bac41f63e6bfb7279faa21477f8878a3b9671ba70726fc75a84e51f037ef158639ad
-EBUILD xerces-c-3.2.3-r1.ebuild 3001 BLAKE2B 738dedddf7d7083a0222773ce6bdc428e71b30530aa95e8a19de1871c1e5bcd8f393103deab8653743eb09b45027542b95834348540b027e2809e393187e6a7c SHA512 16c48fa20b2f7f24c168d3c8a79fff300c12e35b1a3eb9c05d643a59c1d7ddcd7f5c3702393410e03080b06f43676c1089eb7dbb356c872197a6b4ae0d7591ad
-EBUILD xerces-c-3.2.3-r2.ebuild 2944 BLAKE2B f2a91197c33a2847a3439a30995a9442af066887ae77af43ddc243e1ed0972a5041be70c592a1e35f9dc42c90a6266a087838cedbd5455cf16ee4fcb12d1ef0c SHA512 b69d04b067adfabde81dce0f2da175f5fd9647f3f6213a220770837a3a87109febfcc9072bc802bdce281a4ff6f88331b4416e714734305ce40b56f502e8fb41
+EBUILD xerces-c-3.2.3-r2.ebuild 2937 BLAKE2B 173f8bf9b995b6ae5aad2f828f4ebc11a4b39055b047f58d128061e79e0b0ebd221711c01191a6edc837a2abeca5d41d76b98e2fc99cfef8766dfc83697db54a SHA512 272a9564c1f44430af0b2938b37828f7efa94baf934ac6b1343858924432df808e2d6d0bf91877c03e09240e7e9034e652382a032b9a65c3fe70141b63c3d04d
 EBUILD xerces-c-9999.ebuild 2882 BLAKE2B 1d5efc807b278179b221b88e050fff78b6c275d1a3554b2aec829296060a0c9309a19dac79a48e06d3c2efe259a945352eb6a9c848c58242e63be0515be97673 SHA512 25c01f394f9043e0952f55d38fe8590d3cb7f1546cffd6c23b59c7cd5ec80a104627fd7d991c512797876ea1e4c63efe956a1b6ee2c6e51631afd4476579d1ee
 MISC metadata.xml 638 BLAKE2B ae192f7a87ce73aed62967b02b1cda8535ac655b4e8763e7b75697c816f30b93b6bfb0b807d573f3ed82a9238bcb5234a1532151d98f9a30877884432916b816 SHA512 db2089786b68371bca8dd6e51ff820ac63245eefc5080e5d6f05b434bb2ee1a6831d439221f71b4d088e7d7cb22c9a68f6e67cee253923f13850afe6f7f021bd
diff --git a/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
deleted file mode 100644
index b6a53f71d1b0..000000000000
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2021 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 )
-
-PATCHES=(
-	"${FILESDIR}"/xerces-c-3.2.2-fix-XERCESC-2163.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() {
-	# '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-3.2.3-r2.ebuild b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
index 4c29af461e29..602a29ef1bbe 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	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"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 LICENSE="Apache-2.0"