Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cpp/, dev-libs/log4cpp/files/
Date: Thu, 26 May 2022 00:28:10
Message-Id: 1653524852.c9f084957aeb97d4d449f38f90824fcd12445ddc.sam@gentoo
1 commit: c9f084957aeb97d4d449f38f90824fcd12445ddc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 00:27:19 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 00:27:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f08495
7
8 dev-libs/log4cpp: update EAPI 6 -> 8, avoid Bashism issues w/ configure
9
10 Not bothering to patch it, just force CONFIG_SHELL as Bash given
11 upstream is dead.
12
13 Closes: https://bugs.gentoo.org/763570
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 .../log4cpp/files/log4cpp-1.1.3-fix-version.patch | 9 ++++
17 dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild | 63 ++++++++++++++++++++++
18 2 files changed, 72 insertions(+)
19
20 diff --git a/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch
21 new file mode 100644
22 index 000000000000..9676bacfc9dd
23 --- /dev/null
24 +++ b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch
25 @@ -0,0 +1,9 @@
26 +https://src.fedoraproject.org/rpms/log4cpp/raw/rawhide/f/log4cpp-version-1.1.3.patch
27 +--- a/configure.in
28 ++++ b/configure.in
29 +@@ -1,4 +1,4 @@
30 +-AC_INIT(log4cpp, 1.1)
31 ++AC_INIT(log4cpp, 1.1.3)
32 +
33 + # autoconf 2.50 or higher to rebuild aclocal.m4, because the
34 + # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
35
36 diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
37 new file mode 100644
38 index 000000000000..e84b5498cc10
39 --- /dev/null
40 +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild
41 @@ -0,0 +1,63 @@
42 +# Copyright 1999-2022 Gentoo Authors
43 +# Distributed under the terms of the GNU General Public License v2
44 +
45 +EAPI=8
46 +
47 +inherit autotools multilib-minimal
48 +
49 +DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations"
50 +HOMEPAGE="http://log4cpp.sourceforge.net/"
51 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
52 +S="${WORKDIR}/${PN}"
53 +
54 +LICENSE="LGPL-2.1"
55 +SLOT="0/5"
56 +KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86"
57 +IUSE="doc static-libs test"
58 +RESTRICT="!test? ( test )"
59 +
60 +BDEPEND="doc? ( app-doc/doxygen )"
61 +
62 +PATCHES=(
63 + "${FILESDIR}"/1.0-doc_install_path.patch
64 + "${FILESDIR}"/1.0-gcc43.patch
65 + "${FILESDIR}"/1.0-asneeded.patch
66 + "${FILESDIR}"/${PN}-1.1-cmath-fix.patch
67 + "${FILESDIR}"/${PN}-1.1-automake-1.13.patch
68 + "${FILESDIR}"/${PN}-1.1-glibc-2.31.patch
69 + "${FILESDIR}"/${PN}-1.1.3-fix-version.patch
70 +)
71 +
72 +MULTILIB_CHOST_TOOLS=(
73 + /usr/bin/log4cpp-config
74 +)
75 +
76 +src_prepare() {
77 + default
78 +
79 + mv configure.{in,ac} || die
80 +
81 + # Build tests conditionally
82 + if ! use test; then
83 + sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die
84 + fi
85 +
86 + eautoreconf
87 +}
88 +
89 +multilib_src_configure() {
90 + # Bashisms call configure tests to malfunction / config.h to be misgenerated
91 + # which then causes a build failure later on in the package (w/ GCC 12,
92 + # anyway).
93 + CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf \
94 + --without-idsa \
95 + $(use_enable doc doxygen) \
96 + $(use_enable static-libs static)
97 +}
98 +
99 +multilib_src_install_all() {
100 + einstalldocs
101 +
102 + # Package installs .pc files
103 + find "${D}" -name '*.la' -delete || die
104 +}