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/log4cpp/
Date: Fri, 09 Sep 2022 07:59:42
Message-Id: 1662710342.b512e0ae66ce849ac8faf5e8ff85bc1c0c2cfef5.soap@gentoo
1 commit: b512e0ae66ce849ac8faf5e8ff85bc1c0c2cfef5
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 9 07:59:02 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 9 07:59:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b512e0ae
7
8 dev-libs/log4cpp: drop multilib, static-libs
9
10 No multilib or static-libs reverse dependencies.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 ...4cpp-1.1.3-r1.ebuild => log4cpp-1.1.3-r2.ebuild} | 21 ++++++++-------------
16 1 file changed, 8 insertions(+), 13 deletions(-)
17
18 diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
19 similarity index 75%
20 rename from dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
21 rename to dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
22 index 286862cfccee..b20890c24690 100644
23 --- a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
24 +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild
25 @@ -3,7 +3,7 @@
26
27 EAPI=8
28
29 -inherit autotools multilib-minimal
30 +inherit autotools
31
32 DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
33 HOMEPAGE="http://log4cpp.sourceforge.net/"
34 @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}"
35 LICENSE="LGPL-2.1"
36 SLOT="0/5"
37 KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86"
38 -IUSE="doc static-libs test"
39 +IUSE="doc test"
40 RESTRICT="!test? ( test )"
41
42 BDEPEND="doc? ( app-doc/doxygen )"
43 @@ -28,10 +28,6 @@ PATCHES=(
44 "${FILESDIR}"/${PN}-1.1.3-fix-version.patch
45 )
46
47 -MULTILIB_CHOST_TOOLS=(
48 - /usr/bin/log4cpp-config
49 -)
50 -
51 src_prepare() {
52 default
53
54 @@ -45,19 +41,18 @@ src_prepare() {
55 eautoreconf
56 }
57
58 -multilib_src_configure() {
59 +src_configure() {
60 # Bashisms call configure tests to malfunction / config.h to be misgenerated
61 # which then causes a build failure later on in the package (w/ GCC 12,
62 # anyway).
63 - CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf \
64 + CONFIG_SHELL="${BROOT}"/bin/bash econf \
65 --without-idsa \
66 - $(multilib_native_use_enable doc doxygen) \
67 - $(use_enable static-libs static)
68 + $(use_enable doc doxygen)
69 }
70
71 -multilib_src_install_all() {
72 - einstalldocs
73 +src_install() {
74 + default
75
76 # Package installs .pc files
77 - find "${D}" -name '*.la' -delete || die
78 + find "${ED}" -name '*.la' -delete || die
79 }