[gentoo-commits] repo/gentoo:master commit in: media-gfx/simple-scan/files/, media-gfx/simple-scan/

[Matt Turner]

commit:     76042de2e4d0cc85a48524e9564a0ba335df327c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 21:00:51 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 21:09:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76042de2

media-gfx/simple-scan: Version bump to 40.0

Closes: https://bugs.gentoo.org/782772
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-gfx/simple-scan/Manifest                     |  1 +
 .../files/40.0-add-control-optional-deps.patch     | 82 ++++++++++++++++++++++
 media-gfx/simple-scan/simple-scan-40.0.ebuild      | 73 +++++++++++++++++++
 3 files changed, 156 insertions(+)

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 07e955eb0c0..e4df169d49b 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1 +1,2 @@
 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

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 00000000000..5ea8f56323f
--- /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@g.o>
+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-40.0.ebuild b/media-gfx/simple-scan/simple-scan-40.0.ebuild
new file mode 100644
index 00000000000..c3715ab5f48
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-40.0.ebuild
@@ -0,0 +1,73 @@
+# 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 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"
+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
+	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() {
+	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
+}