gentoo resync : 25.11.2020

5 files changed, 71 insertions, 44 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 05537ab7b526..7245e1ce7c42 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,7 +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-1.21.ebuild 991 BLAKE2B fbccb8063b09ca956e12dd89f8d642a1e4aa58f4a0d018b7dca2730e142b1fd32219f9ff1328dbe4973d9cb8de080659d00c960dcafb0d007514c954231c16dd SHA512 5da89188c1a0b18fa26d42a812e329679e2f7dfad145ec3b8acb325c180a710bc702a0980e33192f879aa75a296f0cab982ba4216c384a44700aef7c57d342e5
-EBUILD ncdc-9999.ebuild 966 BLAKE2B 4fce5eee7d24912f13e7be774510c3749d785fa00185993af6650bc6b6daf0cc66d190e89a3c7755efab1c8772c1c54940f7410d5744258601091ba66f858497 SHA512 b9d18ecd8b8212abbac6a5bc2777f1a57075dd1458a0d6fe69e79c9acd6f5829ba137126c9b375a28f8ed27238f98d454c4e26e62d154a2efdce4b9e535331a6
+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-9999.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
diff --git a/net-p2p/ncdc/ncdc-1.20.ebuild b/net-p2p/ncdc/ncdc-1.20.ebuild
deleted file mode 100644
index c1ade22353e2..000000000000
--- a/net-p2p/ncdc/ncdc-1.20.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-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}
-	dev-util/makeheaders
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_with geoip)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
index ee8caa14759b..33a396fa7dc8 100644
--- a/net-p2p/ncdc/ncdc-1.21.ebuild
+++ b/net-p2p/ncdc/ncdc-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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"
@@ -26,7 +26,10 @@ RDEPEND="
 	net-libs/gnutls:=
 	sys-libs/ncurses:0=[unicode]
 	sys-libs/zlib:=
-	geoip? ( dev-libs/geoip )"
+	geoip? (
+		dev-libs/geoip
+		dev-libs/libmaxminddb
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/makeheaders
diff --git a/net-p2p/ncdc/ncdc-1.22.1.ebuild b/net-p2p/ncdc/ncdc-1.22.1.ebuild
new file mode 100644
index 000000000000..8377b413dc10
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.22.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="ncurses directconnect client"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+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"
+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
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && 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 182aac603d70..8377b413dc10 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,10 @@ RDEPEND="
 	net-libs/gnutls:=
 	sys-libs/ncurses:0=[unicode]
 	sys-libs/zlib:=
-	geoip? ( dev-libs/geoip )"
+	geoip? (
+		dev-libs/geoip
+		dev-libs/libmaxminddb
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/makeheaders