[gentoo-commits] repo/gentoo:master commit in: net-p2p/ncdc/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     5c23cc9d760cda86db7e917e17e606e26831a135
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 12:34:33 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 12:37:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c23cc9d

net-p2p/ncdc: Bumped live ebuild to EAPI-7

also combined release and live ebuilds.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-p2p/ncdc/ncdc-9999.ebuild | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index 5759853e51a..182aac603d7 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() {