net-p2p/ncdc: Bump to version 1.21

Fixed compilation against sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/677820
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

3 files changed, 111 insertions, 0 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 58e4a8f4c40d..c8cb651a8648 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1 +1,2 @@
 DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
+DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
new file mode 100644
index 000000000000..0e5acac59d50
--- /dev/null
+++ b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
@@ -0,0 +1,53 @@
+From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 8 Apr 2019 13:58:42 +0200
+Subject: [PATCH] Fix build against ncurses with separate libtinfo
+
+by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 20 +++++---------------
+ 1 file changed, 5 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c774316..d0c0430 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
+ # Check for header files.
+ AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
+ 
+-have_nch=no
+-AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
+-if test "x$have_nch" = "xno"; then
+-  AC_MSG_ERROR([Could not find a header files for ncurses.])
+-fi
+-
+ 
+ # Check for posix_fadvise()
+ AC_CHECK_FUNCS([posix_fadvise])
+@@ -95,15 +89,11 @@ esac
+ 
+ 
+ # Check for ncurses
+-AC_CHECK_LIB([ncursesw], [get_wch], [
+-    AC_SUBST([NCURSES_LIBS],[-lncursesw])
+-  ], [
+-    AC_CHECK_LIB([ncurses],
+-                 [get_wch],
+-                 [AC_SUBST([NCURSES_LIBS],[-lncurses])],
+-                 [AC_MSG_ERROR(ncursesw library is required)])
+-  ]
+-)
++PKG_CHECK_MODULES(NCURSES, ncursesw,,[
++    PKG_CHECK_MODULES(NCURSES, ncurses,,[
++	AC_MSG_ERROR(ncurses library is required)
++    ])
++])
+ 
+ # Check for zlib
+ AC_CHECK_LIB([z],
+-- 
+2.21.0
+
diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
new file mode 100644
index 000000000000..ee8caa14759b
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="ncurses directconnect client"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+else
+	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="geoip"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=[unicode]
+	sys-libs/zlib:=
+	geoip? ( dev-libs/geoip )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/makeheaders
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.21-tinfo.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with geoip)
+	)
+	if [[ "${PV}" == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}