gentoo resync : 08.01.2021

4 files changed, 3 insertions, 119 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 7245e1ce7c42..bf0e4b8099df 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,7 +1,4 @@
-AUX ncdc-1.21-tinfo.patch 1502 BLAKE2B c7194f78dbf410ee5a3886277b472792808279fab2f957ea8dd8783b91f1520f20eea19acf3a302b59214de186e695852d370b4733bccc36f77febcc66914371 SHA512 1f66c98230d56331782c592ec61b55aa66ae375de1d2a6b6fee3449ac8ff07b9d2d55af01c8fd72848cfe166fba306bbd836ee7fceb743142e63520f9a09f6d4
-DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
-EBUILD ncdc-1.21.ebuild 1016 BLAKE2B fc854ff462693ff026f5a84260e5151b795cca9e6edec9ce35da42a7d1060afeff6300213319f7412cd7da0f38b9890676975af1293bde9b1ada304c32f97778 SHA512 18b165b824a7c985b0ace337b784fd24a280f90719b3cd0b64b223d4d8da245910ee584f15411edf5d98728246aa2dcee17d38bbee1bb18cabfea24630936f92
-EBUILD ncdc-1.22.1.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
+EBUILD ncdc-1.22.1.ebuild 991 BLAKE2B baf7f6ba1c99d50bf3c06c2bb6ae6cbf538869406ee191390494e5eaa1b657abb03eef505a940c79eb57d550f4fd93ea645f756f8ce73b89cc20150299de47ea SHA512 b245637d25cb644e7ddc5bb9613f59cdb24227c5fd87104a49a9355b4311e883465e87e24dcf4d65cb42bc0b940d19a8d903979234e94443c1b819f040f37311
 EBUILD ncdc-9999.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
 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
deleted file mode 100644
index 0e5acac59d50..000000000000
--- a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
deleted file mode 100644
index 33a396fa7dc8..000000000000
--- a/net-p2p/ncdc/ncdc-1.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 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
-		dev-libs/libmaxminddb
-	)"
-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-1.22.1.ebuild b/net-p2p/ncdc/ncdc-1.22.1.ebuild
index 8377b413dc10..24e91e7af127 100644
--- a/net-p2p/ncdc/ncdc-1.22.1.ebuild
+++ b/net-p2p/ncdc/ncdc-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	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"
+	KEYWORDS="amd64 ~ppc ~sparc x86"
 fi
 
 LICENSE="MIT"