From c9f084957aeb97d4d449f38f90824fcd12445ddc Mon Sep 17 00:00:00 2001 From: Sam James Date: Thu, 26 May 2022 01:27:19 +0100 Subject: dev-libs/log4cpp: update EAPI 6 -> 8, avoid Bashism issues w/ configure Not bothering to patch it, just force CONFIG_SHELL as Bash given upstream is dead. Closes: https://bugs.gentoo.org/763570 Signed-off-by: Sam James --- .../log4cpp/files/log4cpp-1.1.3-fix-version.patch | 9 ++++ dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild | 63 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch create mode 100644 dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild 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 new file mode 100644 index 000000000000..9676bacfc9dd --- /dev/null +++ b/dev-libs/log4cpp/files/log4cpp-1.1.3-fix-version.patch @@ -0,0 +1,9 @@ +https://src.fedoraproject.org/rpms/log4cpp/raw/rawhide/f/log4cpp-version-1.1.3.patch +--- a/configure.in ++++ b/configure.in +@@ -1,4 +1,4 @@ +-AC_INIT(log4cpp, 1.1) ++AC_INIT(log4cpp, 1.1.3) + + # autoconf 2.50 or higher to rebuild aclocal.m4, because the + # AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro. diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild new file mode 100644 index 000000000000..e84b5498cc10 --- /dev/null +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools multilib-minimal + +DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" +HOMEPAGE="http://log4cpp.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="LGPL-2.1" +SLOT="0/5" +KEYWORDS="~amd64 ~arm ~ppc ~riscv ~s390 ~x86" +IUSE="doc static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="doc? ( app-doc/doxygen )" + +PATCHES=( + "${FILESDIR}"/1.0-doc_install_path.patch + "${FILESDIR}"/1.0-gcc43.patch + "${FILESDIR}"/1.0-asneeded.patch + "${FILESDIR}"/${PN}-1.1-cmath-fix.patch + "${FILESDIR}"/${PN}-1.1-automake-1.13.patch + "${FILESDIR}"/${PN}-1.1-glibc-2.31.patch + "${FILESDIR}"/${PN}-1.1.3-fix-version.patch +) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/log4cpp-config +) + +src_prepare() { + default + + mv configure.{in,ac} || die + + # Build tests conditionally + if ! use test; then + sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die + fi + + eautoreconf +} + +multilib_src_configure() { + # Bashisms call configure tests to malfunction / config.h to be misgenerated + # which then causes a build failure later on in the package (w/ GCC 12, + # anyway). + CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf \ + --without-idsa \ + $(use_enable doc doxygen) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + + # Package installs .pc files + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3-65-gdbad