gentoo resync : 28.04.2021

4 files changed, 95 insertions, 8 deletions

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 5aee0fa28219..8f224005bae4 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,6 +1,7 @@
 AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08
-DIST simple-scan-3.36.4.tar.xz 914688 BLAKE2B ae972cf6b5085d0e79fdfa9250aed655051b97239988b410e175b3058dda3ed5dc19b6574c015dd9a7afcbefd4d05cce6120b3648c061ff1e52043f866769a62 SHA512 780eeabd9593f14b2b04b9474bb1faebe3a32a7fd7e6b067c144fe44ad9b880f307bf80a8a925fb2549ca0b8172357c9a393146dfabd4b68bfc4396c32de4fa8
+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
-EBUILD simple-scan-3.36.4.ebuild 1325 BLAKE2B d7a8eb204425d66cd2fb1aaad25a91a8d8c2ae153066f1a828bdd416c37d204f747119cb252e7f778d05be51fef3ea290e737bfcbc1f7c78e994ac9b933890d9 SHA512 6d211475e250bcaa86eb452669062a5727cfcc6285927b6ba61cba7c68e07a0c9d1dd826c5b2b9b43cc7861e21af090750641aaf53a8f97b4298fbad19a00e62
-EBUILD simple-scan-3.36.7.ebuild 1328 BLAKE2B 48f73d77aec818cd87b713512bca9e8bccf13a4eadc785f0bba38e0c975de6084d936d2a9dd371c62061cc6ce8f5b9c728b892767481cd27587ea77a27ce7390 SHA512 72ae614c26f849c5ad16e470ec1d4188fb3988786db9956d26d9339afd8f8fbd69531fd3763268d5d56c2a8ae353ab0fc5dee94407a56a8069cd5d0a3bb34400
+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
 MISC metadata.xml 616 BLAKE2B 576d986402f8cc708eae60f661640808751747c764d5fe729dd014f33758e0b484a2b80a214d9a3d1ed4bce7e455e34803a62048240e5de8e203184446cdc0df SHA512 6377cb9c20b1ce2db22ba959d386e4389939b72503d87da956d659144b8a6f8b521abdd19dd4c82ac0cb32e260ce6633b75136a353f63b86593f5e1f12394d47
diff --git a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
new file mode 100644
index 000000000000..5ea8f56323fa
--- /dev/null
+++ b/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
@@ -0,0 +1,82 @@
+From a5f01beb41a81f483d90eb4dd785822a8615f65f Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 30 May 2018 08:44:18 +0200
+Subject: [PATCH] build: 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 1e1522c..45d7ed7 100644
+--- a/meson.build
++++ b/meson.build
+@@ -34,10 +34,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 3f699eb..0c8965e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,16 +1,20 @@
+ vala_args = [ '--pkg=posix', '--vapidir=' + meson.current_source_dir () ]
+ dependencies = [ glib_dep, gtk_dep, libhandy_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.26.3
+
diff --git a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
index e1a51a707fde..69bdf0601327 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.36.7.ebuild
@@ -10,7 +10,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="
diff --git a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild b/media-gfx/simple-scan/simple-scan-40.0.ebuild
index ef472faa37e6..05268ac37b55 100644
--- a/media-gfx/simple-scan/simple-scan-3.36.4.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.0.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.34"
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson python-any-r1 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"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="colord webp"
 
 DEPEND="
 	>=dev-libs/glib-2.38:2
 	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
 	>=sys-libs/zlib-1.2.3.1:=
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
@@ -31,18 +33,20 @@ RDEPEND="${DEPEND}
 	x11-misc/xdg-utils
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	$(vala_depend)
 	dev-libs/libxml2:2
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	gui-libs/libhandy[vala]
 	dev-libs/libgusb[vala]
 	colord? ( x11-misc/colord[vala] )
 "
 
 PATCHES=(
 	# Add control for optional dependencies
-	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
 )
 
 src_prepare() {