Version bump, drop old.

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 29 insertions, 25 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/Manifest b/dev-util/meld/Manifest
index e94c928e3295..9b93c4b61687 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.2.tar.xz 326260 SHA256 bddd8322437fc4d5cf0d17e6f7e85ee273d86275a209640813d0e2451d9e2b17 SHA512 e001523a48b4c73662b79c0fad3ad5cde793fc2f6ade7377cec366ca94eb9f38154fce9ae465bd72f4792fc73bb2a99cb70d22cd35a08c2e725c83fd55a236f2 WHIRLPOOL 040172495fda6f92a0604b8fda5841cbe26eff6a883581bec3394570d1947aef117131edbceca0b86861dc8dc734c41ae64e59c3459c813ba81af4c1904688a8
 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
-EBUILD meld-1.5.2.ebuild 2400 SHA256 1d7dce11a3ca9b34ed6490ec92948e8712c5c5e89dd1b380d1b6fa974a652623 SHA512 5bd739d2245c844fc97c35bf352974bc1bfd90ca2827c99281601958a3e78d9245ad270f49aa92c1e691f87de200acf0b74ead7007938dbbce3d8a469cdd2efd WHIRLPOOL 2df14431e42d9e63e258e41e0fb9d6fe7d20203ef50e2b850f285529606b2304d4792e1f4aa93edca98400d28de2889440aaa2ba3146dcfd084aee0fb42d9830
+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
 EBUILD meld-1.6.0.ebuild 2173 SHA256 16b43fd6d6c23eb99fcf35b00c40bb957a69c04861206fb9a844003a9a4a8fcb SHA512 962f2373b76689995c6b7ce46de3e6566ca034e6a60b5df7a097049db7774b8fe73d913202a7ce814faa1b473e2120d751ca2b74d6ed40ab5f7f5c94a6e9d028 WHIRLPOOL 53c73e1043416a72b7b774818ad344749d6dccdeb8f83c6e459b0bc3e32a0d5dfb91a5198a5e096b6caf64d15c828c96d8be4f7037d855fc61afa1d327c85a1f
-MISC ChangeLog 19476 SHA256 6bc4e277410b69d744e7ab68b207208147e6c4a2e336d4ab243d9c4e15b7417d SHA512 5ef182d82e2c16c852f0a688dafe79a53f2846d125a4c1c217dbc528b527ec8897dfa9c38d0f65cb312ad06d351b10b2e0c299c84ddfe34f797ca6fdf5fd8969 WHIRLPOOL 7a8be7823837f13695f6b57ad67c4363361440b02a792831978ea0b0d824f6f909740f2a93437e4eec592920996dda90a7ab9c97089a522008c74b4d4f6f8ce8
+EBUILD meld-1.6.1.ebuild 2289 SHA256 2235f26b747a0024904651c66b4efd46191640b419b145fae9c4a76f203b8a0d SHA512 6813758e8c73f99845d5993413ac104b3f519e29b351e245b3287f4dcf33bec4db02690db2e7ffd60f83ddcbcead80f4907c46f9c18a0e4e09154e5c53c75c5d WHIRLPOOL eb8dba80a771265ecc872052b4cccb8f85257f84415a7654f6c96b43e42720654d6b00b1306dbec16ce4fe5631f22002b7b01cb098c67e54f91167d62e1be47d
+MISC ChangeLog 19615 SHA256 54b55e74ac9663c30f2c2cc7fa78754c504092dc879e118cb465124f603dab30 SHA512 1af43cad67afcdda03bf005d133dd324b46d0db03b409cb58b7b4113cc310a37488a4b22da37682d640138534b97c97d55754ee5b01fd114f53e4aa040a65e48 WHIRLPOOL f14ddb6406433ca412a1f7b7c9b9c25ba05f4fe001206ba193119d86194b2da2388d2fe192ee27a7b90c98d44f31e82b81b17f20c2e72640fb7602cc95b6f3a1
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlB84g4ACgkQl5yvQNBFVTXnZgCgmSZFbS5IKLg7z5lVqCrCVHge
-KZkAni/OgBtc70LWktF9WDEp6DfsQ0PS
-=w82E
+iEYEAREIAAYFAlCLyx8ACgkQCaWpQKGI+9TxbgCfR4ZjylV2x4lWCzH4WUtTIU8J
+eEIAni8XcGmkS4FyLtZCCQdf9cvLPpJO
+=GBR5
 -----END PGP SIGNATURE-----
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() {