gentoo resync : 29.12.2022

5 files changed, 2 insertions, 196 deletions

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 2c4dfa4093af..628ff5c3e001 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,9 +1,4 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
-AUX 40.7-fix-build-with-meson-0.61.1.patch 1470 BLAKE2B c7cc58450275777d5367063e92ea2c44b8f05e6e52e740a69e2baa0336a3164d8e2d8ad732248cddd9126a574e1b141e637475ce21a2af8edbc3638f7e066bbe SHA512 eb1007a284214716009356de7e40e9b14418aa76a8a9356feaf74ef2776035037430da49735305f8da885e4749d7add13f7f1bcfea2875543777705f6a69b4a4
-DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a82531ed4bb727c05884154a661a9669426047c6cbbcffdd696c8e4d27721f2ca6249be14b6b4cc62be96bdbfe1b67a4c SHA512 36dc321e83bdf02fb9267d299abeee7f56bb6ee786e09811ba1244a2cee2c3baa0c5bbf3a4d6a6eadfc093d0e792b3511855c7e32caa2f6864face620fa4e7f6
-DIST simple-scan-42.0.tar.xz 1097464 BLAKE2B e2ca253d6fcff9a320312bbf32e50242b64c22a1f89cf99aa705214c5a393f1e76fb14693f508d0bc7231b97d47a5b7fa3fe767527206615df361c9edf5315c6 SHA512 0ccbe82a85fa802f53899df6109be93d58adc5028e6d904da7fc91e25cfd225fff757a7b65380abd7d3e7dfd35feab586bcf5b7504cc46d42822d3b2179bdec0
 DIST simple-scan-42.1.tar.xz 1100296 BLAKE2B 86d22abb8e3f72f19ab856d8e3578f57f71bc8e34ee5bb6e3809f160bc733b7f5753b947cbd12714829b29662087cdb601687cdd9ca1b1cbba41e543ce033ed2 SHA512 c4919ade08a30ee185eb4c62f59777fc360aa35c009f033ee9a9d10e23104fc0c44016509551e3d8de2948a3657c6c4d6c2fbbd955c4c09c6698d6733a55cfce
-EBUILD simple-scan-40.7.ebuild 1512 BLAKE2B 9c59589c74f9227579d0446c58ff3a24bfc7c06647223f63311d67e748df54ea7f59f9db59e7bcc2a4dd8644150961ceb32bc9547837201b9df259aea9c2b5c3 SHA512 f8051b6a45824ec2e0ba3cf9390d8f3937bf755f95d1f0b65c72233bdafd33fe2e08f45b18eeec5deea236bf198fa47dbd5784fc45f4572f49f438b22c567b6c
-EBUILD simple-scan-42.0.ebuild 1469 BLAKE2B 1c1c6d63706893b43d2a1d6c698908613dbb86f3838870d40a66fef5855e4056af6e6c5b3c2394039ca6b6485b1bf9d42a00b56e37b73f0d3bd52c391ab88b85 SHA512 f0c988eb6655f0c3cf4ed0aa6c4864b21c22daffe21b4515a0b70701b2668da6c850754f743d9dca05eeade03dde902e3758e68b569a31486b92051d1528d656
-EBUILD simple-scan-42.1.ebuild 1417 BLAKE2B ecad26a79c0d2f5b87644df1935db293af7e3e7287ca400a3df8f88445690f781dbb683a4d663470559b48810abe2be35e5c1b55802dabb198b814f8018b9c2f SHA512 192ba0903c6d4900b3aac228c7643445d95f51841173b203895e93ed1fde9ff1b6104bd50721876604302212f29910276f2f40d4b1d00d05b82bd1a77b9ec5e7
+EBUILD simple-scan-42.1.ebuild 1413 BLAKE2B cee1df9054a8d58afb0d4269a8dd4ff0c60a775aa1c881ac89ead27989d58df0c89ca0ae617d2023e137d75aa9d0eb304d7d602b00e413ac79745aa26e9cd085 SHA512 1253350677b27878f491c45bd776ec1349143b1d68cd34ffb264602568cc0fc95c21ebf98689a783ea44eee5572a45c44ee3c0a050680e323b04c044bb2e8be7
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch b/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
deleted file mode 100644
index b1a161df922a..000000000000
--- a/media-gfx/simple-scan/files/40.7-fix-build-with-meson-0.61.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
-https://bugs.gentoo.org/831891
-
-From: r-value <i@rvalue.moe>
-Date: Tue, 16 Nov 2021 02:43:11 +0800
-Subject: [PATCH] Remove incorrect i18n.merge_file argument
-
-The positional argument was being silently ignored until meson 0.60.0 where
-it fails with "ERROR: Function does not take positional arguments".
----
- data/meson.build | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index 2b5a0ee3..cf6e4ae1 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
-               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
- meson.add_install_script ('meson_compile_gschema.py')
- 
--i18n.merge_file ('desktop-file',
--                 input: 'simple-scan.desktop.in',
-+i18n.merge_file (input: 'simple-scan.desktop.in',
-                  output: 'simple-scan.desktop',
-                  install: true,
-                  install_dir: join_paths (datadir, 'applications'),
-                  po_dir: '../po',
-                  type: 'desktop')
- 
--i18n.merge_file ('appdata-file',
--                 input: 'simple-scan.appdata.xml.in',
-+i18n.merge_file (input: 'simple-scan.appdata.xml.in',
-                  output: 'simple-scan.appdata.xml',
-                  install: true,
-                  install_dir: join_paths (datadir, 'metainfo'),
--- 
-GitLab
-
diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild
deleted file mode 100644
index 0b752878e6c9..000000000000
--- a/media-gfx/simple-scan/simple-scan-40.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-VALA_MIN_API_VERSION="0.34"
-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 ~arm64 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
-	>=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="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.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-42.0.ebuild b/media-gfx/simple-scan/simple-scan-42.0.ebuild
deleted file mode 100644
index 0b16fcd3aa71..000000000000
--- a/media-gfx/simple-scan/simple-scan-42.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-VALA_MIN_API_VERSION="0.34"
-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 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	>=gui-libs/libhandy-1.5.0:1=
-	>=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="
-	${PYTHON_DEPS}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
-	dev-libs/libgusb[vala]
-	colord? ( x11-misc/colord[vala] )
-"
-
-PATCHES=(
-	# Add control for optional dependencies
-	"${FILESDIR}"/40.0-add-control-optional-deps.patch
-)
-
-src_prepare() {
-	default
-	vala_setup
-	xdg_environment_reset
-}
-
-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-42.1.ebuild b/media-gfx/simple-scan/simple-scan-42.1.ebuild
index 00ffa5ac377e..d24be5225422 100644
--- a/media-gfx/simple-scan/simple-scan-42.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="