gentoo resync : 30.05.2020

5 files changed, 3 insertions, 147 deletions

diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
index ce99f778f8b8..bbf7f67958db 100644
--- a/media-libs/libinsane/Manifest
+++ b/media-libs/libinsane/Manifest
@@ -1,10 +1,4 @@
 AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
-DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
-DIST libinsane-1.0.2.tar.gz 712366 BLAKE2B 5be68792b3a89718308a180b1ca9383e7aebbd2f4e3420376ffecbc7d9b32d16b2fdcf060760708f8ef8f125c4d4caf2f41c6c15da53506e46302dc4155038be SHA512 d65c3fdcc8f64be473a7ff8078b5c9cbfa65ebbf44184fb76c12b40eedc87742167c8fa720683d83d5d29292664c6e311a2c12f45dff35306f60ac7612e63d97
-DIST libinsane-1.0.3.tar.gz 715603 BLAKE2B f6e97fc62c38a3481675671c5bed90d2c9c9db0ce9bf36e66f49f94726ce708300157484107e16b8e5f5a2c86fdd456418998a4b5566391246eeb213bf95f79f SHA512 2508347554cbcfc122dd8be16e60d7357a2fb7876ee044ba6024a4e564378d3748d1b267bd3b63cb0a2f6f9bb8daf748be72d3901d8f6e36961cf0849ff4ceb4
 DIST libinsane-1.0.4.tar.gz 950729 BLAKE2B c09257646b21421eea6312748284456bd7b6f3eb1b64b831e15ae02b519e13d8bb39e2447186f44c6345190bf5e6a38640d9b95a73cbc899ece7c669c3650760 SHA512 2a042fa55874f108b4b1a2cdb88ce60e771f6789cb5704298ce60c4373b4b60e6461e7cf2a96652e1e06a481c02dc6cf9d6aae12c97ad5ac484de815419af5be
-EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
-EBUILD libinsane-1.0.2.ebuild 907 BLAKE2B c7aaead31e64e3c4803c3984668ee8ebd35623092bb232b55cf3304a001231cc8eb9912b35c23b4b31b507eb0dd186754825f7e989b6610e0ec14772f0a3aa8f SHA512 4bbb9a14eefbbffec2e9a759919cc7c72f65785690b5d7c0ab22a03cff71266ffd4c9434473bd4e9acb7917aeff8cbae9cb8cc331c636eac73d4ca316fca39f0
-EBUILD libinsane-1.0.3.ebuild 928 BLAKE2B dd9554523c3bffa9ca5ea7a8ddbfac667deafe06c1a3a77f466190a27db22338e46f02edc53835eac24d8e8c1448aa6ec4fe7ebbe0cd8e4327d5348e2552a113 SHA512 51ffff6e9c1a33d548842084289ee31a4f8a59f0913e989e7850e50512fefa82b0199c47c18101eddf75545a7635f7a8a9b9297b68f0dc77e2ac507ef4e45391
-EBUILD libinsane-1.0.4.ebuild 928 BLAKE2B 7b2ccef70e9d7e3e5914c6e50b4690d0cff22be5aa8c5008cf76f90043450f115e412a0d3d1308ebcb12fe7d54b59f46fbd9c3a5772e9cbbb3ca455edfc8d19b SHA512 2f74bd9a53f2e622d7c5664252b94f12049c8cd3251d3129cfd5e78ff02feed7218e2bb64e6b34652865d86519ed1dbdd0f34a1038b2210edf83c1e6e8ce46ee
+EBUILD libinsane-1.0.4.ebuild 960 BLAKE2B 6fa16cdc8918b2e3f1617205fe1995188f21082d381be0057bd72e28b90b2c5e82eb3229a84ef1642579e87f374147b6f5b3b860a9f52e2b7728e1fefa66a8e3 SHA512 d62c4504db9a6f0cd58f12a293f4fb4f23d36d9f20c82da9193f50b2a670d3771f6925719727d0d2f1f653a4d955d6837769b3f2570ec72f2a397bf51f067aad
 MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/libinsane-1.0.1.ebuild b/media-libs/libinsane/libinsane-1.0.1.ebuild
deleted file mode 100644
index a2d1169ab994..000000000000
--- a/media-libs/libinsane/libinsane-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-:
-PATCHES=( "${FILESDIR}"/${P}-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.2.ebuild b/media-libs/libinsane/libinsane-1.0.2.ebuild
deleted file mode 100644
index 5fa12b107f72..000000000000
--- a/media-libs/libinsane/libinsane-1.0.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.3.ebuild b/media-libs/libinsane/libinsane-1.0.3.ebuild
deleted file mode 100644
index ee4d9d71875b..000000000000
--- a/media-libs/libinsane/libinsane-1.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit meson vala
-
-DESCRIPTION="Crossplatform access to image scanners"
-HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
-SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gtk-doc test"
-
-RDEPEND="media-gfx/sane-backends"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-util/gtk-doc
-	)
-	test? (
-		dev-util/cunit
-		dev-util/valgrind
-	)"
-
-BDEPEND="dev-util/glib-utils
-	virtual/pkgconfig
-	$(vala_depend)"
-
-# Tests require an operational valgrind
-# https://wiki.gentoo.org/wiki/Debugging
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.0.1-meson_options.patch )
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc doc)
-	)
-	meson_src_configure
-}
diff --git a/media-libs/libinsane/libinsane-1.0.4.ebuild b/media-libs/libinsane/libinsane-1.0.4.ebuild
index 15d9682e6445..bf213a427962 100644
--- a/media-libs/libinsane/libinsane-1.0.4.ebuild
+++ b/media-libs/libinsane/libinsane-1.0.4.ebuild
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc gtk-doc test"
 
-RDEPEND="media-gfx/sane-backends"
+RDEPEND="dev-libs/gobject-introspection
+	media-gfx/sane-backends"
 DEPEND="${RDEPEND}
 	doc? (
 		app-doc/doxygen