commit: 75c69ab7fe8cf9f97891fe54e08f81cb7d61d5dc Author: Roman Beranek <roman.beranek <AT> prusa3d <DOT> com> AuthorDate: Wed Jun 2 02:09:10 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <roman.beranek <AT> prusa3d.com> Closes: https://github.com/gentoo/gentoo/pull/21083 Signed-off-by: Sam James <sam <AT> 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 +}
