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

[Gilles Dartiguelongue]

commit:     38ed0906504f6ff0400e236c06af3ff2a103af2c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 07:05:14 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed May 30 07:06:54 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=38ed0906

media-gfx/simple-scan: 3.24.1 → 3.26.3

GUI redesign to match more closely Gnome 3 application style. Add
support for continuous scanning. Improve selection of algorithm for
compressing PDF.

Package-Manager: Portage-2.3.40, Repoman-2.3.9
Manifest-Sign-Key: 0x5A56C8CD0C13248A

 .../files/3.26-add-control-optional-deps.patch     | 83 ++++++++++++++++++++++
 media-gfx/simple-scan/metadata.xml                 | 20 ++++++
 media-gfx/simple-scan/simple-scan-3.26.3.ebuild    | 57 +++++++++++++++
 3 files changed, 160 insertions(+)

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
new file mode 100644
index 00000000..868ef9a7
--- /dev/null
+++ b/media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch
@@ -0,0 +1,83 @@
+From 02845c57b2bf1b6170efb57c59db5ea0a2b60091 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@g.o>
+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/metadata.xml b/media-gfx/simple-scan/metadata.xml
new file mode 100644
index 00000000..a84032e4
--- /dev/null
+++ b/media-gfx/simple-scan/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@g.o</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		A really easy way to scan both documents and photos. You can crop out
+		the bad parts of a photo and rotate it if it is the wrong way round.
+		You can print your scans, export them to pdf, or save them in a range
+		of image formats.
+	</longdescription>
+	<use>
+		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">simple-scan</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/media-gfx/simple-scan/simple-scan-3.26.3.ebuild b/media-gfx/simple-scan/simple-scan-3.26.3.ebuild
new file mode 100644
index 00000000..65bc8fe8
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.26.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome-meson vala
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://launchpad.net/simple-scan"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="colord webp" # packagekit
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libgusb-0.2.7
+	>=media-gfx/sane-backends-1.0.20:=
+	>=sys-libs/zlib-1.2.3.1:=
+	virtual/jpeg:0=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.12:3
+	x11-libs/gdk-pixbuf:2
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	>=dev-libs/libgusb-0.2.7[vala]
+	colord? ( >=x11-misc/colord-0.1.24:=[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/3.26-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	gnome-meson_src_prepare
+}
+
+src_configure() {
+	gnome-meson_src_configure \
+		-Dpackagekit=false \
+		$(meson_use colord) \
+		$(meson_use webp)
+}