diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-10-27 11:53:02 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-10-27 11:53:02 +0000 |
| commit | fe3cc25c6d9e5a1e0f7e4f261842fc8d7542c992 (patch) | |
| tree | 5826fc6745509dc51598859b8dbec20baa165e31 /dev-util/meld | |
| parent | Version bump, drop old. (diff) | |
| download | gentoo-2-fe3cc25c6d9e5a1e0f7e4f261842fc8d7542c992.tar.gz gentoo-2-fe3cc25c6d9e5a1e0f7e4f261842fc8d7542c992.tar.bz2 gentoo-2-fe3cc25c6d9e5a1e0f7e4f261842fc8d7542c992.zip | |
Version bump, drop old.
(Portage version: 2.1.11.30/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.6.1.ebuild (renamed from dev-util/meld/meld-1.5.2.ebuild) | 34 |
2 files changed, 23 insertions, 19 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index b1a41742e448..2188a77dd940 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.151 2012/10/16 04:27:53 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.152 2012/10/27 11:53:02 pacho Exp $ + +*meld-1.6.1 (27 Oct 2012) + + 27 Oct 2012; Pacho Ramos <pacho@gentoo.org> +meld-1.6.1.ebuild, + -meld-1.5.2.ebuild: + Version bump, drop old. 16 Oct 2012; Anthony G. Basile <blueness@gentoo.org> meld-1.6.0.ebuild: stable ppc, bug #427544 diff --git a/dev-util/meld/meld-1.5.2.ebuild b/dev-util/meld/meld-1.6.1.ebuild index cc7e37f2de92..bdb233496e3f 100644 --- a/dev-util/meld/meld-1.5.2.ebuild +++ b/dev-util/meld/meld-1.6.1.ebuild @@ -1,39 +1,37 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.2.ebuild,v 1.6 2011/10/30 15:37:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.6.1.ebuild,v 1.1 2012/10/27 11:53:02 pacho Exp $ -EAPI="3" -GNOME_TARBALL_SUFFIX="xz" +EAPI="4" GCONF_DEBUG="no" PYTHON_DEPEND="2:2.5" inherit python gnome2 eutils multilib DESCRIPTION="A graphical diff and merge tool" -HOMEPAGE="http://meld.sourceforge.net/" +HOMEPAGE="http://meldmerge.org/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc gnome" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gnome" -RDEPEND=" - >=dev-python/pygtk-2.14:2 +RDEPEND=">=dev-python/pygtk-2.14:2 >=dev-python/pygobject-2.8:2 - gnome? ( >=dev-python/gconf-python-2.22:2 ) -" + gnome? ( >=dev-python/gconf-python-2.22:2 )" DEPEND="${RDEPEND} + dev-util/gtk-doc-am dev-util/intltool app-text/scrollkeeper" pkg_setup() { - DOCS="AUTHORS NEWS help/ChangeLog" # Needed for optimizing python modules against proper interpreter python_set_active_version 2 + python_pkg_setup } src_prepare() { - gnome2_src_prepare + DOCS="NEWS" # fix the prefix so its not in */local/* sed -e "s:/usr/local:${EPREFIX}/usr:" \ @@ -53,11 +51,6 @@ src_prepare() { sed -e '/scrollkeeper-update/s/\t/&#/' \ -i help/*/Makefile || die "sed 4 failed" - # fix test suite, upstream bug #655251 - sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \ - -e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \ - -i tools/check_release || die "sed 5 failed" - # replace all calls to python by specific major version sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \ -i INSTALL || die "sed 6 failed" @@ -73,6 +66,11 @@ src_prepare() { sed -e "s/PO:=.*/PO:=${mylinguas}/" \ -i po/Makefile || die "sed 5 failed" fi + + # Fix .desktop entry, upstream bug #686978 + sed -i -e '/Encoding/d' data/meld.desktop.in || die + + gnome2_src_prepare } src_configure() { |