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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A46E1382C5 for ; Wed, 2 Jun 2021 20:04:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87990E085E; Wed, 2 Jun 2021 20:04:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FFFCE0849 for ; Wed, 2 Jun 2021 20:04:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC6A7340E97 for ; Wed, 2 Jun 2021 20:04:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CA8F3644 for ; Wed, 2 Jun 2021 20:04:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1622664238.75c69ab7fe8cf9f97891fe54e08f81cb7d61d5dc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/Term-ReadLine-Gnu/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild X-VCS-Directories: dev-perl/Term-ReadLine-Gnu/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 75c69ab7fe8cf9f97891fe54e08f81cb7d61d5dc X-VCS-Branch: master Date: Wed, 2 Jun 2021 20:04:12 +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: 2efdd851-e94c-411a-be2d-f058cda24161 X-Archives-Hash: 43888c9bee26135a5a7256540398b59f commit: 75c69ab7fe8cf9f97891fe54e08f81cb7d61d5dc Author: Roman Beranek prusa3d com> AuthorDate: Wed Jun 2 02:09:10 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 2 20:03:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c69ab7 dev-perl/Term-ReadLine-Gnu: DEPEND on ncurses And prevent Term-ReadLine-Gnu-1.420.0 from trying to link to -ltermcap when sys-libs/libtermcap-compat is installed. Closes: https://bugs.gentoo.org/791691 Signed-off-by: Roman Beranek prusa3d.com> Closes: https://github.com/gentoo/gentoo/pull/21083 Signed-off-by: Sam James gentoo.org> ...-1.360.0.ebuild => Term-ReadLine-Gnu-1.360.0-r1.ebuild} | 5 ++++- ...-1.420.0.ebuild => Term-ReadLine-Gnu-1.420.0-r1.ebuild} | 14 +++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild similarity index 86% rename from dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild rename to dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild index f4c04f5412e..474a964cf34 100644 --- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild +++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild @@ -14,7 +14,10 @@ SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=">=sys-libs/readline-6.2:0=" +RDEPEND=" + >=sys-libs/readline-6.2:0= + sys-libs/ncurses:0= +" DEPEND="${RDEPEND} virtual/perl-ExtUtils-MakeMaker " diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild similarity index 58% rename from dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild rename to dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild index 66ff4fa8295..e2e3785ea44 100644 --- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild +++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild @@ -14,7 +14,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=">=sys-libs/readline-6.2:0=" +RDEPEND=" + >=sys-libs/readline-6.2:0= + sys-libs/ncurses:0= +" DEPEND=" ${RDEPEND} " @@ -22,3 +25,12 @@ BDEPEND=" ${RDEPEND} virtual/perl-ExtUtils-MakeMaker " + +src_prepare() { + default + # search_termlib() selects termcap when sys-libs/libtermcap-compat is installed + # despite the absence of libtermcap.so symlink + sed -i -e \ + "s/search_termlib()/search_lib('-ltinfo') || search_lib('-lncurses')/" \ + Makefile.PL || die +}