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 309B0158086 for ; Fri, 5 Nov 2021 22:47:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45A68E0821; Fri, 5 Nov 2021 22:47:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 051D7E0821 for ; Fri, 5 Nov 2021 22:47:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B2BA0343313 for ; Fri, 5 Nov 2021 22:47:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A23110C for ; Fri, 5 Nov 2021 22:47:49 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1636152371.23632b956c384bb0442cd7d078a9376f1f013f49.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/wget2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/wget2/wget2-2.0.0.ebuild net-misc/wget2/wget2-9999.ebuild X-VCS-Directories: net-misc/wget2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 23632b956c384bb0442cd7d078a9376f1f013f49 X-VCS-Branch: master Date: Fri, 5 Nov 2021 22:47:49 +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: acf3c075-cefc-4522-bb2d-3155da6aab13 X-Archives-Hash: 6adbb226ab64660adc44378e6348aabc commit: 23632b956c384bb0442cd7d078a9376f1f013f49 Author: Mike Gilbert gentoo org> AuthorDate: Fri Nov 5 18:53:41 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Nov 5 22:46:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23632b95 net-misc/wget2: avoid eautoreconf Instead of patching Makefile.am, stub-out LDCONFIG in configure. Signed-off-by: Mike Gilbert gentoo.org> net-misc/wget2/wget2-2.0.0.ebuild | 14 +++----------- net-misc/wget2/wget2-9999.ebuild | 17 ++++++----------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/net-misc/wget2/wget2-2.0.0.ebuild b/net-misc/wget2/wget2-2.0.0.ebuild index 2926f483723..36048689f29 100644 --- a/net-misc/wget2/wget2-2.0.0.ebuild +++ b/net-misc/wget2/wget2-2.0.0.ebuild @@ -48,17 +48,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -PATCHES=( - # Upstream attempts to be "smart" by calling ldconfig in - # install-exec-hook - "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch -) - -src_prepare() { - default - eautoreconf -} - src_configure() { local myeconfargs=( --disable-static @@ -79,6 +68,9 @@ src_configure() { $(use_with pcre libpcre2) $(use_with psl libpsl) $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: ) econf "${myeconfargs[@]}" } diff --git a/net-misc/wget2/wget2-9999.ebuild b/net-misc/wget2/wget2-9999.ebuild index b757baf1343..c35c06da76f 100644 --- a/net-misc/wget2/wget2-9999.ebuild +++ b/net-misc/wget2/wget2-9999.ebuild @@ -3,12 +3,10 @@ EAPI=7 -inherit autotools - DESCRIPTION="GNU Wget2 is a file and recursive website downloader" HOMEPAGE="https://gitlab.com/gnuwget/wget2" if [[ "${PV}" == *9999 ]] ; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git" else SRC_URI="mirror://gnu/wget/${P}.tar.gz" @@ -51,12 +49,6 @@ BDEPEND=" RESTRICT="!test? ( test )" -PATCHES=( - # Upstream attempts to be "smart" by calling ldconfig in - # install-exec-hook - "${FILESDIR}"/${PN}-1.99.2-remove_ldconfig_call.patch -) - src_unpack() { if [[ "${PV}" == *9999 ]] ; then git-r3_src_unpack @@ -71,6 +63,7 @@ src_unpack() { } src_prepare() { + default if [[ "${PV}" == *9999 ]] ; then local bootstrap_opts=( --gnulib-srcdir=../gnulib @@ -82,9 +75,8 @@ src_prepare() { AUTORECONF="/bin/true" \ LIBTOOLIZE="/bin/true" \ sh ./bootstrap "${bootstrap_opts[@]}" || die + eautoreconf fi - default - eautoreconf } src_configure() { @@ -106,6 +98,9 @@ src_configure() { $(use_with pcre libpcre2) $(use_with psl libpsl) $(use_with zlib) + + # Avoid calling ldconfig + LDCONFIG=: ) econf "${myeconfargs[@]}" }