Version bump, drop old

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

3 files changed, 19 insertions, 20 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index b217377788e0..07b59534c016 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # 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.167 2013/06/03 20:24:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.168 2013/07/28 19:46:50 pacho Exp $
+
+*meld-1.7.4 (28 Jul 2013)
+
+  28 Jul 2013; Pacho Ramos <pacho@gentoo.org> +meld-1.7.4.ebuild,
+  -meld-1.7.2.ebuild:
+  Version bump, drop old
 
 *meld-1.7.3 (03 Jun 2013)
 
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index c8087366c98d..9aa6b62cf475 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
-DIST meld-1.7.2.tar.xz 379300 SHA256 ece1f086f0c23395060abcdca03795e739e072d5032aac8a9a1fb1502c806e9f SHA512 18511b8cfd295588d5d0c533dd4e70b0cf3c9a4bccb037a7ca1379d7dbd9a114ad3b601cb64b932c244300025c0c917c56deda5853f91deaaed179d674cb5958 WHIRLPOOL 3bf40b3ddad9f7356619302dda44e7c58b25c1eea6f4d3ba81642d11a1ea3afe37d12fb0352e1f17e2f6dfe80e59cf73e34010c21119c0fc714185f4d0d9dbf0
 DIST meld-1.7.3.tar.xz 398636 SHA256 752eeb3908af23320a11ecbd27a72ac67f381dabd4c52ca7e0c86f9dda74718f SHA512 01ae7d00a3bfa40a8ed5f5d2f2e79c0718bd7cb30d02a49dea421d972bfd8bd3fc3d8534f22cd370920c85f0d7d720f57518034407b30c61b050f1c0fcd868e6 WHIRLPOOL ee470641695399eaa847658ba3294878767c2eccfec2bd2bd9631f892eccc5ab4dab430740b7c88b21459816f1f772c7bdc17e7155d602687f64564d60ad2e42
+DIST meld-1.7.4.tar.xz 406156 SHA256 17c1230512b4b788c4b7b0c6bbd72b10c1005a810c1c9c8db9a0bf1cb1f7d56f SHA512 697b97b699052a108c6602fe340ea18c3d4d1e05bd21c1127258d092aff04cc558779ac0da79da849430dada6c23c777f4ae023738762f5b012d523255b0aa53 WHIRLPOOL 1c903eaf22cecbcfe476d76ca67d7dbb2082c8e5bec55dc75dad4fbf0b7af6c889a1e82c7aa4c5e06f38ca43047ba53beb0e601a510b4471a724311a3899dc9b
 EBUILD meld-1.7.0.ebuild 2400 SHA256 ff06b718876b0b8e97af50147513466425e6026f9e9013570fd39fe73a7564ab SHA512 324e7212736463e4cdd96d83efaee92e613225983b4b2737ba0d078953226749f6225fd1b0abbd59e886fd4993a199acf73407603b48c20edc48d89dfc078a00 WHIRLPOOL db36e5e2d22d84ba6511e18f8fad36f4a6eddd52541261e7ff564b6c2e90c9fc55f76fe4c9a44fb2e7f4de99318b111fa697c939544087bc4b47d92ecda8763f
-EBUILD meld-1.7.2.ebuild 2106 SHA256 4c014349d8bcf36865bab52de3a5323aace9de9a5a0c1b96db97129c4320887d SHA512 3049ac26b30ea7368643a874a0ba6f1b4039dc712304b3e82f79f9d34e4d4f6f89c328f2c98cdc6c7b1c8b0451e5d799aefeecc6bb81bcda845f52f82c6cdad8 WHIRLPOOL 7330daff9f71959f3893d731ad8ef93ed311e873c2f2cea992fb12e5e3f069b8f9bd9bfd001aa268f0c25796dcb99b994501f8e138ca9f6a43d1b50ad1e8b0a9
 EBUILD meld-1.7.3.ebuild 1867 SHA256 f68aecb324528c9e141a7d595953aebe63672487e40f645789210a30e4c1041d SHA512 ce4e31fee59e01fca8fc786d6f2a6fc253c4c88321ad7f5054246adb7da561b35fa259e9873772641e1667214bb6c85d1167d19d60e7d11cb756b4b445a0136d WHIRLPOOL 78655406f6c53ff0ac02518813a6c955a5851a94e485560d1eb8481dbadd0e6f0ebf96c686253debe24b168beba6ed5f40096e6830365e245126ffb7bd9b1e81
-MISC ChangeLog 21381 SHA256 d215a01b7050ec15303c4aedba1d799825e128a0f428ba6c6188d80882f8e5a4 SHA512 341314e53e0aaa26d021e2969e2fa6344d35f9c49363e4814a4b504669d9a6e9e90725179ee360fbf9a448a133cbada33b9aebeb88a3573985ec337b0dda2a03 WHIRLPOOL 72044d32180df3113749312732b331782e5068baa6fa4b7634c203b19df0bad9e6b39d3cb7fe7321c1185705b8a8eb63449e42e17cde67c0e2e9fae361de7143
+EBUILD meld-1.7.4.ebuild 1867 SHA256 31f1737d5dbacdd110be57d4fbcfdd7ee2de8703076b472ef53d26c45325a997 SHA512 2966c8581322068f9931a6393e719ed75982de2849ad7a781b6b5a485cc80221bc1d20a12ea8332b6513ed594ab9bcdeaf801eaf4983b75140132fdf2357ddb2 WHIRLPOOL abfb16e1dfb9c505e5848f09286fedb53d357416fbfe996d9550f6658a7065cf5127d1a2f75931d1f94369fdb1ad2484ffb71a783721d595935c226bf94d16b8
+MISC ChangeLog 21522 SHA256 86a98dd48b4a9356bcc8ffb682916f76e4e923634218b8333472e1afb870435c SHA512 c0ce08393bf60eb6421e685fbea7577715aa7abaa6856eddfeb18ab03b383a86e2f029b3d7f0139fef3c1fd451b2a52cd46bc0cad994ca30bd4a19479a54fa3e WHIRLPOOL 2a59fdf3ba5356310227de1452d2b4e3b9211d503ce2f1870a0d1d01feae6d6063c4ee6dcfbaebda763ca87c95a41f26cc82555d7a179fecc2a22f4f49566e45
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGs+3wACgkQCaWpQKGI+9RrSQCaAjAQFnZWsEjZ+TZHv/4BgOL2
-jDgAnimvrhr5YnCUrmrHM/7lzvXmTGcw
-=u0pC
+iEYEAREIAAYFAlH1dSsACgkQCaWpQKGI+9QMYACeL5j8g8txE5BE9c19G5/i6T7t
+WQkAnjxzmm4rH1FpVcAUbYpwwL1HjMRo
+=p21w
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.7.2.ebuild b/dev-util/meld/meld-1.7.4.ebuild
index 1b44bc4fe13f..ac505d6bf9fb 100644
--- a/dev-util/meld/meld-1.7.2.ebuild
+++ b/dev-util/meld/meld-1.7.4.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.4.ebuild,v 1.1 2013/07/28 19:46:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit eutils python-single-r1 gnome2 multilib
+inherit eutils python-single-r1 gnome2
 
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/"
@@ -16,7 +16,9 @@ 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
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: switch gconf-python to python-r1
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
@@ -47,10 +49,6 @@ src_prepare() {
 	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
@@ -62,10 +60,6 @@ src_prepare() {
 			-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
 }
 
@@ -74,7 +68,6 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="NEWS"
 	gnome2_src_install
 	python_fix_shebang "${ED}"/usr/bin
 	doman meld.1