diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-03 04:20:36 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-06-03 04:20:36 +0000 |
commit | f6e9e8fbf312091a957f588389672c2cf68e76b4 (patch) | |
tree | dd83077b552ecf56639b46657ac0a6ec1e1a7165 /dev-libs/glib/glib-2.38.2-r1.ebuild | |
parent | Appears to be incompatible with gnome-bluetooth-3.12. (diff) | |
download | gentoo-2-f6e9e8fbf312091a957f588389672c2cf68e76b4.tar.gz gentoo-2-f6e9e8fbf312091a957f588389672c2cf68e76b4.tar.bz2 gentoo-2-f6e9e8fbf312091a957f588389672c2cf68e76b4.zip |
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)
Diffstat (limited to 'dev-libs/glib/glib-2.38.2-r1.ebuild')
-rw-r--r-- | dev-libs/glib/glib-2.38.2-r1.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
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 |