gentoo resync : 28.04.2019

4 files changed, 140 insertions, 14 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 7b03ca2acac6..05537ab7b526 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,7 @@
+AUX ncdc-1.21-tinfo.patch 1502 BLAKE2B c7194f78dbf410ee5a3886277b472792808279fab2f957ea8dd8783b91f1520f20eea19acf3a302b59214de186e695852d370b4733bccc36f77febcc66914371 SHA512 1f66c98230d56331782c592ec61b55aa66ae375de1d2a6b6fee3449ac8ff07b9d2d55af01c8fd72848cfe166fba306bbd836ee7fceb743142e63520f9a09f6d4
 DIST ncdc-1.20.tar.gz 367688 BLAKE2B 33bf6cd92146b0cf3d188cec4b5c29f0860f91cbdf7a1ab33789985a61b706647591513fb596f89b21d3d8aebf683316397b94f184aac928a93e23fc17030e82 SHA512 0f20d6584aab1e69bcb3a93271a8542c5968adee5fd198b375dc258996b60ee5f642eac5d5e91c5513e367bbfd42eda80ede9e6e93ab38279c33e8da557010a7
+DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
 EBUILD ncdc-1.20.ebuild 644 BLAKE2B 22e5a3c7f3116a937729866cb2f8ee4ad56a53018fdc5bfc61e5f029efc2215510667d22dc3a4bf803fdec390f09f8f6e690e27cf1a3cdfa60e077bd3b045c32 SHA512 16ef83bb091cf2a2573f167d127294956de168817158eba3f294eb7e73c9e5ad27b04f1093f02197a58df5d70c0f418f845ba7c6b8325566c61c81f5428c4a1e
-EBUILD ncdc-9999.ebuild 696 BLAKE2B 8fa87cdbb1ffc14650b8fa57a679460630e92f3d7061f0f12a48c0fd5ccdccddf58a1a19de94dd6dc0c2ec0d57996e2ba7b8fccf213d86c2ffd83de2903d3b00 SHA512 2198381e38d5da4d2c5fdc3382144ca341319fc72a643e8b66dca7f8dc470d1a5cfda7ecc453e235145a6dde8ee85803a4559b3adfb98b8e53938154ecf8a1c6
+EBUILD ncdc-1.21.ebuild 991 BLAKE2B fbccb8063b09ca956e12dd89f8d642a1e4aa58f4a0d018b7dca2730e142b1fd32219f9ff1328dbe4973d9cb8de080659d00c960dcafb0d007514c954231c16dd SHA512 5da89188c1a0b18fa26d42a812e329679e2f7dfad145ec3b8acb325c180a710bc702a0980e33192f879aa75a296f0cab982ba4216c384a44700aef7c57d342e5
+EBUILD ncdc-9999.ebuild 966 BLAKE2B 4fce5eee7d24912f13e7be774510c3749d785fa00185993af6650bc6b6daf0cc66d190e89a3c7755efab1c8772c1c54940f7410d5744258601091ba66f858497 SHA512 b9d18ecd8b8212abbac6a5bc2777f1a57075dd1458a0d6fe69e79c9acd6f5829ba137126c9b375a28f8ed27238f98d454c4e26e62d154a2efdce4b9e535331a6
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
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)"
+}
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index 5759853e51ac..182aac603d70 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,38 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools git-r3 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
 HOMEPAGE="https://dev.yorhel.nl/ncdc"
-EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools 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"
-KEYWORDS=""
 IUSE="geoip"
 
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	app-arch/bzip2
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	net-libs/gnutls
-	sys-libs/ncurses:0[unicode]
-	sys-libs/zlib
+	net-libs/gnutls:=
+	sys-libs/ncurses:0=[unicode]
+	sys-libs/zlib:=
 	geoip? ( dev-libs/geoip )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/makeheaders
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	default
-	eautoreconf
+	[[ "${PV}" == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf --enable-git-version \
+	local myeconfargs=(
 		$(use_with geoip)
+	)
+	if [[ "${PV}" == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+	econf "${myeconfargs[@]}"
 }
 
 src_compile() {