[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/, dev-libs/libcdio/files/

[Lars Wendler]

commit:     297cc162bda9bc6dc4838e481c3ad1b6302d0a9c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 19 00:19:15 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 19 00:30:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297cc162

dev-libs/libcdio: Revbump to fix ncurses detection.

Package-Manager: Portage-2.3.63, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/libcdio-2.1.0-ncurses_pkgconfig.patch    | 30 ++++++++++++++++++++++
 ...ibcdio-2.1.0.ebuild => libcdio-2.1.0-r1.ebuild} |  8 +++---
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
new file mode 100644
index 00000000000..b5ed62cc072
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-ncurses_pkgconfig.patch
@@ -0,0 +1,30 @@
+From 04f7da2f190ddc636a5c268f2428f36517f92e25 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@g.o>
+Date: Fri, 19 Apr 2019 02:24:04 +0200
+Subject: [PATCH] configure.ac: Search for pkg-config with its
+ PKG_PROG_PKG_CONFIG macro
+
+Otherwise the pkg-config command might not be found and thus some of the
+required packages (like ncurses) as well.
+
+Signed-off-by: Lars Wendler <polynomial-c@g.o>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5f9f9e78..711cb5df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,6 +27,8 @@ AC_CANONICAL_HOST
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++PKG_PROG_PKG_CONFIG
++
+ # Enable silent build rules by default (Automake v1.11 or later).
+ # Disable by either passing --disable-silent-rules to configure or passing V=1 to make
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
+-- 
+2.21.0
+

diff --git a/dev-libs/libcdio/libcdio-2.1.0.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
similarity index 94%
rename from dev-libs/libcdio/libcdio-2.1.0.ebuild
rename to dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 91ca3e370f2..a61b22b9d61 100644
--- a/dev-libs/libcdio/libcdio-2.1.0.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -36,15 +36,15 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/cdio/version.h
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
+)
+
 src_prepare() {
 	default
 
 	eautoreconf
 
-	#sed \
-	#	-e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-	#	-i configure || die
-
 	elibtoolize # to prevent -L/usr/lib ending up in the linker line wrt 499510
 }