diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-07-28 19:46:50 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-07-28 19:46:50 +0000 |
| commit | b052ffa1106c3ff117e2b544cb339baf4774bd29 (patch) | |
| tree | 3c55610ef01e26d63a6aea83e905e3df1a7875c5 /dev-util/meld | |
| parent | Stable for arm, wrt bug #478344 (diff) | |
| download | gentoo-2-b052ffa1106c3ff117e2b544cb339baf4774bd29.tar.gz gentoo-2-b052ffa1106c3ff117e2b544cb339baf4774bd29.tar.bz2 gentoo-2-b052ffa1106c3ff117e2b544cb339baf4774bd29.zip | |
Version bump, drop old
(Portage version: 2.1.13.1/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.7.4.ebuild (renamed from dev-util/meld/meld-1.7.2.ebuild) | 17 |
2 files changed, 12 insertions, 13 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index b217377788e0..07b59534c016 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.167 2013/06/03 20:24:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.168 2013/07/28 19:46:50 pacho Exp $ + +*meld-1.7.4 (28 Jul 2013) + + 28 Jul 2013; Pacho Ramos <pacho@gentoo.org> +meld-1.7.4.ebuild, + -meld-1.7.2.ebuild: + Version bump, drop old *meld-1.7.3 (03 Jun 2013) diff --git a/dev-util/meld/meld-1.7.2.ebuild b/dev-util/meld/meld-1.7.4.ebuild index 1b44bc4fe13f..ac505d6bf9fb 100644 --- a/dev-util/meld/meld-1.7.2.ebuild +++ b/dev-util/meld/meld-1.7.4.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.2.ebuild,v 1.1 2013/04/22 18:17:21 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.4.ebuild,v 1.1 2013/07/28 19:46:50 pacho Exp $ EAPI="5" GCONF_DEBUG="no" PYTHON_COMPAT=( python2_{6,7} ) -inherit eutils python-single-r1 gnome2 multilib +inherit eutils python-single-r1 gnome2 DESCRIPTION="A graphical diff and merge tool" HOMEPAGE="http://meldmerge.org/" @@ -16,7 +16,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="+highlight gnome" -# FIXME: switch pygtksourceview and gconf-python to python-r1 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# FIXME: switch gconf-python to python-r1 RDEPEND=" ${PYTHON_DEPS} >=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}] @@ -47,10 +49,6 @@ src_prepare() { sed -e '/scrollkeeper-update/s/\t/&#/' \ -i help/*/Makefile || die "sed 4 failed" - # don't run update-*-database, leave that to eclass - sed -e '/update-.*-database/d' \ - -i Makefile || die "sed 5 failed" - strip-linguas -i "${S}/po" local mylinguas="" for x in ${LINGUAS}; do @@ -62,10 +60,6 @@ src_prepare() { -i po/Makefile || die "sed 6 failed" fi - # Fix .desktop entry, upstream bug #698600 - sed -e 's/\(MimeType.*\)/\1;/' \ - -i data/meld.desktop.in || die - gnome2_src_prepare } @@ -74,7 +68,6 @@ src_configure() { } src_install() { - DOCS="NEWS" gnome2_src_install python_fix_shebang "${ED}"/usr/bin doman meld.1 |