From 75c69ab7fe8cf9f97891fe54e08f81cb7d61d5dc Mon Sep 17 00:00:00 2001
From: Roman Beranek <roman.beranek@prusa3d.com>
Date: Wed, 2 Jun 2021 04:09:10 +0200
Subject: 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@prusa3d.com>
Closes: https://github.com/gentoo/gentoo/pull/21083
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../Term-ReadLine-Gnu-1.360.0-r1.ebuild            | 23 ++++++++++++++
 .../Term-ReadLine-Gnu-1.360.0.ebuild               | 20 ------------
 .../Term-ReadLine-Gnu-1.420.0-r1.ebuild            | 36 ++++++++++++++++++++++
 .../Term-ReadLine-Gnu-1.420.0.ebuild               | 24 ---------------
 4 files changed, 59 insertions(+), 44 deletions(-)
 create mode 100644 dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild
 delete mode 100644 dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
 create mode 100644 dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
 delete mode 100644 dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild

(limited to 'dev-perl')

diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild
new file mode 100644
index 000000000000..474a964cf34a
--- /dev/null
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=HAYASHI
+DIST_VERSION=1.36
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="GNU Readline XS library wrapper"
+
+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=
+	sys-libs/ncurses:0=
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
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.ebuild
deleted file mode 100644
index f4c04f5412e3..000000000000
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.360.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=HAYASHI
-DIST_VERSION=1.36
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="GNU Readline XS library wrapper"
-
-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="
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
diff --git a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
new file mode 100644
index 000000000000..e2e3785ea442
--- /dev/null
+++ b/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=HAYASHI
+DIST_VERSION=1.42
+DIST_EXAMPLES=("eg/*")
+inherit perl-module
+
+DESCRIPTION="Perl extension for the GNU Readline/History Library"
+
+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=
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+"
+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
+}
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.ebuild
deleted file mode 100644
index 66ff4fa82958..000000000000
--- a/dev-perl/Term-ReadLine-Gnu/Term-ReadLine-Gnu-1.420.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DIST_AUTHOR=HAYASHI
-DIST_VERSION=1.42
-DIST_EXAMPLES=("eg/*")
-inherit perl-module
-
-DESCRIPTION="Perl extension for the GNU Readline/History Library"
-
-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="
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-- 
cgit v1.2.3-65-gdbad