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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 37 insertions, 18 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/Manifest b/dev-util/meld/Manifest
index edd78234ae39..d14bd69dec50 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST meld-1.5.4.tar.xz 339728 SHA256 fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e889602cddc0df342b34266612 SHA512 57f48b94fd57fa9d1e26cd5d3629e0e47bd7f9955104dddfb0cfc0b7f87baf0c6e773c1f1a6bb63fab4fb370f989722fb25cd8e609a6f20e9d327e370b188465 WHIRLPOOL 2a582709cb47972cf8d1321855ee1502c79b717ac81a28c8b5a2dec32585add1593634f1dada5f334cb0f7062677989c4c24991e2091cb24bda1ebc1cea8e8e9
 DIST meld-1.6.0.tar.xz 343800 SHA256 a0ec4e19e85ea4df0214da4c92a4069095d37a252ab240fc1bc00f29a627fea8 SHA512 049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d WHIRLPOOL 91ceeddfbedd96d7f8f2433f049fff8dc64ff1f79892d322a560b8315474d305eb29b0f728c374e69d2207accc9a894182dae71ba224f5af5afd94a910e38abd
 DIST meld-1.6.1.tar.xz 344132 SHA256 de9c4d526c7489b6e6c5772b709aea4b77e1b3d1b6cd1701fc1c17ea81733a03 SHA512 7a68408f6313fc103ba2e664edb18d16ae2a9feb7ea0672e34ce022eab4826888afcd5d59edfc1c898126647ae96c502ee5b83630741e1afd7052d5cf413eca7 WHIRLPOOL bf664c67e5873acf6f03300e62be6a6d8235efdac1645b26eb18d8a03128b4f7ca78cbfe39c0047ff0775d0e243a4581010adcbc4a6e7df3239e0249fcb3747c
-EBUILD meld-1.5.4.ebuild 2170 SHA256 ae280b3825468d9f1af2b9f14783b6f675e019ee6382b9ab2eb643158bac8e83 SHA512 29ae41d4ce6d5af7476eed36233d466100491a9ae108f6d924d2d0e08b1d6d1fdfe627f90e1c28228f061b927be23f0bd568b70d98e8eb74478f504100ffccba WHIRLPOOL 3052019c65bc69b16d0cb86512435b5f7fa35d06f35c398512fba61aed754429c40786d36871763d2590703820222aaef2819b8851cf46f631ddab552ba94910
+DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
 EBUILD meld-1.6.0.ebuild 2170 SHA256 bc9f3432ea8e3fbd70e5bc85dd2a92537eb947531c791c79377cb4d6c1f73608 SHA512 3b47b28ecd938e275179b410fb05e1662c054142623a39b4d77d8d918e0408d9694440d7673fcd5f323e22bb1a75fe515e7e02d2e5a1cec21a4acd5d5a38469f WHIRLPOOL 0ba136fc28122740179166ef2911c17012e2845c50a21ca33aa3bb69f891ba538c1cbc2457344406cc7abaa9c660a83476254a2efdee8b167525604dea15310a
 EBUILD meld-1.6.1.ebuild 2289 SHA256 2235f26b747a0024904651c66b4efd46191640b419b145fae9c4a76f203b8a0d SHA512 6813758e8c73f99845d5993413ac104b3f519e29b351e245b3287f4dcf33bec4db02690db2e7ffd60f83ddcbcead80f4907c46f9c18a0e4e09154e5c53c75c5d WHIRLPOOL eb8dba80a771265ecc872052b4cccb8f85257f84415a7654f6c96b43e42720654d6b00b1306dbec16ce4fe5631f22002b7b01cb098c67e54f91167d62e1be47d
-MISC ChangeLog 19718 SHA256 112276935feb4f8d38d5118a4c1eb2915e644b5d6fa327bc4c17acbe9a6b0664 SHA512 ec61118a716135abf8f40117e3ca4c5d0e567f7497560cb3d66acd5e936e44a854d23f0ce1a9f688cee694341012601edaf06de698fa986de11ae60f84cc82fb WHIRLPOOL c44067b57432c98eff02cfa54d0c5685821b36cb4303e22d7c5769f85073a7f4a74175b3c508b69e7c8c01201955da01da2adc5f836bebe18be59ab05209d998
-MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+EBUILD meld-1.7.0.ebuild 2408 SHA256 1861fb0c276b6c9d29825dd536a655b8e4fd1676f09d83640005e1d2c58daa66 SHA512 bb45290ace317d1de00affcd7cdf257496c911ad76c96ee751adee6abd273ce5f7f1283dffe538456c9025f80da40bc84c8e820e4613e6c201bc7787973c75a7 WHIRLPOOL 045117ef2c06725e45dd8d6bd8cd5098cb2a7d71c6af287c31e562eaf247c4716522f751cd8babe16a34e15fc6c78692afad1d656369cfca26534200e02d7e41
+MISC ChangeLog 19925 SHA256 2b4f15100b9030924fbff1623acfd21495cf0de801d92daa18d47fe993a07fb9 SHA512 0bcd239f98927ad5572cf0459cb9b0b2a6a0eb8c1a8078989a65e167ad3ce6f6a21bb19fb4b99cb92590ff5a96086ecf740e77dba38c09162e0e4a7d393aaf98 WHIRLPOOL 9b8c4344049d7b4e50c9b4c2b351ac1b275065f5453e407b4633eeb336b45b9817f5ecda74a093a890c292a7d353156ff8fe12c0c507b5b28e1872cadc3e78e9
+MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNU+0ACgkQuQc30/atMkAI/ACdGgKo99GEZYlJoWdMHYQ1wfNO
-npwAn2U2Ez69irgyJmvKbmSQqielc9Iy
-=bf3D
+iEYEAREIAAYFAlCx+FAACgkQ1fmVwcYIWAaDAACfULKX75wQQpkVVIoAvjoqMdPq
+52UAoIUsi0QaydkXuqlaFq3Wi4Lrk+hm
+=QMmA
 -----END PGP SIGNATURE-----
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>