gentoo resync : 29.12.2022

3 files changed, 71 insertions, 7 deletions

diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 740ed795a74a..361eb2837740 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,6 @@
 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
+DIST ncdc-1.23.tar.gz 378384 BLAKE2B 0558b8b51f9cda81ec553171f76a0f6c29a1a67e6f69c5cc2c181428f3bb1db2ecd5a9c2f0c609dac53323ad62e478171121572f0a9d707d9d6d9e9727441873 SHA512 c1b2098df517631a64b24efaeb328a796ed716dca08b61248bb39bba866055ce1e017f33cc594197824476ec65ada53b13bfb56878b5b8aa330288017ad15df2
 EBUILD ncdc-1.22.1-r1.ebuild 993 BLAKE2B 7d6a6c92d00a611710a578ac512ab835fa73f7b23a43748e2ac9de2ddf161c4c275d6a61c01b642df68f09aef482964bc365328b389410616b7beda67f8b9e9a SHA512 f2915f78eb33cd82edb0af152119ba9fb48b48a447b66edbaccd431daf0757dfb9bf1d9864f1ccc0572405f3bd37687d3a325c8f5fc7aab2b45a927e6a5f8b88
-EBUILD ncdc-9999.ebuild 995 BLAKE2B 3622d210b4c48feac9582f18b178a6d6e84dab2da2fd9dd08db461ea2c8e1e85c99f56dce6bb049c0d2e10dbd10d7861b2f3d1c715e0cbf61859fddf8594dbf3 SHA512 eab10df54ff414ba10bded7a946861c27467cdb9fa1cc931ae0ef0b179cdfd6272ade5de5bba13352e515b8273c8130b480fd4eb5269d70827eb4303d6d98814
+EBUILD ncdc-1.23.ebuild 1003 BLAKE2B e467d067bee2cf8a1fe9778d254aa14ed0149fd5f38b7d4b4bfc706460efb7b7b2b27b9e47179af78852d36e4b21d5b0b2f8f9dfdf43ac1bf7958d0841973211 SHA512 c5202b5daa51dd93ffb3854f2c5a5e1cb8c7b67b94d22c52c0b80e5de5763de4bf0764244536859ca715083fb0fa719106c4703e82702547c05df91c0633e240
+EBUILD ncdc-9999.ebuild 999 BLAKE2B 67a32123bf8e43f67931fdb0db01e4a7f1d4361fde369d5c7ed0be242ab5edec4139b6cf58021feecae92a92566a4ce616767a1ee264e60d88235e2fa12f20f9 SHA512 b84904ea8f5621c9bcd9b6a3e1037efa86faae67e3a18eb82b2fd6f65773f707622124db5a498857fb001f061842565226f85093aa5d6e6141db689146f4641a
 MISC metadata.xml 459 BLAKE2B a5e6e81e1e8f565a988a9592009adf521bcb1f14ef1b2cadadc7d4209e30894ad42258d7beb313157dca25dfac7abf3fd5ac8faf27a84448c2f846f5f708fcbb SHA512 3bbb3d84c87580a8a0be3383a49f1fcde1b21f06dee17ebb5567ee2996a4c6e8f39fb8bea96f0e5d71bc27834e59e38c904e948252ff328bc03dc1e694de56c4
diff --git a/net-p2p/ncdc/ncdc-1.23.ebuild b/net-p2p/ncdc/ncdc-1.23.ebuild
new file mode 100644
index 000000000000..dea5357e9c22
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.23.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.32:2
+	>=net-libs/gnutls-3:=
+	sys-libs/ncurses:=[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 f6cebc9b3c0a..e001c6590371 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
 HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
 else
@@ -22,7 +22,7 @@ IUSE="geoip"
 RDEPEND="
 	app-arch/bzip2
 	dev-db/sqlite:3
-	dev-libs/glib:2
+	>=dev-libs/glib-2.32:2
 	net-libs/gnutls:=
 	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib:=
@@ -38,16 +38,19 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
 		$(use_with geoip)
 	)
-	if [[ "${PV}" == *9999 ]] ; then
+
+	if [[ ${PV} == *9999 ]] ; then
 		myeconfargs+=( --enable-git-version )
 	fi
+
 	econf "${myeconfargs[@]}"
 }