gentoo resync : 18.03.2018

3 files changed, 181 insertions, 50 deletions

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
 }