diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-09-04 12:06:31 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-09-04 12:06:31 +0000 |
| commit | 701718d3cfd733accaba15ad8459b7eec727a6b5 (patch) | |
| tree | 067a7a57c1724d6103a1511f34e602cf49700ccb /dev-util/meld | |
| parent | added missing RDEP, fixes Bug 521998 by W.T. King (diff) | |
| download | gentoo-2-701718d3cfd733accaba15ad8459b7eec727a6b5.tar.gz gentoo-2-701718d3cfd733accaba15ad8459b7eec727a6b5.tar.bz2 gentoo-2-701718d3cfd733accaba15ad8459b7eec727a6b5.zip | |
Version bump, drop old
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util/meld')
| -rw-r--r-- | dev-util/meld/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/meld/meld-1.8.6.ebuild (renamed from dev-util/meld/meld-1.8.4.ebuild) | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 33f6c40ec57e..1e303c7d28aa 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # 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.183 2014/07/23 15:16:02 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.184 2014/09/04 12:06:31 pacho Exp $ + +*meld-1.8.6 (04 Sep 2014) + + 04 Sep 2014; Pacho Ramos <pacho@gentoo.org> +meld-1.8.6.ebuild, + -meld-1.8.4.ebuild: + Version bump, drop old 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> meld-1.8.5.ebuild: Stable for x86, wrt bug #512012 diff --git a/dev-util/meld/meld-1.8.4.ebuild b/dev-util/meld/meld-1.8.6.ebuild index 5c7303dd5cb5..41b58f94fe86 100644 --- a/dev-util/meld/meld-1.8.4.ebuild +++ b/dev-util/meld/meld-1.8.6.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-util/meld/meld-1.8.4.ebuild,v 1.5 2014/03/09 11:56:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild,v 1.1 2014/09/04 12:06:31 pacho Exp $ EAPI="5" GCONF_DEBUG="no" @@ -13,12 +13,11 @@ HOMEPAGE="http://meldmerge.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+highlight gnome" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+highlight gnome" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -# FIXME: switch gconf-python to python-r1 RDEPEND=" ${PYTHON_DEPS} >=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}] @@ -26,7 +25,7 @@ RDEPEND=" dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] ) - gnome? ( >=dev-python/gconf-python-2.22:2 ) + gnome? ( >=dev-python/gconf-python-2.22:2[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} app-text/scrollkeeper |