From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EDD4B158003 for ; Fri, 9 Sep 2022 07:59:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF53FE090F; Fri, 9 Sep 2022 07:59:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC3D9E090F for ; Fri, 9 Sep 2022 07:59:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EFC61340CB6 for ; Fri, 9 Sep 2022 07:59:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C6035C8 for ; Fri, 9 Sep 2022 07:59:39 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1662710342.b512e0ae66ce849ac8faf5e8ff85bc1c0c2cfef5.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild X-VCS-Directories: dev-libs/log4cpp/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b512e0ae66ce849ac8faf5e8ff85bc1c0c2cfef5 X-VCS-Branch: master Date: Fri, 9 Sep 2022 07:59:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 29f91ab3-0e09-4198-9a02-d288e602d4d4 X-Archives-Hash: d16f4e6d9e6cd14614d7dc03cfd49264 commit: b512e0ae66ce849ac8faf5e8ff85bc1c0c2cfef5 Author: Sam James gentoo org> AuthorDate: Fri Sep 9 07:59:02 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Sep 9 07:59:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b512e0ae dev-libs/log4cpp: drop multilib, static-libs No multilib or static-libs reverse dependencies. Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> ...4cpp-1.1.3-r1.ebuild => log4cpp-1.1.3-r2.ebuild} | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild similarity index 75% rename from dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild rename to dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild index 286862cfccee..b20890c24690 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.3-r1.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.3-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools multilib-minimal +inherit autotools DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="http://log4cpp.sourceforge.net/" @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}" LICENSE="LGPL-2.1" SLOT="0/5" KEYWORDS="amd64 ~arm ppc ~riscv ~s390 x86" -IUSE="doc static-libs test" +IUSE="doc test" RESTRICT="!test? ( test )" BDEPEND="doc? ( app-doc/doxygen )" @@ -28,10 +28,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1.3-fix-version.patch ) -MULTILIB_CHOST_TOOLS=( - /usr/bin/log4cpp-config -) - src_prepare() { default @@ -45,19 +41,18 @@ src_prepare() { eautoreconf } -multilib_src_configure() { +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 \ + CONFIG_SHELL="${BROOT}"/bin/bash econf \ --without-idsa \ - $(multilib_native_use_enable doc doxygen) \ - $(use_enable static-libs static) + $(use_enable doc doxygen) } -multilib_src_install_all() { - einstalldocs +src_install() { + default # Package installs .pc files - find "${D}" -name '*.la' -delete || die + find "${ED}" -name '*.la' -delete || die }