gentoo resync : 15.01.2020

3 files changed, 3 insertions, 78 deletions

diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 3c61749610da..a42fb695c9a0 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-photos-3.30.1.tar.xz 1118728 BLAKE2B b3de35fb9c2ae7b731cf76a7b02b689997e3cf063037c49a51dbdf8bb37d9217c9bd5380bc872b984eca4e53c5996eb6370f3acc82a90e56dabe9d47999d5578 SHA512 4fa386c3d93f2b15468601e56bfcbdcc83a9e78ed5c4d0a1e51e9adf4ba313bb69e07aae52404026546dd68584e355c5e5100fc12f95fe078ccf2d6160a0a24b
 DIST gnome-photos-3.32.1.tar.xz 632688 BLAKE2B 9fa7307d1571f6c4e07d6c9700fd947e4a0ff26f8308f7b1871da817e5d80b19861d3c94a1b8ffe0daa820862ad064075641c8eb42ad66134e7c554696448932 SHA512 31a52b93c27ee603ddb314998d663d02c1cfdbc33214d2d9f977f7b66f4fc131a52cd17b274efcfb80f2fb17d7b469157e99a783cbfe76e0b872a2a75363b208
-EBUILD gnome-photos-3.30.1-r1.ebuild 1976 BLAKE2B 943d102726da0a7dc85f9f027e0b426d59039bdf19e492fc5cebedaaa9df99ba7ad8fbe52d670f89172f59d34d1aa59a7b54cfcd95ed09472dbbb22ec4a7bf82 SHA512 bb52b6e8d2675b7eb5390d9e316ae3a68a34fdebde3a6261c9bc445ce8a3a7581a47b5d261285233f502b9dd016805b62bf5695050d097a2d9240b2768d48b21
-EBUILD gnome-photos-3.32.1.ebuild 2303 BLAKE2B 29e853fb84511cbf9da793dbf84df5400a953a725f9e76d1d4aacecce52d39786cc8282f45cd7c83312a9155c4cafec7fc2263ec5c2f632048629b95f067e5ab SHA512 1be09542f8f9e189078968daa14367e9813e112989509fff9d15488b650cd89ecd3483344c5a6098706e9506ed05c4577c357e733bae22f8da9df875849512fb
+EBUILD gnome-photos-3.32.1.ebuild 2299 BLAKE2B 48d413458167c1804b93de5c5f31a994062c171cc25532adab60bc93dcf8cf9a9e2ce921336574c7c116e1dbcafbdbcb78d12e794e4b3f6f3ae8a3c947284256 SHA512 3b3d34b0a1ddb9e97bd2c57fc53427331edc00621449f134d5b7bd1817305085695b1b4d75dbbd13db50e8ad587f10b3d46aa80de12826a1aef4708d67952b23
 MISC metadata.xml 992 BLAKE2B beda29ca65d25e5d68c014fbb70fb539cf17b55d64255d6d74305d710f3979b5156eda764d75992f057416f5eb96af899b988633dd8444fcf22c6a5f73fe9b9b SHA512 3c47be6c01072a0b4845dd42b6d3561d340eb703bd9cb5c727ec24b653ab76eee38e35ba63c4cd71b93514ab0cb8bd75663febeed1901cccedfd30f223e870df
diff --git a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
deleted file mode 100644
index e08ff3b0ea8b..000000000000
--- a/media-gfx/gnome-photos/gnome-photos-3.30.1-r1.ebuild
+++ /dev/null
@@ -1,73 +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-3+ LGPL-2+ CC0-1.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="flickr test upnp-av"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-misc/tracker-2.0:0/2.0
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libdazzle-3.26.0
-	gnome-base/gsettings-desktop-schemas
-	>=dev-libs/libgdata-0.15.2:0=[gnome-online-accounts]
-	media-libs/babl
-	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
-	>=media-libs/gexiv2-0.10.8
-	>=media-libs/grilo-0.3.5: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.32:2
-	>=x11-libs/gtk+-3.22.16:3
-	virtual/jpeg:0
-"
-# 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}
-	dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/glib-utils
-	dev-util/itstool
-	>=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 just itstool
-RDEPEND="${RDEPEND}
-	>=app-misc/tracker-miners-2
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
index 8a814d5bc75a..d70065133cfd 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.32.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg