gentoo resync : 25.11.2020

4 files changed, 27 insertions, 14 deletions

diff --git a/xfce-extra/tumbler/Manifest b/xfce-extra/tumbler/Manifest
index a6021dfd6bb2..a541ffa97378 100644
--- a/xfce-extra/tumbler/Manifest
+++ b/xfce-extra/tumbler/Manifest
@@ -1,7 +1,7 @@
-DIST tumbler-0.2.8.tar.bz2 591099 BLAKE2B 50cb9a0e8859e2f092356fd25a3ca68400b615bfabacce18f98660d761ad1e6723e075d651e99b99a1ca5209b0f6aa769acc05ecedab6ddcef5a33622f690087 SHA512 cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb
 DIST tumbler-0.2.9.tar.bz2 557794 BLAKE2B 564b0d91489ee617799749db13085301f8b7195736ee01cd44d1e4bee7130a34235deaaac973f9be902b63eab46c69a5a277872204f53067d15645556f00dd42 SHA512 df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f
 DIST tumbler-0.3.0.tar.bz2 559424 BLAKE2B e9f9674a5fb3d9acba6435e9a5d1eada27269c24c395211a71dc3c3d751aa20f82ee154b5ebb36c2aecf34710e975b9167277e25cf8b210e8d4014e429a0d944 SHA512 e216a9c8c659457c6e6dbb40d95cd9a34d64d204fea9523d0a66f1c331108f6e01fb83d668b99eed73ed26579ae3a717cd3215ddceaebfff888d942ecb18469b
-EBUILD tumbler-0.2.8.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
+DIST tumbler-0.3.1.tar.bz2 559835 BLAKE2B 69f0c1d904b908fcef5ef42388600b8371b37e885ca38bdcdacbc5fefabec2fd49a8aba737832621f8942e788f5c52eb5da0acdd66cbe18f452b706df0d9fd9f SHA512 42bfe9b10411f07e8c9aca40ba8d1829f677fdb65d1b2612a7345f7f467d5a02761fa758359ac3c2eb1e1622bb9f659787cdd21dc2b711424ff64025f08ea375
 EBUILD tumbler-0.2.9.ebuild 1519 BLAKE2B a81a65908ada232820909bcb584c7cea3bf3beaa19dac3c30cea459474f72605416949e9c81ea8b7edc86a1eb75f17ea8d48f9d95a8159d7aeb8c2cf59ab7000 SHA512 f22ac81f25795bd3e4ed679673b0544d6c814a5a60a2a8d5ac117e12a471b534aaf09bddf590c2d45dda9fec617f818bee34c136d5c2a889d101468fcd175658
-EBUILD tumbler-0.3.0.ebuild 1524 BLAKE2B 22d72c4e19041a9988d598affe7fff7a1da31ecfe2a0d84ef4db66f2a39cbed8c8745a6969c6d122d0fbcb9b3592f9268ec2c6b633751eeb713eeaf52e6f8681 SHA512 362c657c97c298adf6d7937be96634fa96f38f7eeb12123e03afcca858a378a31adc18b7248fcd06c2f76515e3118275c2fc1d0d9488bf36c9a6d0e6f10ab71a
-MISC metadata.xml 368 BLAKE2B c50d2774a8ecb50f7eaf2436c89508d6b7b06d22b02be9e33329a152032ba500bc54e132280b3fef166ad824be432a75514a859c2da208bf2a19b69288809b79 SHA512 5adf546b54a71ff52292602144a8d459db2984115a88c893725d2101d2ef851ac855cee078dbf492f6a3b0c01980596acb1c2afca09fd68cbd2b1940ea06bbd3
+EBUILD tumbler-0.3.0-r1.ebuild 1495 BLAKE2B a78df57b5eef7d3098999d0b18285b323ebe9e3edf20d10d91247418d8ce35e13ec1ea4facf6105a293fd208e634b45e9476b9e0766e221b997e8950514f34b3 SHA512 b9760851b1e7a6387080ed1ddb79c7a852cdcb850ca6918d5131abacd95992721d6a76e0946517a884cc7ea61294ce6716feef5a2e13c3d89a9c859fb450f8cf
+EBUILD tumbler-0.3.1.ebuild 1671 BLAKE2B cbc36b8a491aa9f5c5f549d73ad4c3557d10fe3830b4430969eefee754d3ab7811e5c84886446a85718ae3ecc79747d331dbd6990f78bb01d703835c19d60b2f SHA512 583a89f62d4131e33f463cc6b17175a62cb232a757f67120dc334f358cd707329a486dad8973de7759bd1af038c85aade346342655e264b828e4a47cf8235d4e
+MISC metadata.xml 469 BLAKE2B d1fbc54e5a48e14e245c99882b0c070086c9a9f353b428dc5bc4cf7f5f00b016e7e3c79760535ea58b6e88b11251a05ec3adbe386990f33db32b4f2f19185890 SHA512 985db7ab2e2cfde51f401b503e880dc47e67726fa9ddb78262d1a5f6c9b13a61b109ba2432c68bcbda8032a97a9ebacb3aecef852ef7622a56290db5d5c91e73
diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-extra/tumbler/metadata.xml
index b06afeaae912..6f7a36157e9d 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-extra/tumbler/metadata.xml
@@ -6,6 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
+    <flag name="epub">Enable support for .epub thumbnailer using <pkg>app-text/libgepub</pkg></flag>
     <flag name="odf">Enable support for .odf thumbnailers by using <pkg>gnome-extra/libgsf</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/xfce-extra/tumbler/tumbler-0.3.0.ebuild b/xfce-extra/tumbler/tumbler-0.3.0-r1.ebuild
index e707d7f720c5..8ab335123ab7 100644
--- a/xfce-extra/tumbler/tumbler-0.3.0.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
 
-COMMON_DEPEND=">=dev-libs/glib-2.42:2
+DEPEND=">=dev-libs/glib-2.42:2
 	media-libs/freetype:2=
 	media-libs/libpng:0=
 	>=sys-apps/dbus-1.6
@@ -27,10 +27,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.42:2
 	odf? ( >=gnome-extra/libgsf-1.14.20:= )
 	pdf? ( >=app-text/poppler-0.12.4[cairo] )
 	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
+RDEPEND="${DEPEND}
 	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	dev-util/gdbus-codegen
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
diff --git a/xfce-extra/tumbler/tumbler-0.2.8.ebuild b/xfce-extra/tumbler/tumbler-0.3.1.ebuild
index 9421282d86ae..f2655096dc20 100644
--- a/xfce-extra/tumbler/tumbler-0.2.8.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.3.1.ebuild
@@ -3,21 +3,24 @@
 
 EAPI=7
 
+inherit xdg-utils
+
 DESCRIPTION="A thumbnail service for Thunar"
 HOMEPAGE="https://docs.xfce.org/xfce/thunar/start"
 SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="curl ffmpeg gstreamer jpeg odf pdf raw"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl epub ffmpeg gstreamer jpeg odf pdf raw"
 
-COMMON_DEPEND=">=dev-libs/glib-2.42:2
+DEPEND=">=dev-libs/glib-2.42:2
 	media-libs/freetype:2=
 	media-libs/libpng:0=
 	>=sys-apps/dbus-1.6
 	>=x11-libs/gdk-pixbuf-2.14:2
 	curl? ( >=net-misc/curl-7.25:= )
+	epub? ( app-text/libgepub )
 	ffmpeg? ( >=media-video/ffmpegthumbnailer-2.0.8:= )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -27,10 +30,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.42:2
 	odf? ( >=gnome-extra/libgsf-1.14.20:= )
 	pdf? ( >=app-text/poppler-0.12.4[cairo] )
 	raw? ( >=media-libs/libopenraw-0.0.8:=[gtk] )"
-RDEPEND="${COMMON_DEPEND}
-	>=xfce-base/thunar-1.4
+RDEPEND="${DEPEND}
 	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
+	dev-util/gdbus-codegen
 	dev-util/gtk-doc-am
 	dev-util/intltool
 	sys-devel/gettext
@@ -39,6 +42,7 @@ DEPEND="${COMMON_DEPEND}
 src_configure() {
 	local myconf=(
 		$(use_enable curl cover-thumbnailer)
+		$(use_enable epub gepub-thumbnailer)
 		$(use_enable jpeg jpeg-thumbnailer)
 		$(use_enable ffmpeg ffmpeg-thumbnailer)
 		$(use_enable gstreamer gstreamer-thumbnailer)
@@ -55,3 +59,11 @@ src_install() {
 
 	find "${D}" -name '*.la' -delete || die
 }
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}