gentoo resync : 28.04.2019

3 files changed, 2 insertions, 71 deletions

diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 3d379e405716..b8c0b927d856 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,8 +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
 DIST gnome-photos-3.26.4.tar.xz 1101324 BLAKE2B 81e851bdeb39455cad6d4ba99194229507a809c3bd8c9ff0c24992cbbf90001d87f96d1c2b3c3a07101982e6ea169cba0e2249431138e962850f55fffc2c54ec SHA512 0a49b7eb29918ccf87af4211db6ffbb3c55ab40f4eaa1437317fda32de43b3b0c9033397d5b06fbc5012d0fa322a79dafdf46817cfaea57ef2f4df1a975fb489
 DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
-EBUILD gnome-photos-3.24.6.ebuild 1794 BLAKE2B dce8b2a44345c35c19058389cfa48d0e9f4e50f427e7d5406e09515598a13c6569b886cdf8e6effcaa9d87ad2ea693596ab49aaa6d8eb9ac930b28749bc6f1a3 SHA512 0a27e45dbdb2adfa84a8eb389a8342a9fa58f5d98d0142c1ab4817f7c2e5f247b7702968190947ad25db6ed1f7fe3a91be9683c5f57010600a2a890b8ca84975
-EBUILD gnome-photos-3.26.4.ebuild 2062 BLAKE2B a5f08ee546de0a51cbfd74c812c320f22ab9a2c3b131693ade2049ae53cda83b669e945bc557be3c24af4f205020176ce733e75cde78f4ea830fc31920c9707b SHA512 3da683b6f4ffabcbf9420751a2d99f94cd0f8f5960069a3a4cb25d9d9195fd90d8b11d498e3c305a6c36917675fe09934d38705c99bca11e6a2deb3db543fb05
+EBUILD gnome-photos-3.26.4.ebuild 2060 BLAKE2B f5a8f491495c415fb3c0a3adae4e19f28f9c4fd1327cad0a197ac0612dcb6a8650d125db298977e641ef10264942a04968d3b722c97f406a6be86499641115ce SHA512 14d25f1d2f6e95de682c020eef13ab0d79b6246b5e4495a795021545dc49590b3c155ac33fc90bc3bb1add1aa5cac61294aea6080142698b9586cc83c0cbcf66
 EBUILD gnome-photos-3.30.1.ebuild 1951 BLAKE2B 0abd314d897dc1f6ab6fa76ba518e848550018ebd86ec80ac7d546959e3b7dfef3bf9adab9669b949cb6025e054922db032baa32e4f231721d7f990f4c7fcf57 SHA512 b7ed7697606e80043df70668ddd81e2591cffd0574ae8488a4e1ec92b210ceb689a5c12034353500b458c5f2f04cc5666c91bc32032d4f5dac6d7e6e51a43913
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild b/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
deleted file mode 100644
index 8b380b9f0ca6..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.24.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-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"
-
-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.14: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.15: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
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-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
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
index f34fc89fd7ac..fe3c9e781a00 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.26.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="flickr test upnp-av"
 
 COMMON_DEPEND="