[gentoo-commits] repo/gentoo:master commit in: dev-db/gqlplus/, dev-db/gqlplus/files/

[gentoo-commits] repo/gentoo:master commit in: dev-db/gqlplus/, dev-db/gqlplus/files/

[Fabian Groffen]

commit:     8a9e9a2a6cdda4d42822599fef759d83672b1a10
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 13:29:41 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 13:29:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9e9a2a

dev-db/gqlplus-1.16: fix configure with ncurses[tinfo], bug #742242

Closes: https://bugs.gentoo.org/742242
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 dev-db/gqlplus/files/gqlplus-1.16-ncurses-tinfo.patch | 19 +++++++++++++++++++
 dev-db/gqlplus/gqlplus-1.16.ebuild                    | 11 ++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/dev-db/gqlplus/files/gqlplus-1.16-ncurses-tinfo.patch b/dev-db/gqlplus/files/gqlplus-1.16-ncurses-tinfo.patch
new file mode 100644
index 00000000000..e39085e0dab
--- /dev/null
+++ b/dev-db/gqlplus/files/gqlplus-1.16-ncurses-tinfo.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,14 +4,6 @@
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+-AC_CHECK_LIB(ncurses, tgetnum,,
+-[
+-	echo "The required library ncurses not found - aborting."
+-	exit
+-],)
+-AC_CHECK_LIB(readline, tputs,,
+-[
+-	echo "The required library readline not found - aborting."
+-	exit
+-],)
++AC_SEARCH_LIBS([tgetnum], [ncurses tinfo], , AC_MSG_ERROR([need ncurses]), [])
++AC_CHECK_LIB(readline, tputs, , AC_MSG_ERROR([need readline]), [])
+ AC_OUTPUT(Makefile)

diff --git a/dev-db/gqlplus/gqlplus-1.16.ebuild b/dev-db/gqlplus/gqlplus-1.16.ebuild
index a3aa8f20986..b21f38c8469 100644
--- a/dev-db/gqlplus/gqlplus-1.16.ebuild
+++ b/dev-db/gqlplus/gqlplus-1.16.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="a front-end for Oracle program sqlplus with command-line editing"
-HOMEPAGE="https://sourceforge.net/projects/gqlplus/"
+HOMEPAGE="https://gitlab.com/jessp011/gqlplus"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -17,12 +17,17 @@ IUSE=""
 DEPEND="sys-libs/readline:*"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-ncurses-tinfo.patch )
+
 src_prepare() {
+	default
+
 	# don't use packaged readline and old version containing it
 	rm -Rf readline gqlplus-1.15
 
 	# maintainer can't seem to get versioning right
 	sed -i '/^#define VERSION/s/"[^"]\+"/"'"${PV}"'"/' gqlplus.c || die
 	sed -i '/^AC_INIT/s/\[[1-9.]\+\]/['"${PV}"']/' configure.ac || die
+
 	eautoreconf
 }