Version bump

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

3 files changed, 93 insertions, 15 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index a1bde6210e61..e6421aaa7818 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.165 2013/04/01 18:24:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.166 2013/04/22 18:17:21 pacho Exp $
+
+*meld-1.7.2 (22 Apr 2013)
+
+  22 Apr 2013; Pacho Ramos <pacho@gentoo.org> +meld-1.7.2.ebuild:
+  Version bump
 
   01 Apr 2013; Agostino Sarubbo <ago@gentoo.org> meld-1.7.0.ebuild:
   Stable for sparc, wrt bug #458984
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index e79d46b374c1..029037d03ae7 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -4,25 +4,17 @@ 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
+DIST meld-1.7.2.tar.xz 379300 SHA256 ece1f086f0c23395060abcdca03795e739e072d5032aac8a9a1fb1502c806e9f SHA512 18511b8cfd295588d5d0c533dd4e70b0cf3c9a4bccb037a7ca1379d7dbd9a114ad3b601cb64b932c244300025c0c917c56deda5853f91deaaed179d674cb5958 WHIRLPOOL 3bf40b3ddad9f7356619302dda44e7c58b25c1eea6f4d3ba81642d11a1ea3afe37d12fb0352e1f17e2f6dfe80e59cf73e34010c21119c0fc714185f4d0d9dbf0
 EBUILD meld-1.6.0.ebuild 2170 SHA256 bc9f3432ea8e3fbd70e5bc85dd2a92537eb947531c791c79377cb4d6c1f73608 SHA512 3b47b28ecd938e275179b410fb05e1662c054142623a39b4d77d8d918e0408d9694440d7673fcd5f323e22bb1a75fe515e7e02d2e5a1cec21a4acd5d5a38469f WHIRLPOOL 0ba136fc28122740179166ef2911c17012e2845c50a21ca33aa3bb69f891ba538c1cbc2457344406cc7abaa9c660a83476254a2efdee8b167525604dea15310a
 EBUILD meld-1.7.0.ebuild 2400 SHA256 ff06b718876b0b8e97af50147513466425e6026f9e9013570fd39fe73a7564ab SHA512 324e7212736463e4cdd96d83efaee92e613225983b4b2737ba0d078953226749f6225fd1b0abbd59e886fd4993a199acf73407603b48c20edc48d89dfc078a00 WHIRLPOOL db36e5e2d22d84ba6511e18f8fad36f4a6eddd52541261e7ff564b6c2e90c9fc55f76fe4c9a44fb2e7f4de99318b111fa697c939544087bc4b47d92ecda8763f
 EBUILD meld-1.7.1.ebuild 2088 SHA256 ce46e1541936b75e9d09db7f91271d3ce6ce7d432b0180f1e110469211a410f6 SHA512 d2ac96ab5823518a1a18d03367711a8e227224fd9a2eef9aa585336771af79fe5ff8b5397bd557c2fb611e47e8ecc599efdeecb252a1df765fc53be5edebb197 WHIRLPOOL c1eee17ca941948fe9feec41e3573c43fe062f9d8fa331d798ca0bbfa1e81b6070b32a8a9a65715fa82c9e8fe7c706454512f8168f7bdeb18890dd5a1c7dad7e
-MISC ChangeLog 21109 SHA256 eeff7afd7741af064185282acab68cf931444f0fbd441ff577831204a3cb3ca2 SHA512 b8695f21c0a0af7459d87c40dbd57bc28f409ba2d6a6b0b8a4c012adf6e53a101be3e1d477c55a745d059200f10cc46281500c1fc77a4afb8208d6a859d1f3a1 WHIRLPOOL 4e5a840437675bceeb8e85caea63d2e70b8e020f6e5c5573bba775808a302cfbff55098b4626d7c4926cae37af35a859d5f83bce2c57ad36ce34bc8ed3fffc50
+EBUILD meld-1.7.2.ebuild 2106 SHA256 4c014349d8bcf36865bab52de3a5323aace9de9a5a0c1b96db97129c4320887d SHA512 3049ac26b30ea7368643a874a0ba6f1b4039dc712304b3e82f79f9d34e4d4f6f89c328f2c98cdc6c7b1c8b0451e5d799aefeecc6bb81bcda845f52f82c6cdad8 WHIRLPOOL 7330daff9f71959f3893d731ad8ef93ed311e873c2f2cea992fb12e5e3f069b8f9bd9bfd001aa268f0c25796dcb99b994501f8e138ca9f6a43d1b50ad1e8b0a9
+MISC ChangeLog 21220 SHA256 df7034d80b58048be7ee1f7db4fc138429a8f36e0689ed086b985b166bebda58 SHA512 5255b6663173d4c4ec023a5e3c219769ae062e28129a2f29736f04378ef0b9b3f86fd65246341375629529f573ec45b44c68865b05abeeb891a92d04b5f3f851 WHIRLPOOL d1848484d9bb875c09311489969f56fa35a1d6d9da6761e455a45605319f15795de1feb931318c981268f32a6ca9f750d3513226f94ced1376c6ef660293180b
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWdDfAAoJELp701BxlEWfY3YP/RzaTlxVVrX1F7YtBlbvaUr8
-j0oPQLAbJgxIp+awONtcBsqTTCw/0aJGFDC80RWA+71OAJhK2TSx3Wn8tdKQE2RP
-cRLXlF/IiWdnSAp1fssoIt/AXBYseOrFSqVr/TAXCZlxq4kG7oSnwyxyr4kro8ki
-RC6a9zgZULiT+DwgREEcBKE7LMXF37U4QvRm1CBJP1mnW37qApwc5RsQLAv+kHPk
-wHDSi4mqqeL/zM5saWjzpgDrep7g9/Xnaq7U8D+DOwd3ttXRRhWb4c9a8FZw8kTz
-vJxxwaKurj0jCXczhlJz+cc8Z4XSINxHiJlFV9Z9cChQyk7ym4NSy18Gdcgh6Fha
-U1C5PZJYmRXmbDutgzqg0TJWZqDTQHTi1oXAT+VPp3T0TH4AjEYwNRIue8Vb8LT4
-yRlXZJ9jX4CppbaSvOZ5uFDBJqzsTwutyC5/j7S959m4oLkT+xJUZB3Lm23uy2Sg
-ASBdbjIu8dirZlM7VSIlLTGdAWpQRDgyP4z/4bHW/mjpnud2d0cL+jZkVHX4EU89
-ZjK+U/6ZAphEcwgukhNOVwl5WbNMc5IhuowTsUV2AHyWFo2tsi+zjN+TMp8bcH1I
-nGa2gj52ZWM3MYJO+Ji1beVT8AqBf5eSy+TcQA/Q2JQhSOwu9z86E12lNaW6m0tC
-ltv2NRCUanWxr/Y1VLz9
-=Pt/S
+iEYEAREIAAYFAlF1frIACgkQCaWpQKGI+9T50gCffGw9l43uHQofjt9g7QazT30u
+IgMAniDx/8jI/CU6AUWFsfxsr71VHs8L
+=mbr4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.7.2.ebuild b/dev-util/meld/meld-1.7.2.ebuild
new file mode 100644
index 000000000000..1b44bc4fe13f
--- /dev/null
+++ b/dev-util/meld/meld-1.7.2.ebuild
@@ -0,0 +1,81 @@
+# 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.2.ebuild,v 1.1 2013/04/22 18:17:21 pacho 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 #698600
+	sed -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
+}