gentoo resync : 22.01.2019

4 files changed, 111 insertions, 3 deletions

diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 6152d77be595..367d176de9a9 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,3 +1,6 @@
+AUX 3.26.4-support-tracker1.patch 1094 BLAKE2B 224f4052fe379d79ca9fa02dc0d7e19196c5016e6f8e6936f620697d27f063aa421bd37dfa159856fedf0971095bc302f36591788923483729380dc9e754acce SHA512 32c1dcea04be037827d9c6b23ce38e3cb1d7548233f0569c58b87b3dcca25a060933dbbf89d8f2a5bac442c7fde854efc72f27df3e6eed9d0d0ee163a02e1763
 DIST gnome-photos-3.24.6.tar.xz 986200 BLAKE2B 656737326f594958ea1cc956f85e50c7eaebc227491d95342acab9a1fa0e3c5c109efe932cd0465e48ada62beab238e6eef0e01033b145de72a1fb64ce2f3c89 SHA512 47fd858b643fe0bca9a4801d43bd7eb181db08d7e09941a60a134247df97b0e900cd062efef70da5161a9fceb1d33b998b87ad5eca0a5937a10c4e06b908de22
-EBUILD gnome-photos-3.24.6.ebuild 1776 BLAKE2B c4868a2dfe4d4dbbfa7a396ffaf2667844ac63f767162fa4fff975de27aa81cb86b3736f0b9461663a8a311e5e5f9fcce28934cf9e4da9fc8b74f2025810e2c8 SHA512 469751ff495f9a15ada2a680cc6191e5aef9a5e51770075a69578dfbfb1253a2d7e04e0cb5da850f0968e8d3224686f5f354683cd7718262f6f3b3caaee1bc24
+DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
+EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975
+EBUILD gnome-photos-3.26.4.ebuild 2091 BLAKE2B c2ac7aaa7231118d8f1540882cb364446c2d8d4f0156c27edb0b869ff4f6f45b17ded79e9215af3022e3cb8598d7cdd6b9d05f63631fa104ff3d637d77a8e910 SHA512 257385a4c296d47f7d6e38c33720e539b403c5108ca2e736d0f6a4a70a272ec0a09a830593749cb986dcd96103fdc366220d83b4c50edc00fc24e9a0c68108f2
 MISC metadata.xml 320 BLAKE2B b66fb85cefaafccf9575d4f85c017cc07cb55b75d377e8a95bf482b6cb7817f902c5fd3987e08c3d77b604f10710cb6f9820f5e4451e402b186e7714444abf4a SHA512 86c99b12ed97b3f09e9469dcb093e18f844f5b3efb3a3169e62e10fe446075c7839ba7ca00e3537744d3c839522cf5ed2ee33215cd5988466e35d0f4dd739b11
diff --git a/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch b/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch
new file mode 100644
index 000000000000..508b5d3c9a50
--- /dev/null
+++ b/media-gfx/gnome-photos/files/3.26.4-support-tracker1.patch
@@ -0,0 +1,30 @@
+From 7b81db71110e325fc6343ae2582942a9ad038311 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 16 Jan 2019 05:08:25 +0200
+Subject: [PATCH] build: Keep supporting building against tracker-1 too
+
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5965d33d..13196605 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -115,7 +115,12 @@ PKG_CHECK_MODULES(GSETTINGS_DESKTOP_SCHEMAS, [gsettings-desktop-schemas])
+ PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_MIN_VERSION])
+ PKG_CHECK_MODULES(GTK_UNIX_PRINT, [gtk+-unix-print-3.0])
+ PKG_CHECK_MODULES(PNG, [libpng16])
+-PKG_CHECK_MODULES(TRACKER, [tracker-control-2.0 tracker-sparql-2.0])
++tracker_api="1.0"
++m4_foreach([VERSION], [[1.0], [2.0]],
++                      [PKG_CHECK_EXISTS([tracker-control-VERSION tracker-sparql-VERSION],
++                                        [tracker_api="VERSION"])
++                      ])
++PKG_CHECK_MODULES(TRACKER, [tracker-control-$tracker_api tracker-sparql-$tracker_api])
+ 
+ LIBGD_INIT([
+   gtk-hacks
+-- 
+2.17.0
+
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
index d802c9d1eb7b..8b380b9f0ca6 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="
-	>=app-misc/tracker-1:=[miner-fs]
+	app-misc/tracker:0/100[miner-fs]
 	>=dev-libs/glib-2.44:2
 	gnome-base/gsettings-desktop-schemas
 	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
@@ -42,6 +42,7 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-util/desktop-file-utils
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	virtual/pkgconfig
 	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
new file mode 100644
index 000000000000..e2c8b5c05442
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2 python-any-r1 virtualx
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flickr test upnp-av"
+
+# tracker-2 is supported, but we need to pull in tracker-miners for that, which we didn't have in main tree yet
+COMMON_DEPEND="
+	app-misc/tracker:0/100[miner-fs]
+	>=dev-libs/glib-2.44:2
+	gnome-base/gsettings-desktop-schemas
+	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
+	media-libs/babl
+	>=media-libs/gegl-0.3.15:0.3[cairo,jpeg2k,raw]
+	media-libs/gexiv2
+	>=media-libs/grilo-0.3.0:0.3=
+	>=media-libs/libpng-1.6:0=
+	>=net-libs/gnome-online-accounts-3.8:=
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	sci-geosciences/geocode-glib
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22.16:3
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled
+RDEPEND="${COMMON_DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+# app-text/yelp-tools needed for eautoreconf; otherwise probably just itstool
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-support-tracker1.patch # requires eautoreconf
+)
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# XXX: how to deal with rdtscp support, x86intrin
+	gnome2_src_configure \
+		$(use_enable test dogtail)
+}
+
+src_test() {
+	virtx emake check
+}