Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/expat/
Date: Sun, 02 Jan 2022 17:49:39
Message-Id: 1641145728.03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f.soap@gentoo
1 commit: 03e41c015fb1336e647c83f2e5b0c1ce6c64ca6f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 2 17:48:48 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 2 17:48:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e41c01
7
8 dev-libs/expat: remove freebsd-libc
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 dev-libs/expat/expat-2.4.1.ebuild | 12 +++---------
13 dev-libs/expat/expat-2.4.2.ebuild | 12 +++---------
14 2 files changed, 6 insertions(+), 18 deletions(-)
15
16 diff --git a/dev-libs/expat/expat-2.4.1.ebuild b/dev-libs/expat/expat-2.4.1.ebuild
17 index e06e6d5503b7..8db61e9898d3 100644
18 --- a/dev-libs/expat/expat-2.4.1.ebuild
19 +++ b/dev-libs/expat/expat-2.4.1.ebuild
20 @@ -1,10 +1,10 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 AUTOTOOLS_AUTO_DEPEND=no
27 AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing
28 -inherit autotools multilib-minimal usr-ldscript
29 +inherit autotools multilib-minimal
30
31 DESCRIPTION="Stream-oriented XML parser library"
32 HOMEPAGE="https://libexpat.github.io/"
33 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
34 LICENSE="MIT"
35 SLOT="0"
36 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"
37 -IUSE="elibc_FreeBSD examples static-libs unicode"
38 +IUSE="examples static-libs unicode"
39 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
40
41 DOCS=( README.md )
42 @@ -73,12 +73,6 @@ multilib_src_install() {
43 sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
44 popd >/dev/null
45 fi
46 -
47 - if multilib_is_native_abi ; then
48 - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
49 - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
50 - use elibc_FreeBSD && gen_usr_ldscript -a expat
51 - fi
52 }
53
54 multilib_src_install_all() {
55
56 diff --git a/dev-libs/expat/expat-2.4.2.ebuild b/dev-libs/expat/expat-2.4.2.ebuild
57 index b92f19631735..f397e99485c2 100644
58 --- a/dev-libs/expat/expat-2.4.2.ebuild
59 +++ b/dev-libs/expat/expat-2.4.2.ebuild
60 @@ -1,10 +1,10 @@
61 -# Copyright 1999-2021 Gentoo Authors
62 +# Copyright 1999-2022 Gentoo Authors
63 # Distributed under the terms of the GNU General Public License v2
64
65 EAPI=7
66 AUTOTOOLS_AUTO_DEPEND=no
67 AT_NOEAUTOHEADER=yes # because expat_config.h.in would need post-processing
68 -inherit autotools multilib-minimal usr-ldscript
69 +inherit autotools multilib-minimal
70
71 DESCRIPTION="Stream-oriented XML parser library"
72 HOMEPAGE="https://libexpat.github.io/"
73 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
74 LICENSE="MIT"
75 SLOT="0"
76 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"
77 -IUSE="elibc_FreeBSD examples static-libs unicode"
78 +IUSE="examples static-libs unicode"
79 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
80
81 DOCS=( README.md )
82 @@ -73,12 +73,6 @@ multilib_src_install() {
83 sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
84 popd >/dev/null
85 fi
86 -
87 - if multilib_is_native_abi ; then
88 - # libgeom in /lib and ifconfig in /sbin require libexpat on FreeBSD since
89 - # we stripped the libbsdxml copy starting from freebsd-lib-8.2-r1
90 - use elibc_FreeBSD && gen_usr_ldscript -a expat
91 - fi
92 }
93
94 multilib_src_install_all() {