[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-boxes/

[Gilles Dartiguelongue]

commit:     9f74f76a254dbf054a454601730951018e72734f
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  8 16:52:56 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Dec  8 16:54:16 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9f74f76a

gnome-extra/gnome-boxes: 3.26.2 → 3.26.4

Restore support for tracker-1 since upstream allows it. Drop traces of
gnome-boxes-nonfree as it is not required anymore. Clean up
glib-compile-resources requirements after checking gresource files.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 ...me-boxes-3.26.2.ebuild => gnome-boxes-3.26.4.ebuild} | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.26.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
similarity index 88%
rename from gnome-extra/gnome-boxes/gnome-boxes-3.26.2.ebuild
rename to gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
index b4c1c160..95196708 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.26.2.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.26.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,9 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
 
 LICENSE="LGPL-2"
 SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
+IUSE=""
 
 KEYWORDS="~amd64"
 
@@ -41,24 +39,23 @@ RDEPEND="
 	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
 	virtual/libusb:1
 
-	>=app-misc/tracker-2:0=
-
 	>=net-libs/libsoup-2.44:2.4
 
 	sys-fs/mtools
 	>=virtual/libgudev-165:=
 "
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-# libxml2+gdk-pixbuf required for glib-compile-resources
 DEPEND="${RDEPEND}
 	$(vala_depend)
 	app-text/yelp-tools
+	>=app-misc/tracker-1:0=
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	x11-libs/gdk-pixbuf:2
 "
 RDEPEND="${RDEPEND}
-	>=app-misc/tracker-miners-2[iso]
+	|| (
+		>=app-misc/tracker-1[iso(-)]
+		>=app-misc/tracker-miners-2[iso]
+	)
 "
 
 DISABLE_AUTOFORMATTING="yes"