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

["Mart Raudsepp" <leio@gentoo.org>]

commit:     1037bbc547ae7b779503f4cbfae592e53c43d73e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 19:52:36 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 20:17:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1037bbc5

media-gfx/simple-scan: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 media-gfx/simple-scan/Manifest                     |  2 -
 .../simple-scan-3.32.2-unasigned-variable.patch    | 39 ------------
 media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild  | 74 ----------------------
 media-gfx/simple-scan/simple-scan-3.32.2.ebuild    | 74 ----------------------
 4 files changed, 189 deletions(-)

diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 90d5c5d4030..82db67e594f 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,3 +1 @@
-DIST simple-scan-3.32.2.1.tar.xz 790848 BLAKE2B ded17193c29698a4e07e3d82689fbf84babceb36b2dedb09da5e81ed35399084d6db5b448d3bed56af559a6dc9c8708b4cda1730a248a094e005755b7dd49e95 SHA512 c49620c4be4289b18c792e35a01494a56a28b46e4f246a4c58203cf86cd34a1aa8f42738ef8b50ae6e99150630ec60f999b2000a8ee9674abc4f307db4c6c0cb
-DIST simple-scan-3.32.2.tar.xz 790800 BLAKE2B 98e502cbc280285dbe20a0c843d5f8d8b38707e973f2ba6aba2ccef9d739165371f5f30d7d6658853c5a6a280ba2919a98acd02b4757b4e881f96d5a7b53449b SHA512 10322ae72461efe43a4e230443c3aca24aff6f0cab07750c6eab9ebb718889e51d8c77ff722c337f333a8952ac84f69d03ad88eedfd4432ef11f7c7493170e14
 DIST simple-scan-3.34.4.tar.xz 795228 BLAKE2B b6f185bfbc1954ae2573fd1dcfa54f67e26290654c1019bfd34c229235e27cfc1eb40de0e6d5249f97b73c57745e1133fbd6fd1c3f9bdedb795b61068d5ed25d SHA512 b16b653e0a8ce399ecbdb88c4663d7780793518809eb73681c9c6281b9cde784167090c41720b21c184b9fdece28b07ba61fe8a97f10d792cc7326a458741ba4

diff --git a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch b/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch
deleted file mode 100644
index 9ba4aa72134..00000000000
--- a/media-gfx/simple-scan/files/simple-scan-3.32.2-unasigned-variable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 47d3532459863e3b0bc1c7fd3a200f612863c814 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 14 Sep 2019 20:03:47 +0200
-Subject: [PATCH] libwepmix: Fix use of possibly unassigned local variable
- 'data'
-
----
- src/libwebpmux.vapi | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/libwebpmux.vapi b/src/libwebpmux.vapi
-index f2461a2..42d2886 100644
---- a/src/libwebpmux.vapi
-+++ b/src/libwebpmux.vapi
-@@ -61,9 +61,7 @@ namespace WebP
-         [CCode (cname = "vala_set_image")]
-         public MuxError set_image (uint8[] bitstream, bool copy_data)
-         {
--                Data data;
--                data.bytes = bitstream;
--                data.size = bitstream.length;
-+                Data data = { bitstream, bitstream.length };
-                 return _set_image (data, copy_data);
-         }
- 
-@@ -89,9 +87,7 @@ namespace WebP
-         public MuxError set_chunk (string fourcc, uint8[] chunk_data, bool copy_data)
-         requires (fourcc.length == 4)
-         {
--            Data data;
--            data.bytes = chunk_data;
--            data.size = chunk_data.length;
-+            Data data = { chunk_data ,chunk_data.length };
-             return _set_chunk ((uchar[]) fourcc, data, copy_data);
-         }
- 
--- 
-2.22.0
-

diff --git a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
deleted file mode 100644
index a353c280205..00000000000
--- a/media-gfx/simple-scan/simple-scan-3.32.2.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.34"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~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.8
-	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
-	# libwepmix: Fix use of possibly unassigned local variable 'data'
-	# (from 3.34 branch)
-	"${FILESDIR}"/${PN}-3.32.2-unasigned-variable.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-3.32.2.ebuild b/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
deleted file mode 100644
index 79bbc6ac4fd..00000000000
--- a/media-gfx/simple-scan/simple-scan-3.32.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.34"
-
-inherit gnome.org gnome2-utils meson vala xdg
-
-DESCRIPTION="Simple document scanning utility"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 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.8
-	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
-	# libwepmix: Fix use of possibly unassigned local variable 'data'
-	# (from 3.34 branch)
-	"${FILESDIR}"/${PN}-3.32.2-unasigned-variable.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
-}