Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 26 Nov 2015 10:53:55
Message-Id: 1448535160.3b43b789b0c8685169e04eef87e5c56fe6067e5f.eva@gentoo
1 commit: 3b43b789b0c8685169e04eef87e5c56fe6067e5f
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 25 12:15:51 2015 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 26 10:52:40 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b43b789
7
8 xdg.eclass: break dependency loop due to XDG tools using glib
9
10 eclass/xdg.eclass | 3 +++
11 1 file changed, 3 insertions(+)
12
13 diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
14 index 2ad0ada..9f10932 100644
15 --- a/eclass/xdg.eclass
16 +++ b/eclass/xdg.eclass
17 @@ -21,10 +21,13 @@ case "${EAPI:-0}" in
18 *) die "EAPI=${EAPI} is not supported" ;;
19 esac
20
21 +# Avoid dependency loop as both depend on glib-2
22 +if [[ ${CATEGORY}/${P} != dev-libs/glib-2.* ]] ; then
23 DEPEND="
24 dev-util/desktop-file-utils
25 x11-misc/shared-mime-info
26 "
27 +fi
28
29 # @FUNCTION: xdg_src_prepare
30 # @DESCRIPTION: