From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C4A915ACFC for ; Mon, 1 May 2023 13:50:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 787E0E087F; Mon, 1 May 2023 13:50:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 543E8E087F for ; Mon, 1 May 2023 13:50:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E080341492 for ; Mon, 1 May 2023 13:50:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 048A8A49 for ; Mon, 1 May 2023 13:50:54 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1682949042.f0122c3d97d6547b978bc71f57922aed249e7a78.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xerces-c/, dev-libs/xerces-c/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xerces-c/Manifest dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild X-VCS-Directories: dev-libs/xerces-c/ dev-libs/xerces-c/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f0122c3d97d6547b978bc71f57922aed249e7a78 X-VCS-Branch: master Date: Mon, 1 May 2023 13:50:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 177b2eaf-e666-4f26-a3f3-f6e5b4cf5298 X-Archives-Hash: d1225c633b163cfe35b404f1cb5a0f36 commit: f0122c3d97d6547b978bc71f57922aed249e7a78 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 1 13:48:03 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 1 13:50:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0122c3d dev-libs/xerces-c: drop 3.2.3-r2 Closes: https://bugs.gentoo.org/905348 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/xerces-c/Manifest | 1 - .../files/xerces-c-3.2.2-fix-XERCESC-2163.patch | 24 ----- dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild | 117 --------------------- 3 files changed, 142 deletions(-) diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest index 68c113209e2a..7825dbd820ee 100644 --- a/dev-libs/xerces-c/Manifest +++ b/dev-libs/xerces-c/Manifest @@ -1,2 +1 @@ -DIST xerces-c-3.2.3.tar.xz 4184368 BLAKE2B e582ecfa13d521061d0a0ba2e53b595047b325b53d5b634eadc0ed1967410733142e11951d907edf96386b1417adc938bf2f2f4eab760dcb81c0e718a48cf300 SHA512 8b8ac9a8377788753a918af2bd4437af5bb94b275e50fe1ab7cc6af88a8531248518705bc794da702a3e06a82a064cbd25e4149c2526aff7f61cf49ded4fdfab DIST xerces-c-3.2.4.tar.xz 4260560 BLAKE2B 5d9fed1e9a461f8b348f3259216c5181bd03d2b5d8790cad88621d601065d0d79f8766ae70ed0aa7afe05005e2bcaf37a88da25b17f0e028bf074a31cea5fe71 SHA512 4d58d25b59b4528ad1f2d60681ddd6d2a4dba945613cee9ce978605f006da03703ea85a1bd89f781eeb3ad4dbdadf485a310f29d4c07036b0322f0755f87fddf diff --git a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch b/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch deleted file mode 100644 index 57dde7220985..000000000000 --- a/dev-libs/xerces-c/files/xerces-c-3.2.2-fix-XERCESC-2163.patch +++ /dev/null @@ -1,24 +0,0 @@ -From db7a8b0cd2a163de1e3ef8c950cf9e708b0b5f98 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Wed, 2 Jan 2019 15:01:21 -0500 -Subject: [PATCH] build: Install XercesMessages_en_US.cat to - /usr/share/xerces-c/msg - -Fixes XERCESC-2163 ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index c29aa257b..6f1929d99 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1198,7 +1198,7 @@ if(XERCES_USE_MSGLOADER_ICONV) - - install( - FILES "${RESTARGET}" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/msg" -+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/xerces-c/msg" - COMPONENT "runtime") - endif() - 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 deleted file mode 100644 index dc85454c9e42..000000000000 --- a/dev-libs/xerces-c/xerces-c-3.2.3-r2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake 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.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 ) - -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" - 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_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 -}