Make gnome-user-share optional, we don't want a hard dependency on prefork apache (bug #508310)

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

4 files changed, 15 insertions, 8 deletions

diff --git a/gnome-base/gnome-extra-apps/ChangeLog b/gnome-base/gnome-extra-apps/ChangeLog
index b77644a6879f..f7e880bf37c3 100644
--- a/gnome-base/gnome-extra-apps/ChangeLog
+++ b/gnome-base/gnome-extra-apps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-extra-apps
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/ChangeLog,v 1.48 2015/06/09 23:36:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/ChangeLog,v 1.49 2015/06/10 01:57:50 tetromino Exp $
+
+  10 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-extra-apps-3.14.0-r1.ebuild, gnome-extra-apps-3.16.0.ebuild,
+  metadata.xml:
+  Make gnome-user-share optional, we don't want a hard dependency on prefork
+  apache (bug #508310)
 
 *gnome-extra-apps-3.16.0 (09 Jun 2015)
 
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-r1.ebuild
index 027d5e643db2..216cd310088d 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-r1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-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/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-r1.ebuild,v 1.7 2015/03/19 21:48:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.14.0-r1.ebuild,v 1.8 2015/06/10 01:57:50 tetromino Exp $
 
 EAPI="5"
 
@@ -8,11 +8,11 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
@@ -30,7 +30,6 @@ RDEPEND="
 	>=gnome-extra/gnome-system-monitor-${PV}
 	>=gnome-extra/gnome-tweak-tool-${PV}
 	>=gnome-extra/gnome-weather-${PV}
-	>=gnome-extra/gnome-user-share-${PV}
 	>=gnome-extra/gucharmap-${PV}:2.90
 	>=gnome-extra/nautilus-sendto-3.8.2
 	>=gnome-extra/sushi-3.12.0
@@ -63,6 +62,7 @@ RDEPEND="
 		>=games-puzzle/lightsoff-${PV}
 		>=games-puzzle/quadrapassel-${PV}
 		>=games-puzzle/swell-foop-${PV} )
+	share? ( >=gnome-extra/gnome-user-share-${PV} )
 	shotwell? ( >=media-gfx/shotwell-0.20 )
 	tracker? (
 		>=app-misc/tracker-1.2
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild
index 946117c7dfa8..96eaeadd2832 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.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/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild,v 1.1 2015/06/09 23:36:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.16.0.ebuild,v 1.2 2015/06/10 01:57:50 tetromino Exp $
 
 EAPI="5"
 
@@ -8,7 +8,7 @@ DESCRIPTION="Sub-meta package for the applications of GNOME 3"
 HOMEPAGE="http://www.gnome.org/"
 LICENSE="metapackage"
 SLOT="3.0"
-IUSE="+games +shotwell +tracker"
+IUSE="+games +share +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
@@ -31,7 +31,6 @@ RDEPEND="
 	>=gnome-extra/gnome-system-monitor-${PV}
 	>=gnome-extra/gnome-tweak-tool-${PV}
 	>=gnome-extra/gnome-weather-${PV}
-	>=gnome-extra/gnome-user-share-3.14
 	>=gnome-extra/gucharmap-${PV}:2.90
 	>=gnome-extra/nautilus-sendto-3.8.2
 	>=gnome-extra/sushi-${PV}
@@ -65,6 +64,7 @@ RDEPEND="
 		>=games-puzzle/lightsoff-${PV}
 		>=games-puzzle/quadrapassel-${PV}
 		>=games-puzzle/swell-foop-${PV} )
+	share? ( >=gnome-extra/gnome-user-share-3.14 )
 	shotwell? ( >=media-gfx/shotwell-0.22 )
 	tracker? (
 		>=app-misc/tracker-1.4
diff --git a/gnome-base/gnome-extra-apps/metadata.xml b/gnome-base/gnome-extra-apps/metadata.xml
index bcdb534cfdb6..502f705dcf13 100644
--- a/gnome-base/gnome-extra-apps/metadata.xml
+++ b/gnome-base/gnome-extra-apps/metadata.xml
@@ -4,6 +4,7 @@
 <herd>gnome</herd>
 <use>
 	<flag name="games">Install Gnome Games</flag>
+	<flag name="share">Install the <pkg>gnome-extra/gnome-user-share</pkg> personal file sharing tool</flag>
 	<flag name="shotwell">Install the <pkg>media-gfx/shotwell</pkg> photo manager</flag>
 	<flag name="tracker">Install the <pkg>app-misc/tracker</pkg> indexer and the GNOME packages that require it</flag>
 </use>