summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2018-12-17 12:25:07 +0100
committerGilles Dartiguelongue <eva@gentoo.org>2018-12-17 13:15:43 +0100
commit2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7 (patch)
treef49da330babb9622540cf613f8949436b29e272d
parentmedia-gfx/gnome-screenshot: 3.22.0 → 3.30.0 (diff)
downloadgentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.tar.gz
gentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.tar.bz2
gentoo-2b40d588b0aad0afca3e1ffe9b7c12af8d667bf7.zip
media-gfx/simple-scan: 3.24.1 → 3.30.2
Switch to meson build system. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-rw-r--r--media-gfx/simple-scan/Manifest1
-rw-r--r--media-gfx/simple-scan/files/3.26-add-control-optional-deps.patch83
-rw-r--r--media-gfx/simple-scan/simple-scan-3.30.2.ebuild71
3 files changed, 155 insertions, 0 deletions
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 0e5d9c5a0c1..5dd27d0330c 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1 +1,2 @@
DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9
+DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6
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 00000000000..868ef9a76a1
--- /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@gentoo.org>
+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/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
new file mode 100644
index 00000000000..4a9b7167aff
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson vala xdg
+
+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
+ >=x11-libs/gtk+-3.22:3
+ >=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="${COMMON_DEPEND}
+ x11-misc/xdg-utils
+"
+DEPEND="${COMMON_DEPEND}
+ $(vala_depend)
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=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
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dpackagekit=false
+ $(meson_use colord)
+ $(meson_use webp)
+ )
+ meson_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+ gnome2_icon_cache_update
+}