From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 19 Mar 2019 11:37:34 +0000
Subject: gentoo resync : 19.03.2019

---
 net-irc/hexchat/Manifest            |  2 +-
 net-irc/hexchat/hexchat-9999.ebuild | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'net-irc/hexchat')

diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 575e2af22759..3aa123f65a74 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -6,5 +6,5 @@ DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a4
 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-2.14.2.ebuild 3499 BLAKE2B d6aa041a676aa54d856115b29fa93a3816092938c3cc7545f53141d6efdb4f508a8725b38433787b95f7f826fe239dfa49dd9c8d3342942c61181169d7e619a8 SHA512 d784848d687a1b469cc701f3fcf889c23c48e1d38915fe31d4fdeb99811451c7c40d1f11ed7d9b1cea6010174f18f14492f4a7f92d81680839f530d312eaab7a
-EBUILD hexchat-9999.ebuild 3499 BLAKE2B d6aa041a676aa54d856115b29fa93a3816092938c3cc7545f53141d6efdb4f508a8725b38433787b95f7f826fe239dfa49dd9c8d3342942c61181169d7e619a8 SHA512 d784848d687a1b469cc701f3fcf889c23c48e1d38915fe31d4fdeb99811451c7c40d1f11ed7d9b1cea6010174f18f14492f4a7f92d81680839f530d312eaab7a
+EBUILD hexchat-9999.ebuild 3305 BLAKE2B c3d9dc45c4c2f0d8d2d0165a6791e3a57f87bf9a62506fa4eeb81753f0348476eaa2784eb2133b349fbaef934d1876e343cc7218bc952cda1780c4be4475300f SHA512 3948f8562ac093a5fc0892e0cbc0f30e57b4d0fa74b6cdf4a2e054a56983006c77399446dc5621ea1a8018a10b9f3ee15beafb3dfb4432feb27eb0b947f64524
 MISC metadata.xml 1270 BLAKE2B e7fa8f9ec799b0448b1b1746dc8e076050cc057a04234dc1aa45e77632d0e466443a3bfe0cc2f537fc1bbba91cbb11117377778336e520255120fed3498cdabe SHA512 bf21e165f0b91ee73edf979e59149723d62e7032a8087ec3ea164c1075bf7d7ebc658d15d44e05f682bef26b85ca24b27143446c9e8cf40dc97a6b29ef3932ea
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index 7ef4db04615b..1b4f2fa60674 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{4,5,6,7} )
 
-inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
+inherit meson mono-env python-single-r1 xdg
 
 DESCRIPTION="Graphical IRC client based on XChat"
 HOMEPAGE="https://hexchat.github.io/"
@@ -24,7 +24,7 @@ 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="
+RDEPEND="
 	dev-libs/glib:2
 	dbus? ( dev-libs/dbus-glib )
 	gtk? (
@@ -51,9 +51,8 @@ COMMON_DEPEND="
 		)
 	)"
 
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	app-arch/xz-utils
 	app-text/iso-codes
@@ -100,15 +99,13 @@ src_install() {
 
 pkg_preinst() {
 	if use gtk ; then
-		gnome2_icon_savelist
+		xdg_pkg_preinst
 	fi
 }
 
 pkg_postinst() {
 	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
+		xdg_pkg_postinst
 	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\"."
@@ -130,8 +127,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
+		xdg_pkg_postrm
 	fi
 }
-- 
cgit v1.2.3