Version bump. Add optional dependency on pygtksourceview, bug #444570.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 30 insertions, 11 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index dc98ad3913f8..23a6641b9f2a 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.153 2012/10/28 15:49:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.154 2012/11/25 10:51:59 eva Exp $
+
+*meld-1.7.0 (25 Nov 2012)
+
+  25 Nov 2012; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.5.4.ebuild,
+  +meld-1.7.0.ebuild, metadata.xml:
+  Version bump. Add optional dependency on pygtksourceview, bug #444570.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> meld-1.6.0.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/dev-util/meld/meld-1.5.4.ebuild b/dev-util/meld/meld-1.7.0.ebuild
index f866f11daccd..66d252223893 100644
--- a/dev-util/meld/meld-1.5.4.ebuild
+++ b/dev-util/meld/meld-1.7.0.ebuild
@@ -1,39 +1,42 @@
 # 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.4.ebuild,v 1.7 2012/07/15 17:19:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.0.ebuild,v 1.1 2012/11/25 10:51:59 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.5"
 
-inherit python gnome2 eutils multilib
+inherit eutils python gnome2 multilib
 
 DESCRIPTION="A graphical diff and merge tool"
 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="+highlight gnome"
 
-RDEPEND="
-	>=dev-python/pygtk-2.14:2
+RDEPEND=">=dev-python/pygtk-2.14:2
 	>=dev-python/pygobject-2.8:2
+	dev-python/dbus-python
+	dev-python/pycairo
+	highlight? ( >=dev-python/pygtksourceview-2.10 )
 	gnome? ( >=dev-python/gconf-python-2.22:2 )
 "
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	dev-util/intltool
-	app-text/scrollkeeper"
+	app-text/scrollkeeper
+"
 
 pkg_setup() {
-	DOCS="NEWS"
 	# 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:" \
@@ -68,6 +71,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() {
@@ -76,6 +84,7 @@ src_configure() {
 
 src_install() {
 	gnome2_src_install
+	doman meld.1
 	python_convert_shebangs 2 "${ED}"usr/bin/meld
 }
 
diff --git a/dev-util/meld/metadata.xml b/dev-util/meld/metadata.xml
index da6fd63d0085..2527d2b25a68 100644
--- a/dev-util/meld/metadata.xml
+++ b/dev-util/meld/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="highlight">Enable source code highlighting via
+			<pkg>dev-python/pygtksourceview</pkg></flag>
+	</use>
 </pkgmetadata>