gentoo resync 08.09.2018

4 files changed, 142 insertions, 3 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ffb74aaa6d0f..6dbaaa5c46b9 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index a55ff6b4fe74..1288d9f91582 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -2,7 +2,9 @@ AUX hexchat-2.12.4-configure.ac.patch 9671 BLAKE2B 0e1391f6a07759167cc64829e8218
 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
+DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
 EBUILD hexchat-2.12.4-r2.ebuild 3400 BLAKE2B 09d73fc326969f64acb81b751e7a67195f4c82a2edaece1b9254ba121696c2305d353d6c4155075df26861650fbd94b22547e6cb0e931fef08a7b89f0a05da0d SHA512 6afb1a4a62a94107f25539af6a5f8f5da90fab8371ea9da7c7cb7e7173fe6e37a5667f0aec38d3478b49e429f94e8c3e47b400933e1a0fefae671dfb8539b7dc
 EBUILD hexchat-2.14.1.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
-EBUILD hexchat-9999.ebuild 3435 BLAKE2B f052fd4f3669d2b6c338d1beba29d1fcfa9c2fbdd6ebf132e7f9b0c671aa7c196d1165647d20ee1ae40dc1c80d9ad73001afff22ad0f572c120d75e7287ae0ce SHA512 e4a263fedce93d34f9bfee8e270c8dca04108ea08272628462124a7e13feb54e038747522cc70b322976da0e599aa79de90478602f4081b7713c0d3ca770b8bb
+EBUILD hexchat-2.14.2.ebuild 3481 BLAKE2B 67fc84a4d1d44a9f905d5f705ca2a930bbc956bc323895e28c889000e9b31361d68e2244f19700d9e950f0bcd550ff533947c73c2732eea39d2770aa61bf523d SHA512 dd80bc450953a283f97eede2d40768ddd9ceedd48aaee2ed8b41a30723b95ef9bd7863870abbfd1ad6f3153086fbbf9778eb62fa8384b5082e234685f9ef868c
+EBUILD hexchat-9999.ebuild 3481 BLAKE2B 67fc84a4d1d44a9f905d5f705ca2a930bbc956bc323895e28c889000e9b31361d68e2244f19700d9e950f0bcd550ff533947c73c2732eea39d2770aa61bf523d SHA512 dd80bc450953a283f97eede2d40768ddd9ceedd48aaee2ed8b41a30723b95ef9bd7863870abbfd1ad6f3153086fbbf9778eb62fa8384b5082e234685f9ef868c
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-2.14.2.ebuild b/net-irc/hexchat/hexchat-2.14.2.ebuild
new file mode 100644
index 000000000000..ee382d60463e
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+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 "${EPREFIX}"/usr/bin/perl false)"
+		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+		-Dwith-appdata=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 b35c166c0a0d..ee382d60463e 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
 
@@ -83,9 +83,10 @@ src_configure() {
 		-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-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
 		-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
 		-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+		-Dwith-appdata=false
 	)
 	meson_src_configure
 }