gentoo resync : 20.02.2019

3 files changed, 33 insertions, 21 deletions

diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index e7fa72fb13f0..3f5fa7de761b 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,4 +1,4 @@
 DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
-EBUILD claws-mail-3.17.3.ebuild 5858 BLAKE2B e3bec36e2e07a2a136d936fd844e972ff93a53fd4ddbfb56a898d0f311702a6b51fe367fdf62a3d6d0e72a6baef4bbe4738d68da425eae2e40bb2530e2362b4f SHA512 40e41d6a9e6d6a4545e6e2f534e2595ed9ef00b7aa7cccaae5fb2f8da90c8a75ccd3d852967b03da70581fa6347de6df05030904605fee9b5e64eaae1b731386
-EBUILD claws-mail-9999.ebuild 5928 BLAKE2B 51ad0f197647f077234f37861157fcd61476972c0f648c8b88e5ae42f1d44c7dbefc3a9573151daefffcb58b249530b6e8ebd31ee5beab7aae0bb51aa16b64bb SHA512 c6dad312be3febfaadef4048484475291cde4bd62558435530aba166269d05c3b234764ae21582e040a369b9545153ea46c3f5b89da130413b776a8411a69694
+EBUILD claws-mail-3.17.3-r1.ebuild 5888 BLAKE2B 9b1f7c6b621f09ee23469f1d8f88e4d7f07583e6a17bd3861b9b94f5fcdbf7c8c9f8906cfd8ce61f2224fe61db99b379b1fe4ef7ce53581840a368af87803d9c SHA512 80dbb7d5f617f5ba3c2ff03a80ec67778026ba5b6faf5229a27e600eef304485d3baa6ce2449f6450011a7d41010ee2497e52ef8bd9e00cadb9d19fe2dba8415
+EBUILD claws-mail-9999.ebuild 5955 BLAKE2B 90ee83dc50f8b619acee91969c0bb8fd613d1b14689764bf096d07a3a1ea0d4cac6aa18b641f1e36103b02282874a63c9142c0d7858a4d0a94b15cb939253fc0 SHA512 925a3a2bcd42db5c410303de5252ad4c5c532d452827c5aa724dbe178e9fd8bd3c2a26b22d9270d359cedf4a1b0e831c3df7c262e4df641c602e43dac345f5c9
 MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076
diff --git a/mail-client/claws-mail/claws-mail-3.17.3.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
index fcf7a62de7dd..427c3e97bc0a 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
+inherit autotools desktop python-single-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -31,7 +31,12 @@ REQUIRED_USE="libcanberra? ( notification )
 COMMONDEPEND="
 	dev-libs/nettle
 	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
 	>=x11-libs/gtk+-2.24:2
+	x11-libs/libX11
+	x11-libs/pango
 	archive? (
 		app-arch/libarchive
 		>=net-misc/curl-7.9.7
@@ -41,7 +46,10 @@ COMMONDEPEND="
 		>=dev-libs/libical-2.0.0:=
 		>=net-misc/curl-7.9.7
 	)
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
 	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
@@ -96,7 +104,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	eautoreconf
 }
 
@@ -193,7 +201,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
@@ -201,11 +209,9 @@ pkg_postinst() {
 	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
 	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
 	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index c9a2357c18e3..dd62d66a3192 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
+inherit autotools desktop python-single-r1 xdg
 
 DESCRIPTION="An email client (and news reader) based on GTK+"
 HOMEPAGE="https://www.claws-mail.org/"
@@ -31,6 +31,11 @@ REQUIRED_USE="libcanberra? ( notification )
 COMMONDEPEND="
 	dev-libs/nettle
 	net-mail/ytnef
+	sys-libs/zlib:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/libX11
+	x11-libs/pango
 	archive? (
 		app-arch/libarchive
 		>=net-misc/curl-7.9.7
@@ -40,7 +45,10 @@ COMMONDEPEND="
 		>=dev-libs/libical-2.0.0:=
 		>=net-misc/curl-7.9.7
 	)
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
+	dbus? (
+		>=dev-libs/dbus-glib-0.60
+		sys-apps/dbus
+	)
 	gdata? ( >=dev-libs/libgdata-0.17.2 )
 	dillo? ( www-client/dillo )
 	gnutls? ( >=net-libs/gnutls-3.0 )
@@ -97,7 +105,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare
 	eautoreconf
 }
 
@@ -195,7 +203,7 @@ src_install() {
 }
 
 pkg_preinst() {
-	gnome2_icon_savelist
+	xdg_pkg_preinst
 }
 
 pkg_postinst() {
@@ -203,11 +211,9 @@ pkg_postinst() {
 	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
 	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
 	ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }