gentoo resync : 18.03.2018

2 files changed, 14 insertions, 13 deletions

diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index 56a8cb6bebe8..5394bfee16a1 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -9,9 +9,9 @@ AUX znc.initd 810 BLAKE2B 1d4ddc2b361e5391eafd4b8318b665e2427514f87c755839e167ca
 AUX znc.initd-r1 914 BLAKE2B df6854929c0dbddc2fa75dec0b5b4103ffc9c6a6d9de05c9f04c0d36a4ffff28e834e42b22c363e24be03435088b2fa4428486c08adedb12ff3b484445545b0c SHA512 01f44ab51f6fa29383b4a4bc6e5f19928ebac6b32f73fb96906113596a904324dd53ef9dbb895a8dd29028f3523e6f7285d2d5b2ee43058fc017f0b47ae788c1
 AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a134c5a01042059564f2982aaec65715ac0a2c87b64fcd9746464148a81daeee549f4228d6ff55f SHA512 c3d676796aaa485dcaebee0fba58a8f86560cd192e0e2ccf06f58346c1368f58aa5be1c1e5160f8105e3dc5c684d3d1f82eff6a4d7b87c07f11450b72288727f
 DIST googletest-release-1.7.0.tar.gz 468653 BLAKE2B 8dfca8b79dcd7b64ce84bad11ee68c549f4fe3dff7638ed1d845af4a7f754ad5df782d2cbebdb9fecfda2499dae6585e07cda7a8c8c454f0b70723d5c9578aa4 SHA512 c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc
-DIST znc-1.6.3.tar.gz 1464200 BLAKE2B 7ea0aeea29133308772df91f5a43748acbfa5998a6865000d5dfe43d88ca82d18338ea0d18746361e0d22eafb4ce1c8533f213db4cc0d0444c3f05124388e562 SHA512 777279b6c973310b4e78a0472bd1e355c2adf3e4fbe9ebedde3dd4706e5c0b208d4330eb2318a8d9e0d7d7146bee0a4a428cbe5a3f230c8f6aa692a477e86e2b
 DIST znc-1.6.5.tar.gz 1470681 BLAKE2B 9de0b211280489423bc2894d0e76d7276aa42428d07d64516372a9ca6d1616db1f27c0142b54160c61cbee89d65ceadf941d001319254dbff9eb5b016988482e SHA512 d78603ac86d1fb92cdf591b1eb6d32fa19b0e39414bd69e1300c537051612ae590c43d3b8e4dd598cdff605bf3aa1d3d5d806edd428d15d50f733e1670f3e626
-EBUILD znc-1.6.3-r1.ebuild 3385 BLAKE2B 41a388617dd5a8a00028491cec893631c57a027e192032f632ba9f8523ba8c54904abc6b9b63c48345457dbf62d0b1a2206f348b116e351daccb28b27a9f86ba SHA512 e5e74f8903c17f83c7d1380a8e8abb94e62ded858c01b8ad47a464f4273688bb26f8f5a38e428e9c8e984492fa1b6cd7f6281de99c0690ea0d96fb3a1ddbc2da
+DIST znc-1.6.6.tar.gz 1471612 BLAKE2B 8bd977a95417c4259e9f38759d838f55a146f376dc8bb6230ab6e1b698fb7c9e060cbc237efd4e836961314abab56cc02e7c6bc74e40bad17abaf06e47fbb516 SHA512 cc5bc7328bfe36525ab215b4b53c7cd20aa02b41e7bb28507ff9d9632560f4c30396804e4b828bca0ece19f42813e3fce59d1bae639ea5fc149059f6979e63e7
 EBUILD znc-1.6.5.ebuild 3473 BLAKE2B 621f5dee4eddcd369a6d99bbd8d26398e6464b2c377a7b9fe2d89db41e5fbf2fbd640c13a1292bc1e12b4119736ac6933643ea6d7be03cdb4dc32db4a4594997 SHA512 5360728c9eed15ecf686128fc9553627615dbb8b5db1662a39fc0d7da4587cb4980b617de2660efa5b0bdfe7cdbcd7e0defccc7359c4f27b4be0dd82d8cf3672
+EBUILD znc-1.6.6.ebuild 3472 BLAKE2B c84bd547203c288fa193680a08afdb62c4772d0c8197b00f8d911393e4eacc7d7f250ed006a3e16c6386cae74985c3e06137bf076fb75f762a38baa333b9e064 SHA512 9e2ca907c42708972362794e688d93397620eaed27d1a3f8d09c96a621210535bdba74bec4ed13af9087082c6458e69aea4567c4f09bf27f378cfcc900448e30
 EBUILD znc-9999.ebuild 4235 BLAKE2B 98a1f0d9b72b054fe0f45ebaa07260bc1e06498c2e12500ec1ddd460f7f81d781ca4f7171e23f91d199a6c4ab1932057132e294f54076b0d70f4c02a19d1f728 SHA512 6d777a2a8ad2ed5010a41e5095656795e293d9e112f5336f46fe744c6eb93e0ff8c5b55cb17c7bb28c5c17623389829e6eeff45691ad6f9452f8f253e5016249
 MISC metadata.xml 757 BLAKE2B bbc8339f0d871c55ce85cee29b4217ec41dc56c835d1d332feecb98ff08f9297a9290ee9f217715832454a041bd372277ee6b7659d43d2ada9f778a29c32737d SHA512 fd055b958ea544d901a15bdf9f8af9ab437896f97d7fa76f84cb6eebfdf7b1de2e8f13d85757d8d4c7098fd6f2102b505084a8beb58156258aaa73367c479eaf
diff --git a/net-irc/znc/znc-1.6.3-r1.ebuild b/net-irc/znc/znc-1.6.6.ebuild
index 80dcbf2099d1..0e053e7e5951 100644
--- a/net-irc/znc/znc-1.6.3-r1.ebuild
+++ b/net-irc/znc/znc-1.6.6.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 inherit eutils python-single-r1 readme.gentoo-r1 systemd user
 
 MY_PV=${PV/_/-}
 GTEST_VER="1.7.0"
 GTEST_URL="https://github.com/google/googletest/archive/release-${GTEST_VER}.tar.gz -> googletest-release-${GTEST_VER}.tar.gz"
-DESCRIPTION="An advanced IRC Bouncer"
 
+DESCRIPTION="An advanced IRC Bouncer"
+HOMEPAGE="http://znc.in"
 SRC_URI="
 	http://znc.in/releases/archive/${PN}-${MY_PV}.tar.gz
 	test? ( ${GTEST_URL} )
 "
-KEYWORDS="amd64 arm x86"
 
-HOMEPAGE="http://znc.in"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="daemon debug ipv6 libressl perl python ssl sasl tcl test"
-
+KEYWORDS="amd64 arm x86"
+IUSE="daemon debug +ipv6 +icu libressl perl python +ssl sasl tcl test +zlib"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	dev-libs/icu:=
-	sys-libs/zlib
+	icu? ( dev-libs/icu:= )
 	perl? ( >=dev-lang/perl-5.10:= )
 	python? ( ${PYTHON_DEPS} )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
@@ -35,6 +33,7 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 	tcl? ( dev-lang/tcl:0= )
+	zlib? ( sys-libs/zlib )
 "
 DEPEND="
 	${RDEPEND}
@@ -66,12 +65,14 @@ src_configure() {
 	econf \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		$(use_enable debug) \
+		$(use_enable icu charset) \
 		$(use_enable ipv6) \
 		$(use_enable perl) \
 		$(use_enable python) \
 		$(use_enable sasl cyrus) \
 		$(use_enable ssl openssl) \
-		$(use_enable tcl tcl) \
+		$(use_enable tcl) \
+		$(use_enable zlib) \
 		$(use_with test gtest "${WORKDIR}/googletest-release-${GTEST_VER}")
 }
 
@@ -82,7 +83,7 @@ src_install() {
 		newinitd "${FILESDIR}"/znc.initd-r1 znc
 		newconfd "${FILESDIR}"/znc.confd-r1 znc
 	fi
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo")
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo") || die
 	DISABLE_AUTOFORMATTING=1
 	readme.gentoo_create_doc
 }