gentoo resync : 30.04.2018

3 files changed, 1 insertions, 68 deletions

diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 9d0bbf6bf35e..fd71cced0338 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,4 +1,3 @@
 DIST eog-plugins-3.16.6.tar.xz 398836 BLAKE2B fcd3c6dc61ca6d935580caffdf9c941d34265f8caa6cd3d682e0d7679888f6965f64ac30b807c00417e904b4e0eeff1a213a8f6d284c130abe265f9c97fc636b SHA512 e3bff786785ae36a41bc7c5fcb3cf75233595777409f373c4a6597fa6e432f72c7a75608e09ab66e1033ca0d12e3855346d7f7e0c571014b5aaef40184a3383b
 EBUILD eog-plugins-3.16.6-r1.ebuild 1603 BLAKE2B f260b6b3e7f3f2710b5875bede7448dda4e717205d4abc03ff4f8d102cb3c3e6ad3d1d85108f2382f8b2aea984de910228b2b150c1cd7f9b9483264b3124c8d0 SHA512 46bbf6a0236ce8957d28beb82414c6c3bb6b7e7ae0411f1cf295e0aca0bc5296448076e1aec09f0d970217556fcbe0bdee635741db81f6eb4ef4d2423bf9cf51
-EBUILD eog-plugins-3.16.6.ebuild 1681 BLAKE2B bcda004d6f20ba29826c3637f718cdff0ee1895ce0d79dcf743285d9dd7023772580c3f05eea82871c77c2260d16f8c91b01c5a10ceff8b91ccee60f8c9f7b08 SHA512 2b3137f6b4cceee79c705db382f620e203fc7d5625662b8ec5eb1c92c349d3fa85c1bf7dbf428bd5b327af94dc614f44094e15318e0a987f3e332866c902fcf1
-MISC metadata.xml 483 BLAKE2B fc83eeea54c41053a3857d37d763caa1642ae1074bd759f1a01bf85952825289bfeae5ad0c8b63ca0aa58e78b5bfaa2b29c90de393a912fc7aecafb76cf9a726 SHA512 f1b4c8e14547335019aa74506f2c5391783cabe118aa91e8f658117a6151cd53bb1728d36ae63a5c50fe9d548ee6f6b47294ae0c0af43e869de9815cf600afed
+MISC metadata.xml 428 BLAKE2B b10706bb7638538d5ce63c9787e7a1730e01c8383f2d2a093e38184b031933d2b3749241aa2f3254be4c84fac104bb8ec72940cdf8cd5a9f7bc0944541b015c6 SHA512 9684f07846ce7e49ad82843c2b8b7ac5c9d7124bddb07778292d6810162e89a3d41e7ca426f331e4bae6ecfbe53f71409b35418affba6382e874c78b64ed102f
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild
deleted file mode 100644
index e3ed08b382f5..000000000000
--- a/media-gfx/eog-plugins/eog-plugins-3.16.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Eye of GNOME plugins"
-HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="+exif flickr map picasa +python"
-REQUIRED_USE="
-	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libpeas-0.7.4:=
-	>=media-gfx/eog-3.15.90
-	>=x11-libs/gtk+-3.14:3
-	exif? ( >=media-libs/libexif-0.6.16 )
-	flickr? ( media-gfx/postr )
-	map? (
-		media-libs/libchamplain:0.12[gtk]
-		>=media-libs/clutter-1.9.4:1.0
-		>=media-libs/clutter-gtk-1.1.2:1.0 )
-	picasa? ( >=dev-libs/libgdata-0.9.1:= )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/glib-2.32:2[dbus]
-		dev-libs/libpeas:=[gtk,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/gsettings-desktop-schemas
-		media-gfx/eog[introspection]
-		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
-	use exif && plugins="${plugins},exif-display"
-	use flickr && plugins="${plugins},postr"
-	use map && plugins="${plugins},map"
-	use picasa && plugins="${plugins},postasa"
-	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
-	gnome2_src_configure \
-		$(use_enable python) \
-		--with-plugins=${plugins}
-}
diff --git a/media-gfx/eog-plugins/metadata.xml b/media-gfx/eog-plugins/metadata.xml
index 6943c23f1ddd..3319801fe837 100644
--- a/media-gfx/eog-plugins/metadata.xml
+++ b/media-gfx/eog-plugins/metadata.xml
@@ -6,7 +6,6 @@
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
 <use>
-	<flag name="flickr">Enable uploading to Flickr</flag>
 	<flag name="map">Enable world map display using	<pkg>media-libs/libchamplain</pkg></flag>
 	<flag name="picasa">Enable uploading to Google's Picasa Web Albums</flag>
 </use>