[net-irc/znc] sync with tree

net-irc/znc/znc-9999.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-single-r1
 
@@ -13,8 +13,7 @@ DESCRIPTION="An advanced IRC Bouncer"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://github.com/znc/znc.git"}
+	EGIT_REPO_URI="https://github.com/znc/znc.git"
-	SRC_URI=""
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}
@@ -28,7 +27,7 @@ fi
 
 HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
-# "If you upgrade your ZNC version you must recompile all your modules."
+# "If you upgrade your ZNC version, you must recompile all your modules."
 # - https://wiki.znc.in/Compiling_modules
 SLOT="0/${PV}"
 IUSE="+ipv6 +icu nls perl python +ssl sasl tcl test +zlib"
@@ -36,17 +35,7 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
-DEPEND="
+# perl is a build-time dependency of modpython
-	icu? ( dev-libs/icu:= )
-	nls? ( dev-libs/boost:=[nls] )
-	perl? ( >=dev-lang/perl-5.10:= )
-	python? ( ${PYTHON_DEPS} )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	ssl? ( dev-libs/openssl:0= )
-	tcl? ( dev-lang/tcl:0= )
-	zlib? ( sys-libs/zlib:0= )
-"
-
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -63,8 +52,20 @@ BDEPEND="
 		dev-qt/qtnetwork:5
 	)
 "
+DEPEND="
+	icu? ( dev-libs/icu:= )
+	nls? ( dev-libs/boost:=[nls] )
+	perl? ( >=dev-lang/perl-5.10:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( >=dev-libs/cyrus-sasl-2 )
+	ssl? ( dev-libs/openssl:0= )
+	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib:0= )
+"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.1-inttest-dir.patch
+)
 
 pkg_setup() {
 	if use python; then
@@ -82,6 +83,8 @@ src_prepare() {
 	sed -i -e "s|DZNC_BIN_DIR:path=|DZNC_BIN_DIR:path=${T}/inttest|" \
 		test/CMakeLists.txt || die
 
+	sed -i "s|--datadir=|&${EPREFIX}|" znc.service.in || die
+
 	cmake_src_prepare
 }
 
@@ -92,6 +95,7 @@ src_configure() {
 		-DWANT_I18N="$(usex nls)"
 		-DWANT_PERL="$(usex perl)"
 		-DWANT_PYTHON="$(usex python)"
+		-DWANT_PYTHON_VERSION="${EPYTHON#python}"
 		-DWANT_CYRUS="$(usex sasl)"
 		-DWANT_OPENSSL="$(usex ssl)"
 		-DWANT_TCL="$(usex tcl)"