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

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 35 insertions, 16 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/Manifest b/gnome-base/gnome-extra-apps/Manifest
index 9de64b104e0a..684930edcf2f 100644
--- a/gnome-base/gnome-extra-apps/Manifest
+++ b/gnome-base/gnome-extra-apps/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD gnome-extra-apps-3.14.0-r1.ebuild 2279 SHA256 84e581f7de7415b168ec9738bb58f3795e05ce721002a5b5fc61188f44568433 SHA512 9d5d8e059e990bdfbcd29355b720148f6f338788b62ce604f082e7402d42667aa851b658d2f8156071fc49c13785915ca160853a8fceb3f37c055de2dfa2a19b WHIRLPOOL 20b03d1c5b07b0b2d35ceadfb907ea6d10d0fca764aa1da72eed587abdb0f56c230f1d9e6a15dc73541fa3fd96d1dfdbaba3069ea0b357a3d281760eedf812a9
-EBUILD gnome-extra-apps-3.16.0.ebuild 2342 SHA256 c5fabbb3f06e453f9aa1a89ad164702e6f719a863c8e19de38cda84c76bfb704 SHA512 ce13f038687bbd8da581048bc33e4124faba8404330d62e44488244db35539fa6b2e98bfbb8c4864ef66429428b3fe6b6e699c324d3eda4377c23fd1daeb7562 WHIRLPOOL ac175dd8beed1f23fe5687ef8c50a0d12b1e0175a45ed8515571ac113f932f22381a26609184a7d2e205830522cbaac3dd1ed493b89cf1b18e77d8ae7412c271
-MISC ChangeLog 7145 SHA256 08879f065e30252b009b8e7619fa6b1f7a3cbe4b636dc9d3e1054d0f522953b3 SHA512 dc7a603310c782b4372f54134fc1837664bf35708035db7f5cc692ef6aa5ddaddd0efd77ee4f5d44fa78479fa6cf13d5a02deaccf49788cd253b2e843ef682d6 WHIRLPOOL 02b8ea897102ba22ebe0a5568271fab8549e7d75a505e671a3e6fd17fdc7083d1a26d9ae37c7b0f764331cbc3c478ccc0c4608081b7399548b875c3468b6b972
-MISC metadata.xml 420 SHA256 df1221466b2b6ae078d1db38fe8cffde13ea386663fe5bb060f1180a98d0f9f8 SHA512 229d02362919470d8f4150c18ee63e53c972831165af29665f1e079c90f0e95e2e98fdc0172604f4a9809f70d1e1ce60f8f2a37d657d36585facb0a8a8d060b5 WHIRLPOOL 2520770aa038e2358f10c82f6383f91ff506cda6065436dd8432964b1df31ed9652e571375445b169cf631684e9780bdf156197dfeec9c9b9f0bd4ac002dc797
+EBUILD gnome-extra-apps-3.14.0-r1.ebuild 2303 SHA256 2f532d4aa8772c256eb835544db83869c072f833bdb08fb1032c9eb223ea9815 SHA512 7da7fa032491ced23f61e2058bb730e1d015a83a66c84547860446869dbdb510211b631365da60a5cfb5711b19f13f4b4e716e266c2527bd841cb9dec99464fa WHIRLPOOL 6fd9b6c4fb7772465411e3192196f195dc072a8a713d5edc6b0e2d89e480a1058deaec25729d3d3265d13c05749eac630a89fd67b4366286e22e4fcf2cdb4725
+EBUILD gnome-extra-apps-3.16.0.ebuild 2366 SHA256 e1d42bcf07f8e082b3093fd0808ea81ed179eba77d30a3569006b44ce0be3ce1 SHA512 b28d8f05845bc58b985f16d2556f6571a05bb1d8deabfdf493df7febe42047e354c217f7ff62fae9914b5ef84f5369f9fa94438da87277f96d0717e0ce28a4b0 WHIRLPOOL d951be1744d67cc0806dc0ae05c84895b28edfa29d98c48f034962a12a92c7b03268d3f676f16efeb0a0e33952c9587c4e300cd137da059d87b3cb30f92fef33
+MISC ChangeLog 7396 SHA256 ed9bd7029087aae3ce32b6b7938e73fe842b9aa7c8c59efb273ed413408fa657 SHA512 c12fb4338e2f4fde232a32cd6373baa5132145209dea88860038ec296877509017dc45066309800b29ca688f589b4aabe837534827fdf4db931340785b8d1157 WHIRLPOOL 332ca00575893c5f6fb3d9a16c043c9235e3da6e1f9156fe30fff1f3024aeb05c4ae81cae6c11d3ba87b1761d4de381d3a940542953dab220cc1cc3e042464dc
+MISC metadata.xml 526 SHA256 db1c2f57f5c31039dd64a28782a2aaeeb9662c07e1f7d6dc3bfce6a16abad936 SHA512 bc1efffaa1023c1f17ad74738e98a1bd8a93b7bf6d7d0f51e09b40090261a401edaf361c2a8020169eea264860cc4259daeb07e24c2f6122cba2d4c792b54d5d WHIRLPOOL 0978d9e4fea2aede05edc1b7212107e1b5caf829303169eb435d4dae1d7651ba29d91eb7aaf8f2204e73ab0313c22177e451d94b02cf21e907a591725e2294f1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlV3eGsACgkQ1fmVwcYIWAY7ZACeLsyS1t+VNPn07Hzu/1yMm6L9
-bvIAn3YczSaPh0OuJmFN6nSbb48sFhsW
-=1UXJ
+iQJ8BAEBCABmBQJVd5mfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNXHoP/0sBeOawUpT7GwIlFwWuH3fH
+NRQtu2s4vYIHt/3eIHQgW/Xhyt613mAA0l4jdzWAxI6td8IMY+28SLhmqAa/zROe
+ipNJUlL6M3Dx0PfPCHrnWQ4VIEIrGscgAh3yaNDVcXBrSOnZa0YVkN2qQhW4RrJS
+Yws2D+4Hlrns6kQoLO6bSeAIoXiUUUDTbL8QqPAYzhBp8oaK4ZWfQz94aFNiOyyb
+mC17uSE6sV1aIhhFhWvr/zwtaCVj1ryfTLIGPDtRIRyILU/hRgzyZibbAiBN8Jx8
+NE2SBSRHFI6v+spGU4Zh8mcocv3XCYVNyp/GRxUv+yth+QwgZbwSttfi+mqfPfyT
+4sSpJ+OhCsyTKDXSZpT4pBYFkfjndmTBqjEm3vnyekoCdhnmXZtjkQYPaouZDMAM
+JbQEoD4BWdCV08SvjAGDrQPq0ZcazQGNWGQ09gEp0zrVsBAkUCYAWUGlhBaJgalm
+eV71Maa7qcQtkdwuwaE/EUMhQete8H+SaBKKf6KDkmi0xrrzk8q6ck0NbsveVj4q
+KpXBaTS7cOw851zbzoCC0nbJOzkv5xx8I0lOijTsWdcT6FHSIOOM78WIdSVDGAR/
+NKGidrWQWsTP8/Qmuyw8wjOV6yULKeow4cyF8VchHWZEwYFqoEVcn/fEjgOlkczk
+ryPpy1wZjipJCpc10g8h
+=xEUd
 -----END PGP SIGNATURE-----
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>