Make shared-mime-info an optional dependency for servers and embedded systems (requested by vapier in bug #511894).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 19 insertions, 9 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 3873069416ec..7b6b3f33d544 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.609 2014/06/01 15:15:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.610 2014/06/03 04:20:36 tetromino Exp $
+
+  03 Jun 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  glib-2.38.2-r1.ebuild, glib-2.40.0.ebuild, metadata.xml:
+  Make shared-mime-info an optional dependency for servers and embedded systems
+  (requested by vapier in bug #511894).
 
   01 Jun 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.0.ebuild:
   Don't build tests if we are not going to run them (#512022 by kulti)
diff --git a/dev-libs/glib/glib-2.38.2-r1.ebuild b/dev-libs/glib/glib-2.38.2-r1.ebuild
index 22a981abc27c..2e31cdac8052 100644
--- a/dev-libs/glib/glib-2.38.2-r1.ebuild
+++ b/dev-libs/glib/glib-2.38.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.11 2014/04/21 10:28:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.38.2-r1.ebuild,v 1.12 2014/06/03 04:20:36 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
+IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
@@ -56,8 +56,9 @@ DEPEND="${RDEPEND}
 # gobject-introspection blocker to ensure people don't mix
 # different g-i and glib major versions
 
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	mime? ( x11-misc/shared-mime-info )
+"
 # shared-mime-info needed for gio/xdgmime, bug #409481
 # Earlier versions of gvfs do not work with glib
 
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0.ebuild
index 99a694fb43b3..e9f0ddc839db 100644
--- a/dev-libs/glib/glib-2.40.0.ebuild
+++ b/dev-libs/glib/glib-2.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.2 2014/06/01 15:15:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.3 2014/06/03 04:20:36 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2+"
 SLOT="2"
-IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
+IUSE="debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # FIXME: want libselinux[${MULTILIB_USEDEP}] - bug #480960
@@ -56,8 +56,9 @@ DEPEND="${RDEPEND}
 # gobject-introspection blocker to ensure people don't mix
 # different g-i and glib major versions
 
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	mime? ( x11-misc/shared-mime-info )
+"
 # shared-mime-info needed for gio/xdgmime, bug #409481
 # Earlier versions of gvfs do not work with glib
 
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index ae970d332a9a..4f378f243044 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
+  	<flag name="mime">Pull in shared MIME database that many glib-based
+		applications require at runtime to detect or open files. Warning:
+		do not disable this flag unless installing on a headless server.</flag>
 	<flag name="systemtap">Build support for profiling and tracing using 
 		<pkg>dev-util/systemtap</pkg></flag>
 	<flag name="utils">Install gtester-report utility to generate test