summaryrefslogtreecommitdiff
path: root/dev-util/min-cscope
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/min-cscope')
-rw-r--r--dev-util/min-cscope/Manifest3
-rw-r--r--dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch33
-rw-r--r--dev-util/min-cscope/min-cscope-16.1.0.ebuild6
3 files changed, 40 insertions, 2 deletions
diff --git a/dev-util/min-cscope/Manifest b/dev-util/min-cscope/Manifest
index bac5e864fd72..00228718d265 100644
--- a/dev-util/min-cscope/Manifest
+++ b/dev-util/min-cscope/Manifest
@@ -1,3 +1,4 @@
+AUX min-cscope-16.1.0-tinfo.patch 1092 BLAKE2B 667ef81f62882781450fbc3445c858c8007a5d49904935ef549534bfbeb73b5e5cd18afa118260e8f34f1c0e035554e77ceab2abfd169ee57b59e9258b51f4a4 SHA512 1b6109add7cb38f60a557f2b7ecbf5ea8de0defe9bab8dc5a8e62f014d5b0833aa4a3646aec2b6c1fbff84e2692836066cfd755a7af3d28ccb3557dc3287919a
DIST min-cscope-16.1.0.tar.gz 382326 BLAKE2B 7d45df20c5d2decd9ee5127893cb97506420a19b42b371fbcc6bfae1ada2726deaef1ddf2750ed7c1744e5d90f6c65fd99ad71f5609de04d1afa03795ebb61d7 SHA512 434d6333758dbf72c320e08b3b705bbff6c67de8a1380295fe5971af1a2c4659dd3201c726fd318d7715b90f8a693a76599a8659ac45c76568e5a29a399a9c0a
-EBUILD min-cscope-16.1.0.ebuild 632 BLAKE2B d3b3440a1bc9a721630f1129b1959cf7eb88518a0ce79655a7b605883104709a29f58b6ca6994dade90c079ffa9b2466bf5ff1f558fba35a002c5508d80284b3 SHA512 2bf7672cd0555151d3407bda9752b6508b79bea99404ed55bade7ee0fa351fdbf56bedcfb2006144bd7c458f245632f477d4397c60ad4011e67865fbd3f98be9
+EBUILD min-cscope-16.1.0.ebuild 682 BLAKE2B 15681d759e0d858dd02457f62550974366d536e39676569d8c277cf93febbfdaf49483a8068557e937887f6165bcc39694597dd1dc5ca1e48b96cf09a83700ce SHA512 77b736221d7110cfacd00d57ca38eadae4a99b9ec9e6d55635a40a69c39f0f6a063d759b86cb6c93b4afc16dda38cf4c84766a2fe931ac80d4095a237c3f7a89
MISC metadata.xml 248 BLAKE2B a828276821884acc6a27159241c05f16c4bcb4c913720c567c76df06ca520c37dff7aa596b7cd6fa37ba8715a59fd65d2f8b1ade6d6fabf675a672cdbfe948b9 SHA512 6f50ad3193cddb62d48b3e833f321299930b9755b7e92dd1fa7ac4adb54d08996a75f89225e3d5358e84c5a75480d5b2b54163c717f7df66ef5e779946d342b4
diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch
new file mode 100644
index 000000000000..4b7f86f9f2f4
--- /dev/null
+++ b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/678886
+
+--- min-cscope/src/CMakeLists.txt
++++ min-cscope/src/CMakeLists.txt
+@@ -15,7 +15,11 @@
+ # Curses interface
+ IF(NOT NO_CURSES)
+ CHECK_INCLUDE_FILES(ncurses.h HAVE_NCURSES)
++ if(HAVE_NCURSES)
++ set(CURSES_NEED_NCURSES TRUE)
++ endif(HAVE_NCURSES)
+ CHECK_INCLUDE_FILES(curses.h HAVE_CURSES)
++ find_package(Curses REQUIRED)
+ IF(HAVE_NCURSES OR HAVE_CURSES)
+ MESSAGE("Building with curses-based interface")
+ SET(MIN_CSCOPE_SRCS ${MIN_CSCOPE_SRCS} command.c edit.c help.c mouse.c)
+@@ -137,13 +141,9 @@
+ IF(WIN32)
+ SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} regex)
+ ENDIF(WIN32)
+-IF(HAVE_NCURSES)
+- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
+-ELSE(HAVE_NCURSES)
+- IF(HAVE_CURSES)
+- SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
+- ENDIF(HAVE_CURSES)
+-ENDIF(HAVE_NCURSES)
++IF(HAVE_NCURSES OR HAVE_CURSES)
++ SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ${CURSES_LIBRARIES})
++ENDIF(HAVE_NCURSES OR HAVE_CURSES)
+
+ ADD_EXECUTABLE(min-cscope ${MIN_CSCOPE_SRCS})
+ TARGET_LINK_LIBRARIES(min-cscope ${MIN_CSCOPE_LIBS})
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
index 9ae7cbca4018..2648a185f329 100644
--- a/dev-util/min-cscope/min-cscope-16.1.0.ebuild
+++ b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,6 +18,10 @@ S=${WORKDIR}/${PN}
DOCS=( AUTHORS README{,.cscope} TODO )
+PATCHES=(
+ "${FILESDIR}/${P}-tinfo.patch" #678886
+)
+
src_prepare() {
cmake-utils_src_prepare