gentoo resync : 31.05.2021

4 files changed, 3 insertions, 159 deletions

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 8f224005bae4..c84ab278c256 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,7 +1,4 @@
-AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
-DIST simple-scan-3.36.7.tar.xz 914572 BLAKE2B dee363c08b0454bc6a4990fc14831069162f74365549a081421c286658cce130957b91030558d1232c979601be00e955996f702e8bafeeeb30710b89ee3e42c0 SHA512 ff0dd82d0db30dbfacfd8b04d7bcbc0599c1b1b47f845e1176ec7ffce0aa44253735431c2c531ef428dae0cee80818acfbba4fb2514f501623c0c0242aa8a7a2
-DIST simple-scan-40.0.tar.xz 1469740 BLAKE2B 120da2785066abf010b7f5a1dba902f596f28f7b89f667dc00c8117f36b94688ef3d1582bdd47aa93e42d6a4946a71ef1b475e482a660e708e06fbb050741f0d SHA512 978c11b789219cb08a961b1bc1428150d023e823ee1f7fd39a3bee714f0079e25559a918ef98f42a464f8a22f4a93a59893b7b4c054dc28d343479d3fc593d8a
-EBUILD simple-scan-3.36.7.ebuild 1325 BLAKE2B e5a2408a96d33bd695c4c071c6cd449bb6319f3718eeecb2f3813c76280168815ed02fad0ea2c45018500d1abb43d2aa61c7e07cb7964dc2b4549605d63c3425 SHA512 bf91d3186657701c3bdee611373879f86ed02ddcc4697c46528d68536435c09ee21b6cf2b22735131d7032b636cd86be717aeeef25c437ce9b9c38005ef2b361
-EBUILD simple-scan-40.0.ebuild 1448 BLAKE2B 413062a72b35d163c7c99d30687687da6ffadcbf7c22b3497e70ef2311bbdf4035c859649493ffd92d92099f105f2771b68d72474810fcfc2250932904cd8a84 SHA512 5bf293d0e9f8284d5fe75ca1211dccc2651c1560d42646bf8b887ca767c2abeb4a7d47624057d57eea3beb336272c74e8cc7e0cd9d8561a87f4162aa611c72ba
+DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
+EBUILD simple-scan-40.1.ebuild 1444 BLAKE2B 035a45eec8130dad0ea1abf7947b3249f6977d5836b2590bd10478e4220265d8428b12323faa874430e11ffc6759aabcb65a0e7dd852408d88f69d7c964c8cb6 SHA512 4721404d5f5a89286d3113a6e2ebbc2bf82787bc54ad19c3f11042ec44ef780304fd523e484f2353de9a017155695675245c04df33b0c61da8ed3282b55ce832
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
deleted file mode 100644
index 868ef9a76a1a..000000000000
--- a/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 02845c57b2bf1b6170efb57c59db5ea0a2b60091 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 30 May 2018 08:44:18 +0200
-Subject: [PATCH] Add control for optional dependencies
-
----
- meson.build       | 18 ++++++++++++++----
- meson_options.txt |  3 +++
- src/meson.build   | 12 ++++++++----
- 3 files changed, 25 insertions(+), 8 deletions(-)
- create mode 100644 meson_options.txt
-
-diff --git a/meson.build b/meson.build
-index cd2e452..f39ca51 100644
---- a/meson.build
-+++ b/meson.build
-@@ -25,10 +25,20 @@ zlib_dep = dependency ('zlib')
- cairo_dep = dependency ('cairo')
- gdk_pixbuf_dep = dependency ('gdk-pixbuf-2.0')
- gusb_dep = dependency ('gusb', version: '>= 0.2.7')
--colord_dep = dependency ('colord', required: false)
--packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5', required: false)
--webp_dep = dependency ('libwebp', required: false)
--webpmux_dep = dependency ('libwebpmux', required: false)
-+
-+if get_option('colord')
-+    colord_dep = dependency ('colord')
-+endif
-+
-+if get_option('packagekit')
-+    packagekit_dep = dependency ('packagekit-glib2', version: '>= 1.1.5')
-+endif
-+
-+if get_option('webp')
-+    webp_dep = dependency ('libwebp')
-+    webpmux_dep = dependency ('libwebpmux')
-+endif
-+
- sane_dep = dependency ('sane-backends')
- msgfmt = find_program  ('msgfmt')
- itstool = find_program  ('itstool')
-diff --git a/meson_options.txt b/meson_options.txt
-new file mode 100644
-index 0000000..570ecdd
---- /dev/null
-+++ b/meson_options.txt
-@@ -0,0 +1,3 @@
-+option('colord', type: 'boolean', value: false)
-+option('packagekit', type: 'boolean', value: false)
-+option('webp', type: 'boolean', value: false)
-diff --git a/src/meson.build b/src/meson.build
-index 9e40e42..83ca3a9 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,17 +4,21 @@ resources = gnome.compile_resources ('resources', 'simple-scan.gresource.xml',
- 
- vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
- dependencies = [ glib_dep, gtk_dep, zlib_dep, cairo_dep, gdk_pixbuf_dep, gusb_dep, sane_dep ]
--if colord_dep.found ()
-+if get_option('colord')
-     vala_args += [ '-D', 'HAVE_COLORD' ]
-     dependencies += colord_dep
- endif
--if packagekit_dep.found ()
-+if get_option('packagekit')
-     vala_args += [ '-D', 'HAVE_PACKAGEKIT' ]
-     dependencies += packagekit_dep
- endif
--if webp_dep.found () and (not colord_dep.found () or webpmux_dep.found ()) # Webpmux only required if colord
-+if get_option('webp')
-     vala_args += [ '-D', 'HAVE_WEBP' ]
--    dependencies += [ webp_dep, webpmux_dep ]
-+    dependencies += [ webp_dep ]
-+    # Webpmux only required if colord
-+    if get_option('colord')
-+        dependencies += [ webpmux_dep ]
-+    endif
- endif
- 
- simple_scan = executable ('simple-scan',
--- 
-2.17.0
-
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
deleted file mode 100644
index 69bdf0601327..000000000000
--- a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.22:3
-	>=sys-libs/zlib-1.2.3.1:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/libgusb-0.2.7
-	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
-	webp? ( media-libs/libwebp )
-	>=media-gfx/sane-backends-1.0.20:=
-
-	virtual/jpeg:0=
-"
-# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
-RDEPEND="${DEPEND}
-	x11-misc/xdg-utils
-"
-BDEPEND="
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use colord)
-		-Dpackagekit=false
-		$(meson_use webp)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-gfx/simple-scan/simple-scan-40.0.ebuild b/media-gfx/simple-scan/simple-scan-40.1.ebuild
index 05268ac37b55..edb7364a65fc 100644
--- a/media-gfx/simple-scan/simple-scan-40.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="