flickr support should be optional as, otherwise, it will crash if dependencies are not present at runtime. Drop old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 17 insertions, 39 deletions

diff --git a/net-misc/gnome-online-miners/ChangeLog b/net-misc/gnome-online-miners/ChangeLog
index 912f74f89fe2..b4d2db3bba13 100644
--- a/net-misc/gnome-online-miners/ChangeLog
+++ b/net-misc/gnome-online-miners/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/gnome-online-miners
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/ChangeLog,v 1.21 2015/06/26 09:23:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/ChangeLog,v 1.22 2015/07/13 18:06:57 pacho Exp $
+
+*gnome-online-miners-3.14.3-r1 (13 Jul 2015)
+
+  13 Jul 2015; Pacho Ramos <pacho@gentoo.org>
+  +gnome-online-miners-3.14.3-r1.ebuild, -gnome-online-miners-3.14.1.ebuild,
+  -gnome-online-miners-3.14.2.ebuild, metadata.xml:
+  flickr support should be optional as, otherwise, it will crash if dependencies
+  are not present at runtime. Drop old.
 
   26 Jun 2015; Agostino Sarubbo <ago@gentoo.org>
   gnome-online-miners-3.14.3.ebuild:
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.1.ebuild
deleted file mode 100644
index f11ef5a13cc4..000000000000
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/gnome-online-miners-3.14.1.ebuild,v 1.4 2015/03/15 13:31:22 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Crawls through your online content"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# libgdata[gnome] needed for goa support
-RDEPEND="
-	>=dev-libs/libgdata-0.15.2:0=[gnome]
-	>=dev-libs/glib-2.35.1:2
-	>=net-libs/gnome-online-accounts-3.13.3
-	>=media-libs/grilo-0.2.6:0.2
-	>=net-libs/libgfbgraph-0.2.2:0.2
-	>=net-libs/libzapojit-0.0.2
-	>=app-misc/tracker-1:0=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.14.2.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
index 6439a8069fdf..85d422d3383a 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.14.2.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/gnome-online-miners-3.14.2.ebuild,v 1.1 2015/04/19 15:48:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnome-online-miners/gnome-online-miners-3.14.3-r1.ebuild,v 1.1 2015/07/13 18:06:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE=""
+IUSE="flickr"
 KEYWORDS="~amd64 ~x86"
 
 # libgdata[gnome] needed for goa support
@@ -24,6 +24,7 @@ RDEPEND="
 	>=net-libs/gnome-online-accounts-3.13.3
 	>=net-libs/libgfbgraph-0.2.2:0.2
 	>=net-libs/libzapojit-0.0.2
+	flickr? ( media-plugins/grilo-plugins[flickr] )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -31,9 +32,9 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	gnome2_src_configure \
+		$(use_enable flickr) \
 		--disable-static \
 		--enable-facebook \
-		--enable-flickr \
 		--enable-google \
 		--enable-media-server \
 		--enable-owncloud \
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
index dad9001338dc..fb25ea5891bf 100644
--- a/net-misc/gnome-online-miners/metadata.xml
+++ b/net-misc/gnome-online-miners/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<herd>gnome</herd>
+<use>
+	<flag name="flickr">Enable Flickr support</flag>
+</use>
 </pkgmetadata>