Version bump. Switch to python-single-r1.

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

3 files changed, 95 insertions, 16 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 96d93cfb5eb7..1aa42c060c6d 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # 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.161 2013/03/29 13:32:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.162 2013/03/30 21:27:48 eva Exp $
+
+*meld-1.7.1 (30 Mar 2013)
+
+  30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.7.1.ebuild:
+  Version bump. Switch to python-single-r1.
 
   29 Mar 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
   Stable for ia64, wrt bug #458984
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 549324f811c7..ad1a681880af 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,26 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST meld-1.6.0.tar.xz 343800 SHA256 a0ec4e19e85ea4df0214da4c92a4069095d37a252ab240fc1bc00f29a627fea8 SHA512 049af934e140dc53f4d56602ab3be8456307948f0d11b816430788db888820c38744bceb4567724748b727fbd5f5d5ae9f15c5b881b4c941689c038d99acc39d WHIRLPOOL 91ceeddfbedd96d7f8f2433f049fff8dc64ff1f79892d322a560b8315474d305eb29b0f728c374e69d2207accc9a894182dae71ba224f5af5afd94a910e38abd
 DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
+DIST meld-1.7.1.tar.xz 374060 SHA256 c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40 SHA512 0d30a14eb3a5c9dd6c8ad6d622e2610a49f019f0e031d5f3e8635f034701fd275003e0b0a92e5fad0813f5b925826ff2c317fb9485a354dd6ff282a9439edf7b WHIRLPOOL 066a5e5e8b0ea63a75c0a3bf813b7de2e062e2a97b5865400a7ccddc8b9d8cb089fa3e7139d494d30acdd1abcf303c4195dbff60f9ac406b509dc6cd2edd2580
 EBUILD meld-1.6.0.ebuild 2170 SHA256 bc9f3432ea8e3fbd70e5bc85dd2a92537eb947531c791c79377cb4d6c1f73608 SHA512 3b47b28ecd938e275179b410fb05e1662c054142623a39b4d77d8d918e0408d9694440d7673fcd5f323e22bb1a75fe515e7e02d2e5a1cec21a4acd5d5a38469f WHIRLPOOL 0ba136fc28122740179166ef2911c17012e2845c50a21ca33aa3bb69f891ba538c1cbc2457344406cc7abaa9c660a83476254a2efdee8b167525604dea15310a
 EBUILD meld-1.7.0.ebuild 2402 SHA256 ea03e6995fcde3fa37134bcae8ab8f3b960b2f6daa50e27c1d271e5f21da6a0e SHA512 49d29055a6fdd68d4e8ccadede81abe7c1ce1ba84a5a76ade3decf5a8b601e1beaa7869b37a518f27155cef874f467bbc8b3cd7879eefdca685f8135a8814ce8 WHIRLPOOL e2072ed29a4c87030fb3fe8edb5341ce22da106aea0d5d8354c419100891ef5034fed965b35d189fb50e061f9e7bc6c3010a7c110849e627e31f6c592eb3bb0f
-MISC ChangeLog 20649 SHA256 9a9d7e51bdb78bb908b20fdfae33ea62b2e6cb5603689953d36ca045c402ce6a SHA512 cf8bec37b93a15e010f4fc11003e5494dfba5263039169f76ddc7fcab0e9f4ef6cda689b4394cc00309a6ca2bcc5d2c12e4d457094912a40524ab4391ad29ed8 WHIRLPOOL f0199d4cdc21d5455ba61df7cd5900fdbaeabcb4dd60b3409d1876e0b7739ac8542183fc2cb0d7b1fee91393105944270987d099356c3904f420f78bbdecd1d8
+EBUILD meld-1.7.1.ebuild 2122 SHA256 af75de9f794a1b7af9ad7f924e8af37520abdfb63c370c31d846f6785da925ac SHA512 db58f9e9d586fefff87600700318eb8c9fad7ccda07ef03511708a65380e3186c23985772b94aa57e0e0b0338d26e36f07cb3f37d64c7a54100379c0c99f9439 WHIRLPOOL 95ae2d731e5cac2f30c53d3bad3699af1dd695e96fb87118ee2c77e579bbdc239ac410b6fe022f846a3bc968ca01c843bdb843e5ac2ebfe3f7356b5227c4bb23
+MISC ChangeLog 20795 SHA256 2f6ab4cb0109c37a8656484168cd45186a041d0df171f0209eb0817b064769b0 SHA512 bf0b58d55b69fa4adb0015554f0af7e773257c75b91aeb13943bc814066e063fec0cf499a0752c2060c7b78ab2cceaa686a30f1f0cf4ef978cc7dc142662ac4a WHIRLPOOL 3b380230f1db405a5326711f4fba1c820042a728933c73d983050d5ebd194de94de5b83f30f58a78cc1607375de2ee10f1c95a86195650ff5ebc90e5fc62b918
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRVZc+AAoJELp701BxlEWfYxgP/js1VaC8+JQhZFTHKUqtWGKk
-ZVVZUDisPqiUzs5b2X8VyJH/Ykwtx1C+Ui7pFosm0wxFu4Dv/Mc/z7IWgrKRV/TZ
-AAyB9hf4kCA4MmGjSawQHLC/6YPsLpkyrF2CnFvD6mI9NU7rR+DVeYwd0UzvObVb
-Ss4N2fEi1GTfxxF7xHE9rfpYFvdbZ6Yf6TW9I5RqY4u4NuxBYd1ONUwmvXjO8Cpi
-hhoMay+kwjF9RYne1TbB3e9JHBk8N+SdAFOxeOFld7Atnn/WvLC7As01eI+MtYUr
-Ez0CArC5iiIMH+i2dlW/PuYwXmR03+lq14Ylbtml+/ZITCqPAGLsubVehj5Fwn5O
-QwleggdqeQGmbtvxRX6p6tkq0H64qPWVK1MU1kEFhfnq8hO2RPrgbx+NzJcRhaqz
-SiBE5Hbays1fUba9p+p8RHCsjljKhvLgnOkguhx4v23KLg0kKXagysRh2tKGBSW+
-v3NgN3cRcZO5w4SI0GTuXNdW+pTn9MK3ZVfPPv9Y8HurA1qCSKvH/gM7THdRThqc
-ZPTmAR948uo88956Uaic4N7hDForcQXJMlZRoDJOBdMfBKrY5+S31UGnJT3T2sEk
-BAiViz6jLdF3Id86BHTbj18IoY8L9qLwHs0smXYFoFhLctbK0QsHiW4KJtq3DBZo
-cUNy62sAk9WvOY9rn4L4
-=dzwi
+iEYEAREIAAYFAlFXWNUACgkQ1fmVwcYIWAbi5QCfYSiMCYSqYgqiZPBfdJvipO0G
+eEgAnAkXXyIhdkZwhg8/oRBhhaPL8itF
+=UtAW
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.7.1.ebuild b/dev-util/meld/meld-1.7.1.ebuild
new file mode 100644
index 000000000000..17f1eaad656c
--- /dev/null
+++ b/dev-util/meld/meld-1.7.1.ebuild
@@ -0,0 +1,82 @@
+# 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.1.ebuild,v 1.1 2013/03/30 21:27:48 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils python-single-r1 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="+highlight gnome"
+
+# FIXME: switch pygtksourceview and gconf-python to python-r1
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] )
+	gnome? ( >=dev-python/gconf-python-2.22:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	app-text/scrollkeeper
+"
+
+src_prepare() {
+	# fix the prefix so its not in */local/*
+	sed -e "s:/usr/local:${EPREFIX}/usr:" \
+		-e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" \
+		-i INSTALL || die "sed 1 failed"
+
+	# don't install anything to /usr/share/doc/meld
+	sed -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" \
+		-i INSTALL || die "sed 2 failed"
+
+	# don't run scrollkeeper (with the wrong path),
+	# leave that to gnome2.eclass #145833
+	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
+		mylinguas="${mylinguas} ${x}.po"
+	done
+
+	if [ -n "${mylinguas}" ]; then
+		sed -e "s/PO:=.*/PO:=${mylinguas}/" \
+			-i po/Makefile || die "sed 6 failed"
+	fi
+
+	# Fix .desktop entry, upstream bug #686978
+	sed -e '/Encoding/d' \
+		-e 's/(MimeType.*)/\1/' \
+		-i data/meld.desktop.in || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	DOCS="NEWS"
+	gnome2_src_install
+	python_fix_shebang "${ED}"/usr/bin
+	doman meld.1
+}