From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Jul 2019 22:05:27 +0100 Subject: gentoo resync : 19.07.2019 --- sci-mathematics/genius/Manifest | 4 ++- .../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 ++++++++++--- 4 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 sci-mathematics/genius/files/genius-1.0.23-tinfo.patch create mode 100644 sci-mathematics/genius/files/genius-1.0.24-no_scrollkeeper.patch (limited to 'sci-mathematics/genius') diff --git a/sci-mathematics/genius/Manifest b/sci-mathematics/genius/Manifest index 1a6e3d302b87..d4e46ed9232b 100644 --- a/sci-mathematics/genius/Manifest +++ b/sci-mathematics/genius/Manifest @@ -1,4 +1,6 @@ +AUX genius-1.0.23-tinfo.patch 772 BLAKE2B 30f93f5ab25e51427d946906e0557c7298b280f1311e2f8f47af980e3035993d5b81c1d96258f08e5f23fcf347d992c2025f5448aa82de6d4134b0cde60bec93 SHA512 7f916124faa5f267c00e6609f0956339644a47db236d1f0d0468e64686f39de263b5a57da873dba09ba3b8967b6c8c35bc2b5fee7441b6af74e736deb5285402 +AUX genius-1.0.24-no_scrollkeeper.patch 1072 BLAKE2B fc05460f03b369e7c867b965a3bd3d6b0ac7722129377106c36358c4a07548f1a5a3c227bca9da2e7d5ad5ecf1290275fa6f46393aadd3865012c317b3f66f61 SHA512 d047ef4f3d253f48cee701f37709230d5c78694f98dcadc9b2bae399c93e9e043fa7bff27c81b8bf529cd83f06155b1059384c73e4647fd19795b5921316bdb9 DIST genius-1.0.23.tar.xz 2910332 BLAKE2B 8c9822737dfd0b445092c6b96376249093f3cfece4f0b98cb1bf62e9066336875fc014798b301686a9ffcaf5e37c1f324771c5b9e86c1578455874964427cca6 SHA512 8c64235d22734a7653468d39500ebbaa38b0ba7c25e292b4e96ddf825082584bf8c70e7ddc463b685ea01d51d3e08233b4e0cf8816a9a0e3357badb90d8e43c7 DIST genius-reference.pdf 1024944 BLAKE2B e0058fbd266a4ed4bf29306520ac64b7ff9a970fa79b5132f5556b61a97dd985fe916c888d0d5a678528ef231a9c66310dc2affe01491c7848451b3d54f58274 SHA512 04af3870104d2320b1d4b345d74d713a0dfcdf8a228002506508f437659b3ef6037ead0b1f6b37cc335692150750b58c4007fdaaddd9540233474ccd10dac285 -EBUILD genius-1.0.23.ebuild 1258 BLAKE2B 32922b3bac91addad409e8ade4bf19be151b923f418ef6dc259f3c562a471b5e0df59f7e55e818ad026db5bdb6cb0ad4333cbf2eb2e5e45bc58be655efc0f363 SHA512 1cd21045f40466f85ab5a2f18f0bc387d96d2756d7d37cf37c7c380a3f754f635bd81bed39985afb762cace1f61a2a61e9fd0f8c000156fb164a3d2a2cb1e812 +EBUILD genius-1.0.23.ebuild 1461 BLAKE2B a23dd485bc36ebfae68e6cea6f6b63867b77f521e2e4b636050595b1ef3e7f62e21f3aa76669bcbcc23c9a484fe6acea88af6ca335bd5b9789cf47d0617bc564 SHA512 512066eb09d4fe81722bb3cbe0802e074f1f658b24d0ebbb822b973dae9554934d2c469058dcb24320e290309bec4ab82385897e8f0c131c1a569c0d025f98b3 MISC metadata.xml 809 BLAKE2B 9102651076c5b608afc1fbd7a2371d771587fbdc4960e56692f0999ddbfc9bef8096e04e59c491dc7c85ce4f75ec9fb9b093f49a3e53979d62e787e13377c345 SHA512 4259f2ea73e57edc70689d48522cb28ae79443b97b25799bfda21e9114bac15ae77bc27933fd6773c99daeaa060088cb0cb0acae71acd4af81fe7ae408c9e06c 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 000000000000..e3250f0817c5 --- /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 000000000000..dc69ba7fd3f9 --- /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 aadd433bff97..f13471ac3010 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 \ -- cgit v1.2.3