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 5D916158086 for ; Sun, 2 Jan 2022 17:49:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 095DC2BC029; Sun, 2 Jan 2022 17:49:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFF302BC029 for ; Sun, 2 Jan 2022 17:49:36 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D7283430F8 for ; Sun, 2 Jan 2022 17:49:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98670278 for ; Sun, 2 Jan 2022 17:49:34 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1641145728.03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/expat/expat-2.4.1.ebuild dev-libs/expat/expat-2.4.2.ebuild X-VCS-Directories: dev-libs/expat/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f X-VCS-Branch: master Date: Sun, 2 Jan 2022 17:49:34 +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: 4686183f-6fde-42ed-a27f-2869f04cc3a5 X-Archives-Hash: fc04fa07b61b3c38696a4ea1b55a5fa7 commit: 03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f Author: David Seifert gentoo org> AuthorDate: Sun Jan 2 17:48:48 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 2 17:48:48 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e41c01 dev-libs/expat: remove freebsd-libc Signed-off-by: David Seifert gentoo.org> dev-libs/expat/expat-2.4.1.ebuild | 12 +++--------- dev-libs/expat/expat-2.4.2.ebuild | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/dev-libs/expat/expat-2.4.1.ebuild b/dev-libs/expat/expat-2.4.1.ebuild index e06e6d5503b7..8db61e9898d3 100644 --- a/dev-libs/expat/expat-2.4.1.ebuild +++ b/dev-libs/expat/expat-2.4.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 AUTOTOOLS_AUTO_DEPEND=no AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal usr-ldscript +inherit autotools multilib-minimal DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="https://libexpat.github.io/" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" +IUSE="examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" DOCS=( README.md ) @@ -73,12 +73,6 @@ multilib_src_install() { sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die popd >/dev/null fi - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi } multilib_src_install_all() { diff --git a/dev-libs/expat/expat-2.4.2.ebuild b/dev-libs/expat/expat-2.4.2.ebuild index b92f19631735..f397e99485c2 100644 --- a/dev-libs/expat/expat-2.4.2.ebuild +++ b/dev-libs/expat/expat-2.4.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 AUTOTOOLS_AUTO_DEPEND=no AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing -inherit autotools multilib-minimal usr-ldscript +inherit autotools multilib-minimal DESCRIPTION="Stream-oriented XML parser library" HOMEPAGE="https://libexpat.github.io/" @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="elibc_FreeBSD examples static-libs unicode" +IUSE="examples static-libs unicode" BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )" DOCS=( README.md ) @@ -73,12 +73,6 @@ multilib_src_install() { sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die popd >/dev/null fi - - if multilib_is_native_abi ; then - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat - fi } multilib_src_install_all() {