commit: 03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jan 2 17:48:48 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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() {
