summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog7
-rw-r--r--dev-util/meld/meld-3.12.0.ebuild11
2 files changed, 12 insertions, 6 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 98947744604b..411b38c1c42c 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.186 2014/10/04 10:18:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.187 2014/10/05 10:25:09 eva Exp $
+
+ 05 Oct 2014; Gilles Dartiguelongue <eva@gentoo.org> meld-3.12.0.ebuild:
+ Add PYTHON_REQ_USE, xml is used in svn support. Drop PYTHON_USEDEP on glib
+ dependency, it is only there for utilities that are not used here. Add
+ missing dependency on introspection USE flag and cairo.
04 Oct 2014; Pacho Ramos <pacho@gentoo.org> +files/meld-3.12.0-c-locale.patch:
Add forgotten patch (thanks to Gilles for noticing)
diff --git a/dev-util/meld/meld-3.12.0.ebuild b/dev-util/meld/meld-3.12.0.ebuild
index 156a6ba9175b..9bcd868c4495 100644
--- a/dev-util/meld/meld-3.12.0.ebuild
+++ b/dev-util/meld/meld-3.12.0.ebuild
@@ -1,9 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.0.ebuild,v 1.1 2014/10/04 08:30:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.0.ebuild,v 1.2 2014/10/05 10:25:09 eva Exp $
EAPI="5"
GCONF_DEBUG="no"
+PYTHON_REQ_USE="xml"
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
@@ -19,12 +20,12 @@ IUSE=""
RDEPEND="
${PYTHON_DEPS}
- >=dev-libs/glib-2.34.0:2[${PYTHON_USEDEP}]
+ >=dev-libs/glib-2.34:2
dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.8:3[cairo,${PYTHON_USEDEP}]
gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.6.0:3
- >=x11-libs/gtksourceview-3.6.0:3.0
+ >=x11-libs/gtk+-3.6:3[introspection]
+ >=x11-libs/gtksourceview-3.6:3.0[introspection]
x11-themes/hicolor-icon-theme
"
DEPEND="${RDEPEND}