gentoo resync : 03.03.2021

3 files changed, 2 insertions, 93 deletions

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 538f2b4207f4..bd8beb7a0b67 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1,5 +1,3 @@
-DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd
 DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5 SHA512 3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74
-EBUILD gthumb-3.10.0.ebuild 2245 BLAKE2B ab309d292e1cecd8afb910fe6963e0452a21117dcfb6394205251eba8298f3814adc0e5cfb6a39e56a1e45ec30e437d6794c736f1cf1ad4d631e8501e8fe4e2b SHA512 2013a04786f36a73583fe61864e117ab3e34e6c86a4b85d7eed019e820d6cc2a661a52e9a5044115a93970e1110f872ab4f2400719130a6c620cdb4e277401b3
-EBUILD gthumb-3.10.2.ebuild 2247 BLAKE2B dc4242733fa9fc7b549adce4b108a45e73386a6c192b2c8f3f49cf2067c8395ff4b0f3158b33947938fddb92e0d8b6fdddb0264d6ae2b048a948eb77c2e0b36e SHA512 152c07ca4316b016770a6a1acec0d2fde4fd835625a156406aee9e7b790ebde16bdc0262510f3aa4f907c4e6dc237df541b452f3539f49885aa7b6b43837863e
+EBUILD gthumb-3.10.2.ebuild 2245 BLAKE2B 28314db4585b015cb840a5518fe88029b3bd5367c4001cad2b30456903bb3c55165e3e2de162159c5a93a7983c534b15a93b70a9155048888d67107db3bc7905 SHA512 794bc6f1e88a4a0d9c3deda091d0dda93ed5cf85c8f21c2d9ee6de0c98846b8002522fac9a6132e857abcf7746b04c7b7a7c3781a7b5b1d120f96402dd787bdf
 MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d
diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.0.ebuild
deleted file mode 100644
index a7ddac9f803c..000000000000
--- a/media-gfx/gthumb/gthumb-3.10.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="Image viewer and browser for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
-
-RDEPEND="
-	>=dev-libs/glib-2.54.0:2
-	>=x11-libs/gtk+-3.16.0:3
-	exif? ( >=media-gfx/exiv2-0.21:= )
-	slideshow? (
-		>=media-libs/clutter-1.12.0:1.0
-		>=media-libs/clutter-gtk-1:1.0 )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-plugins/gst-plugins-gtk:1.0 )
-	raw? ( >=media-libs/libraw-0.14:= )
-	http? ( >=net-libs/libsoup-2.42.0:2.4
-		>=dev-libs/json-glib-0.15.0
-		>=net-libs/webkit-gtk-1.10.0:4 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.11 )
-	cdr? ( >=app-cdr/brasero-3.2.0 )
-	svg? ( >=gnome-base/librsvg-2.34:2 )
-	webp? ( >=media-libs/libwebp-0.2.0:= )
-	lcms? ( >=media-libs/lcms-2.6:2 )
-	colord? ( >=x11-misc/colord-1.3
-		>=media-libs/lcms-2.6:2 )
-
-	sys-libs/zlib
-	virtual/jpeg:0=
-	tiff? ( media-libs/tiff:= )
-	media-libs/libpng:0=
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use exif exiv2)
-		$(meson_use slideshow clutter)
-		$(meson_use gstreamer)
-		-Dlibchamplain=false # Upstream still doesn't seem to consider this ready
-		$(meson_use colord)
-		$(meson_use tiff libtiff)
-		$(meson_use webp libwebp)
-		$(meson_use raw libraw)
-		$(meson_use svg librsvg)
-		$(meson_use gnome-keyring libsecret)
-		$(meson_use http webservices)
-		$(meson_use cdr libbrasero)
-	)
-
-	# colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2
-	if use lcms || use colord; then
-		emesonargs+=( -Dlcms2=true )
-	else
-		emesonargs+=( -Dlcms2=false )
-	fi
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/gthumb/gthumb-3.10.2.ebuild b/media-gfx/gthumb/gthumb-3.10.2.ebuild
index 208e1f2dcd15..aae8425356f4 100644
--- a/media-gfx/gthumb/gthumb-3.10.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
 
 RDEPEND="