| 1 |
commit: 905366a8a5a048a968df485223d47dfe1e50778b |
| 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: Wed Nov 25 12:16:01 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905366a8 |
| 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: |
Archives