[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/genius/, sci-mathematics/genius/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     330cbf90eb64a7eb05e51a4200900ac5c55364d1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:13:56 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 15:14:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330cbf90

sci-mathematics/genius: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/675670
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../genius/files/genius-1.0.23-tinfo.patch         | 24 ++++++++++++++++++
 .../files/genius-1.0.24-no_scrollkeeper.patch      | 29 ++++++++++++++++++++++
 sci-mathematics/genius/genius-1.0.23.ebuild        | 17 ++++++++++---
 3 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
new file mode 100644
index 00000000000..e3250f0817c
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.23-tinfo.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/675670
+
+--- genius-1.0.23/configure.ac
++++ genius-1.0.23/configure.ac
+@@ -15,6 +15,8 @@
+ 
+ AC_PROG_INTLTOOL([0.21])
+ 
++PKG_PROG_PKG_CONFIG
++
+ dnl ================= Requirements ================================================
+ 
+ VTE_REQUIRED=0.26.0
+@@ -64,8 +66,8 @@
+ 
+ dnl Check for termcap
+ AC_CHECK_LIB(termcap, tgetent,[TERMCAP_LIB="-ltermcap"],
+-	     [AC_CHECK_LIB(ncurses, tgetent,
+-                           [TERMCAP_LIB="-lncurses"
++	     [PKG_CHECK_MODULES(NCURSES, ncurses,
++                           [TERMCAP_LIB="$NCURSES_LIBS"
+                             AC_DEFINE(USE_NCURSES,[1], [Use ncurses library])
+                             AC_CHECK_HEADER(ncurses/curses.h, [
+ 					    AC_DEFINE(INC_NCURSES,[1],[ncurses include])])], [

diff --git a/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch b/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch
new file mode 100644
index 00000000000..dc69ba7fd3f
--- /dev/null
+++ b/sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch
@@ -0,0 +1,29 @@
+--- genius-1.0.24/configure.ac
++++ genius-1.0.24/configure.ac
+@@ -247,16 +247,16 @@
+ fi
+ 
+ #dnl scrollkeeper checks 
+-#AC_ARG_ENABLE([scrollkeeper],
+-#	[AC_HELP_STRING([--disable-scrollkeeper],
+-#		[do not make updates to the scrollkeeper database])],,
+-#		enable_scrollkeeper=yes)
+-#AM_CONDITIONAL([ENABLE_SK],[test "$enable_scrollkeeper" = "yes"])
+-#
+-#AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
+-#if test x$SCROLLKEEPER_CONFIG = xno; then
+-#  AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
+-#fi
++dnl AC_ARG_ENABLE([scrollkeeper],
++dnl 	[AC_HELP_STRING([--disable-scrollkeeper],
++dnl 		[do not make updates to the scrollkeeper database])],,
++dnl 		enable_scrollkeeper=yes)
++dnl AM_CONDITIONAL([ENABLE_SK],[test "$enable_scrollkeeper" = "yes"])
++dnl 
++dnl AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
++dnl if test x$SCROLLKEEPER_CONFIG = xno; then
++dnl   AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package)
++dnl fi
+ 
+ dnl mime checks
+ AC_ARG_ENABLE(update-mimedb,

diff --git a/sci-mathematics/genius/genius-1.0.23.ebuild b/sci-mathematics/genius/genius-1.0.23.ebuild
index aadd433bff9..f13471ac301 100644
--- a/sci-mathematics/genius/genius-1.0.23.ebuild
+++ b/sci-mathematics/genius/genius-1.0.23.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools gnome2
 
 DESCRIPTION="Genius Mathematics Tool and the GEL Language"
 HOMEPAGE="https://www.jirka.org/genius.html"
@@ -30,11 +30,22 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/gtk-update-icon-cache
 	dev-util/intltool
-	virtual/yacc
+	sys-devel/autoconf-archive
 	sys-devel/flex
-" # eautoreconf needs autoconf-archive
+	virtual/yacc
+" # eautoreconf needs sys-devel/autoconf-archive
 # dev-util/gtk-update-icon-cache because configure checks for it for some reason and never calls it with DESTDIR set..
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.23-tinfo.patch"
+	"${FILESDIR}/${PN}-1.0.24-no_scrollkeeper.patch"
+)
+
+src_prepare() {
+	gnome2_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	# Unrecognized --disable-scrollkeeper warning comes from gnome2.eclass adding it based on grep, but upstream has them commented out in .ac with "#" instead of "dnl"
 	gnome2_src_configure \