gentoo resync : 18.03.2018

8 files changed, 197 insertions, 65 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 53ab80a427f1..01aaa190209c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 2b12913f839a..a5bdd6c42493 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -2,7 +2,9 @@ AUX hexchat-2.12.2-configure.ac-remove-werror.patch 871 BLAKE2B 27e34d398541e45d
 AUX hexchat-2.12.4-configure.ac.patch 9671 BLAKE2B 0e1391f6a07759167cc64829e8218f7912afd9dec3c3529a6eb021193f4825fbb5b2e5ef72a791f131054be4109e2ea01d3143a7777925c43c8c28da549be0ed SHA512 2fcac82d4074cc79f4e6c779664cae1a47287b78ba827187d8d669e6c522f7c3aeedabd4cac9172476971aa49e7ed6927078073b7b4828d5df6363bc0d8a2062
 AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e66f4db0fd65645a72a6705bd8480f8e7b403b82d9c6eeb810e356e74c5a1d9903abc9f09a95a1de292fd045eb217758f SHA512 a309ce5e0bb25aa6c88c62bb5a5e1758e49d431cd51ef8186f29ac3c09af544ff75fd043ef8d9217c2779fb1c76fa27d392d9f7e9165a5772e401345bddce1ca
 DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
+DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 EBUILD hexchat-2.12.4-r1.ebuild 3609 BLAKE2B f1d3828bb8e4a9c1315fe2ad0e4abd2e3da682ee95882ccbfb5bbe546df994208750a8d628b55198d281678a61da583a938423561145a10a1cf08d622877befb SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87
 EBUILD hexchat-2.12.4-r2.ebuild 3408 BLAKE2B ecaf76967360e6720de5018b2a8b8d354db06ead38bda2559871a87e15d2afa945580c226fafd32cc39c8ec3743d2eae972dbdecb7e5ea98e5a9a7f1de51e61b SHA512 9c93c3e0d39d911af72af03d9156b1f13dec40e22881ed8913db3b276ed3888472cfca59c0ec51ba779b58fecb49bf7c84f3e936a8dd1cc3e31257aa5ef9281e
-EBUILD hexchat-9999.ebuild 3473 BLAKE2B d582398297c3c26a61af331c33135b48583abd73ceea12e265a92d25d4f930f2b8365253aa74e3f65041adbeddc7da4f8c0df352e8fef60b419d9978eae39a13 SHA512 1d236912762d9543bce6e8faadcbb4e1e55a8568a5c6b3a82ba9ba40e5a9ad27e8c27dab5d5eb608ff7120686a16f7f446d149c495125251160348164ca93bdf
+EBUILD hexchat-2.14.1.ebuild 3443 BLAKE2B fcf72f8550c673216c1b4944bfcfa457f67cbe5e15f62ca6aa0bb91668f760dd3f9229080c2ab6a3adb3eb11877163d4f11fd851f24b564feab45968f9852e8c SHA512 444e169ef4b544e5e7cc3d4fa1b6d59cfe686d1ad46f81aed3704de9695bb8db285bc787c8a45261b723853c952a61f736eb5a453a5e744a69f54f88fcb152fc
+EBUILD hexchat-9999.ebuild 3443 BLAKE2B fcf72f8550c673216c1b4944bfcfa457f67cbe5e15f62ca6aa0bb91668f760dd3f9229080c2ab6a3adb3eb11877163d4f11fd851f24b564feab45968f9852e8c SHA512 444e169ef4b544e5e7cc3d4fa1b6d59cfe686d1ad46f81aed3704de9695bb8db285bc787c8a45261b723853c952a61f736eb5a453a5e744a69f54f88fcb152fc
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-2.14.1.ebuild b/net-irc/hexchat/hexchat-2.14.1.ebuild
new file mode 100644
index 000000000000..13d777d04033
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
+	libcanberra? ( media-libs/libcanberra )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	lua? ( dev-lang/lua:= )
+	perl? ( dev-lang/perl )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	theme-manager? (
+		|| (
+			( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+			dev-lang/mono[-minimal]
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	if use theme-manager ; then
+		mono-env_pkg_setup
+		export XDG_CACHE_HOME="${T}/.cache"
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dwith-gtk="$(usex gtk true false)"
+		-Dwith-text="$(usex gtk false true)"
+		-Dwith-ssl="$(usex ssl true false)"
+		-Dwith-plugin=true
+		-Dwith-dbus="$(usex dbus true false)"
+		-Dwith-libproxy="$(usex libproxy true false)"
+		-Dwith-libnotify="$(usex libnotify true false)"
+		-Dwith-libcanberra="$(usex libcanberra true false)"
+		-Dwith-theme-manager="$(usex theme-manager true false)"
+		-Ddbus-service-use-appid=false
+		-Dwith-checksum="$(usex plugin-checksum true false)"
+		-Dwith-fishlim="$(usex plugin-fishlim true false)"
+		-Dwith-lua="$(usex lua lua false)"
+		-Dwith-perl="$(usex perl true false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	dodoc readme.md
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	else
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	fi
+
+	if use theme-manager ; then
+		elog "Themes are available at:"
+		elog "  https://hexchat.github.io/themes.html"
+	fi
+
+	elog
+	elog "optional dependencies:"
+	elog "  media-sound/sox (sound playback if you don't have libcanberra"
+	elog "    enabled)"
+	elog "  x11-plugins/hexchat-javascript (javascript support)"
+	elog "  x11-themes/sound-theme-freedesktop (default BEEP sound,"
+	elog "    needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 2e5d52c8be2c..13d777d04033 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
+
+inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="https://hexchat.github.io/"
@@ -20,21 +21,25 @@ fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
 SLOT="0"
-IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-COMMON_DEPEND="dev-libs/glib:2
-	dbus? ( sys-apps/dbus )
-	gtk? ( x11-libs/gtk+:2 )
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dbus? ( dev-libs/dbus-glib )
+	gtk? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/pango
+	)
 	libcanberra? ( media-libs/libcanberra )
 	libproxy? ( net-libs/libproxy )
 	libnotify? ( x11-libs/libnotify )
 	lua? ( dev-lang/lua:= )
-	nls? ( virtual/libintl )
 	perl? ( dev-lang/perl )
 	plugin-sysinfo? ( sys-apps/pciutils )
 	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/iso-codes )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
@@ -46,18 +51,14 @@ COMMON_DEPEND="dev-libs/glib:2
 		)
 	)"
 
-RDEPEND="${COMMON_DEPEND}
-	spell? ( app-text/enchant )"
-DEPEND="${COMMON_DEPEND}
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="
+	${COMMON_DEPEND}
 	app-arch/xz-utils
+	app-text/iso-codes
+	sys-devel/gettext
 	virtual/pkgconfig
-	dev-util/intltool
-	theme-manager? ( dev-util/monodevelop )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
+"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
@@ -68,33 +69,29 @@ pkg_setup() {
 }
 
 src_configure() {
-	econf \
-		--enable-plugin \
-		$(use_enable nls) \
-		$(use_enable ssl openssl) \
-		$(use_enable gtk gtkfe) \
-		$(use_enable !gtk textfe) \
-		$(use_enable python python "${EPYTHON}") \
-		$(use_enable perl) \
-		$(use_enable plugin-checksum checksum) \
-		$(use_enable plugin-fishlim fishlim) \
-		$(use_enable plugin-sysinfo sysinfo) \
-		$(use_enable dbus) \
-		$(use_enable lua) \
-		$(use_enable libnotify) \
-		$(use_enable libcanberra) \
-		$(use_enable libproxy) \
-		$(use_enable spell isocodes) \
-		$(use_enable debug) \
-		$(use_with theme-manager)
+	local emesonargs=(
+		-Dwith-gtk="$(usex gtk true false)"
+		-Dwith-text="$(usex gtk false true)"
+		-Dwith-ssl="$(usex ssl true false)"
+		-Dwith-plugin=true
+		-Dwith-dbus="$(usex dbus true false)"
+		-Dwith-libproxy="$(usex libproxy true false)"
+		-Dwith-libnotify="$(usex libnotify true false)"
+		-Dwith-libcanberra="$(usex libcanberra true false)"
+		-Dwith-theme-manager="$(usex theme-manager true false)"
+		-Ddbus-service-use-appid=false
+		-Dwith-checksum="$(usex plugin-checksum true false)"
+		-Dwith-fishlim="$(usex plugin-fishlim true false)"
+		-Dwith-lua="$(usex lua lua false)"
+		-Dwith-perl="$(usex perl true false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+	)
+	meson_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		UPDATE_ICON_CACHE=true \
-		UPDATE_MIME_DATABASE=true \
-		UPDATE_DESKTOP_DATABASE=true \
-		install
+	meson_src_install
 	dodoc readme.md
 	find "${D}" -name '*.la' -delete || die
 }
@@ -108,14 +105,14 @@ pkg_preinst() {
 pkg_postinst() {
 	if use gtk ; then
 		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
 	else
 		elog "You have disabled the gtk USE flag. This means you don't have"
 		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
 	fi
 
 	if use theme-manager ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
 		elog "Themes are available at:"
 		elog "  https://hexchat.github.io/themes.html"
 	fi
@@ -132,10 +129,7 @@ pkg_postinst() {
 pkg_postrm() {
 	if use gtk ; then
 		gnome2_icon_cache_update
-	fi
-
-	if use theme-manager ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
 	fi
 }
diff --git a/net-irc/ii/Manifest b/net-irc/ii/Manifest
index 6207863bb12e..8246e171ee1e 100644
--- a/net-irc/ii/Manifest
+++ b/net-irc/ii/Manifest
@@ -1,6 +1,6 @@
 DIST ii-1.7.tar.gz 10174 BLAKE2B 93af2dc182d77dbfca65cbee6c40aedabe9166be7abcb03c87e80e74273dea1e4dd875d86cf0e1dd04b4a10bfcd825ea9a8c109badb72cc877a484bdaea705d9 SHA512 1fa744bc9b4291b5c6c56e023d982aad59001137db6c7682284a2d63e649a32d558adbb85ae3407e312ae5436852b4278c2c522d4ef03f47cf54ea3a1f13ca90
 DIST ii-1.8.tar.gz 12326 BLAKE2B 7ae90d788aaec0a359ce46370f27c0ce62c6f77e8cda61d9d168d0ebd7de927a478b42a591631f2c193f3816b2a1b39cf79607326b073bcbeefe4291e0fb95f6 SHA512 2b41a0611ac76612c9333e8490709ee22d17506f0c5d7e680a0d8f3f8b511bd5b279555cf609c1543aba71948819369a3c306b1168086890aa49c145b7860e17
 EBUILD ii-1.7-r1.ebuild 740 BLAKE2B 2792190b5c90b7cefb8eaa1625c82ab68f5b66545e2a372337fa364c94d16d7a49557e5b0843c1ddba571d5822ec6ec33b2ab11b18d7b4415a2970531a9940c4 SHA512 a4ebf245df4485a7fc9ae75ebfa726b84d924640054a55f6fe79ee5f9224d06ff765033bd89bd4e248242b1afaab0a268f66547f78b9816b54b2cb1df5bb24df
-EBUILD ii-1.8.ebuild 678 BLAKE2B 0e47f78c625fb72afa497779f3b8736f5e3fd9a59da37dddad723719081416b52ba70893a9c473edf5b1b8890f4d1da734a88edc09d12d7763c27b484755b865 SHA512 bbcfce23940913d2cbba027c70d747f4df5641054999dd8fade6ec300fb8bca82791d748ae8fafbbda04bfdee52b8fe10045fbe7053748672e7ee8875206db0d
+EBUILD ii-1.8.ebuild 683 BLAKE2B 4abf1f5f7258cb2593f68610684dcaca05c06e0e5f329fe2b51ca064f08c90adb7a293c5933660195861acff22e4122e4532478e899e73bf79de538fd13cb9dc SHA512 647c5cc8808374c1eb56fa0bc6c5a1721987cae9544ef8696b3b2e6ca94fe2cf0cf1d08d24d9f4e86fde95d7eb0ec9677cfb8fe6c19e2db8fa2d86dfa44b514e
 EBUILD ii-9999.ebuild 653 BLAKE2B bcefb912baa5b9f4484e9ae25db6561e141a7ce10d80cb673d655cfaaa637d90ec087a82943df8040115a9b7b2984bbbbd6a937df8ac89118c7cf8501441ebe4 SHA512 877ad3c2c18a1cf6a3b5c2bb82241ac52fb4a1aaa42e78b3b0167023f3a2c5171fc6a753e1fed7ecac8cac02f9821233c3e97db17391bf87763ba82be8156d84
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ii/ii-1.8.ebuild b/net-irc/ii/ii-1.8.ebuild
index 0a4bb49da753..73c50e70118c 100644
--- a/net-irc/ii/ii-1.8.ebuild
+++ b/net-irc/ii/ii-1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 
 src_prepare() {
 	default
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
 }