gentoo auto-resync : 16:07:2024 - 12:27:58

4 files changed, 2 insertions, 158 deletions

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index ac7dc01a82a0..50e1a17cce1f 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,7 +1,4 @@
-AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 AUX 46.0-add-control-optional-deps.patch 2715 BLAKE2B eb9e97a8bf052b218d414b1378ea075195a5d5222dd93227b445659a5edb2e2283b6934448c0bf13127cfb01b0298d22b259d9159353d95bdcfe80952da2465f SHA512 bad7f4e2722910fa8eec59c61b6fd2302cc6bd0bb31511fed619cb797c559c01a50dbf99a4981be2eda912be027d89d422e4ebc2ed5763cedd8981ebdbb0a257
-DIST simple-scan-44.0.tar.xz 1198824 BLAKE2B 2bc9ea19a99b02d6acdb21036558bd2d42751699a89d41ec4da3336c061ecc7ad249b34ab0b30c6a6fc162fb7f6538859d1c29b2c9a843f2c2a8785dadc8a086 SHA512 8543b687eafec4f2460efa446146b4fe3a0ad469e5dcc5fcd19a02484cbfac5bce80741b488217af44c580720a01577a8e78479a4d2e96307da3de9dcfa467c6
 DIST simple-scan-46.0.tar.xz 1136672 BLAKE2B 0ee2dd5392ed1a888948183e9efbd8943287baad66dd45351cbbb32a9a4c17903415676b3e6e00203d8a3572e90397b51bc23ecec2ad6cfa6597a10ffdd5bcf4 SHA512 f7c4433536f59c71f066cdae51b0de1b0dcf9b8af00f3bedb4c1be281d09f9ce122666ed849bd88de8868042429f14bb7b01409f8a006360ce4285000fd30bdc
-EBUILD simple-scan-44.0.ebuild 1371 BLAKE2B 73e325ad1d13050f6cb8994a651953f621371a11fa326ec90d4df661009819c0f28e61cbe02b3c00a9ba140d374950d78b4bb94b69e462ada1fe56dab236213d SHA512 60b1ecddb04e51f99888e7bd7cc93363054ede33e18a31975545707b1dd800ef77b147e97dfae565e7c39bf982910a025ba3af623f0040b35ff7c361be81855c
-EBUILD simple-scan-46.0.ebuild 1378 BLAKE2B 3d4c893974986c6a5c81c1b7d0a5f03b36b199c96fc532b1f60db5c743bcefbe5ad4eb0daa638b5d07342e740f25396bca6bfe4d1551b4d9e06de226d5b6c399 SHA512 77abab3403d2a6d4c9532c75ec9565e193ff0a56fb138038ec182c0769a25cf8714ee63d86b7fa093aef4e35b94e1a3eca91e9119b42269aad1abd43eb468ccd
+EBUILD simple-scan-46.0.ebuild 1380 BLAKE2B d421fe6684a3b908795357e14e85177a89bc03ab8a492b029e420a87237f0c6a1f76a468ab4cb0abad9564a0ecae578272b0110b53a8e912a19048fc90a00e3a SHA512 e20cca21c88fb21122d30cb96764a74df6c2d136f6bc9760ab01220b83e7db049d2693d10a9c482b4c862bf9bbcfa50511da759c2a27bb90fc6ff1bff1d0d156
 MISC metadata.xml 646 BLAKE2B d894b0b617db9d06a787e5d1c4b8d44dd1bb7c528f1498e9ce6044b7a4e015857eb9e227257abfbdb05e628c18da4e194f3a87750969ebc2735e1715036c596a SHA512 596b4b58bbdc0c82db3f961fb21c65b2af83949195873e37f65f383d8be562e499816a76303f24d82499e4db0f4825e17c0472153f827cfd334167c23cc46df5
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
deleted file mode 100644
index 5ea8f56323fa..000000000000
--- a/media-gfx/simple-scan/files/40.0-add-control-optional-deps.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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-44.0.ebuild b/media-gfx/simple-scan/simple-scan-44.0.ebuild
deleted file mode 100644
index 153058476d65..000000000000
--- a/media-gfx/simple-scan/simple-scan-44.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-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 ~riscv x86"
-IUSE="colord webp"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	>=gui-libs/libhandy-1.6.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
-"
-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-46.0.ebuild b/media-gfx/simple-scan/simple-scan-46.0.ebuild
index 58f4ebe759f8..8476bab6e786 100644
--- a/media-gfx/simple-scan/simple-scan-46.0.ebuild
+++ b/media-gfx/simple-scan/simple-scan-46.0.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	gui-libs/libhandy:1[vala]
+	gui-libs/libadwaita:1[vala]
 	dev-libs/libgusb[vala]
 	colord? ( x11-misc/colord[vala] )
 "