Version bump.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 87 insertions, 6 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 416b8c77b36e..ced388b2772c 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.174 2013/12/08 18:18:33 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.175 2014/02/06 23:01:53 eva Exp $
+
+*meld-1.8.4 (06 Feb 2014)
+
+  06 Feb 2014; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.8.4.ebuild:
+  Version bump.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> meld-1.8.2.ebuild:
   x86 stable, bug #478252
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 84faac01f04e..599880531d8d 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST meld-1.7.0.tar.xz 358648 SHA256 d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b SHA512 88441334ff4076d3d6d05f703fe0300b85438d7f010a0b70f621dea6ee2f4b7cf37abefafe292e303472403d4d55daa8275aa170b5a7291fbf3c327378d769ef WHIRLPOOL b87141437a7e4affa25fbbbfa94a7f2799a4fedfbfe3107629b50672ffbf2a5e9a5c88d1738ec9040eb14dd7a294f1f287ff47dc6f5e944f299988ea9a1e745b
 DIST meld-1.8.1.tar.xz 423336 SHA256 f1f13deeb74625a97f97c311eb00665d4a883f0ce705d3299b9c02d50c4ac9c5 SHA512 a1a673092d687f753e3ee514716605cd590a6d6c2334dfb41da8166155630e5b44dff3d1686427d4919e119f23c2d0d341c5eec30982c9ff207683b82931553f WHIRLPOOL 09b350863c085e1eef95ebae11eb908f5718e0f1c7de3521f7014dcfeccd04c3d22c7e7790d9705586635a761944aabf2de33348bcc85eb650958a09c89caa99
 DIST meld-1.8.2.tar.xz 423312 SHA256 f272f57f5475ad0b0a555c5e3ce5878feb2dcabb919753bb17534c8559027f69 SHA512 022e6a115c42739142a75d6d6fb4a867e23b832adbb4eaeb470f713e8f820866ecd6a4b4dd000cbacf71883a5a416a6fb5f6f24ca7e47c9145eb0784b236058a WHIRLPOOL a43163a7bb7cdde144f5a0d8a30e2f610c7b54f43a0e3cf010272f00d08ea741245912b654ec138a2df6f90f1a4c1585affbdacb265fb0cf4403d88b855ab60c
+DIST meld-1.8.4.tar.xz 421332 SHA256 b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de SHA512 6f03e5e5e57867667a39d41cdb32432f530d7b121c6b9f711fdbac11f7cca714cf2874f8449d19b3808bc9f7d67d0801c615140a64a4b4a012a94a361f75d760 WHIRLPOOL 69d03dad017e7b8d321ca8e0e929b315a8454c71cbb1c76aa597731133a0654c2389326a81a1791387d98b19b115913c8ba40f37cc25cee9eaafafa582e340a5
 EBUILD meld-1.7.0.ebuild 2400 SHA256 ff06b718876b0b8e97af50147513466425e6026f9e9013570fd39fe73a7564ab SHA512 324e7212736463e4cdd96d83efaee92e613225983b4b2737ba0d078953226749f6225fd1b0abbd59e886fd4993a199acf73407603b48c20edc48d89dfc078a00 WHIRLPOOL db36e5e2d22d84ba6511e18f8fad36f4a6eddd52541261e7ff564b6c2e90c9fc55f76fe4c9a44fb2e7f4de99318b111fa697c939544087bc4b47d92ecda8763f
 EBUILD meld-1.8.1.ebuild 1867 SHA256 9ea672b17c1ce569ef28967e8b560b37e1427f86f322d2f8f23fe0f6e9753f08 SHA512 5a8fc2bea6752f4169181abc7788bb16b679ec124079b46f9017b378fcff882bd971c207cad8846572ed7caa07710e3a1a85ecc0e6dcd81955510ec3a03cf28e WHIRLPOOL 74d386e8c5a32766f1ff81db87403e7e00848b244cfc18912304b122b51562ca0fc9938e721a8f6a9fb08423f9f551ac76e7b0c23c5d79b887ceef29100158e6
 EBUILD meld-1.8.2.ebuild 1865 SHA256 8cb6a2b9f22875b13f8cb6325ffa1bcc4dd097e83d47bb23d20153bf55400f43 SHA512 6762bddbbeeac54a18d77cac423f925dcebeac8ccb8ffab89f3b87ff23540ea171280bc7e5c94a48210ab75ff0e923cee01880ba332454d4fcd6c08763691daa WHIRLPOOL 20c6b6cf336961aa5d3be268306cfcf0b1d6944905328b7acb718af0507d3e9cbda5d5327500457f62cf5ab04bc82cd5e199b312daede9ddc5b77a2974c8a226
-MISC ChangeLog 22290 SHA256 b62e26fae065b6eeda27cd7a25f851ea2c25759788542072f755289a03484d25 SHA512 8058b51a67fb9a72aedb1fcc7aeee5367e9e5548d7b94159236eb9d7d2909f51856175081c3a581317cbbaeebf4d797a43d5a9d7b77f5ee7c318fbab851e00cb WHIRLPOOL 8b997128fcd6de07998af1a7a2f95c65326d650968217ff88c0399483236d22458704d6711bc4db10b684479b0033afeaf1884a897a6dace7e75c1c50e37c0f2
+EBUILD meld-1.8.4.ebuild 1865 SHA256 2eeb61cb8a1d7329201fc0cd281da17fa11d3d59750a0fc5679febb9f676ccda SHA512 a6d7b05227cf65de3ac7b72ede403b3762fe0d5bd62fdf476b419390a82b2d09c73a538d3ca302979b1dcb890afba85fe40b3f62d7bb8409518174fe2e4e97c1 WHIRLPOOL ec0613d00ed1829e6c4e9f74c2624c8091bcdb6d417f59f562e3b67b5ea5684048131231c41f33105162a2a59b9391cb5d18e663226a57806e356e7dbaee4fa1
+MISC ChangeLog 22406 SHA256 4f51b4d62256b81e2c5031aa667eb8323bd4d819bf3b851436edd89ce50d95e8 SHA512 aa1066510ed2a8ed804627c088caab7be02d1f4f9d4464981a4bd7f6ba9774f84eb40269f455807141701127727f25e0bc94d2cf6771354c17a6056fe8d02638 WHIRLPOOL 471e5ea60d44e1bdf558e55d95a18f85d6e4d0ae6b931c44c718ad7bc42664274fb0f3ac4c275c2856fd9e0f6272ed730a5055e3e4761c6d51b12a6f3a035b3d
 MISC metadata.xml 283 SHA256 0fbb5afcdbbb0980cb65746202badd7e7712ab658562b787d989a859db9eb46c SHA512 3ba747ef8e1cacacef316e87a7bc2f01fd011b6ae307482c7a6d9dc4b648e2f041fa7ead915feb8cee1157f03dfc4f543624e352d81c17c481624852751ecb7c WHIRLPOOL 018ea24d01bf24185ed27de07b5aa143437625d0aa2bbd05bdd313854b7f865151d8d24bd1e87ecb5da441795d21d3783a0a3893f0baa5a0dbab0ab0ff5e74bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkt/oACgkQCaWpQKGI+9QoowCeIy0yL5ktmfkXt2eg53QUdQwU
-ErEAn1ovOSIPKcKCZ4WL91xCALtzv/W8
-=b2ok
+iEYEAREIAAYFAlL0FGMACgkQ1fmVwcYIWAaBiwCg6in2kViz7yhrkELHEKxP51dq
+RPgAoKU2Fyh0jdOQz87z23v+9sjEG6Bu
+=eujq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.8.4.ebuild b/dev-util/meld/meld-1.8.4.ebuild
new file mode 100644
index 000000000000..37b6ae4387bf
--- /dev/null
+++ b/dev-util/meld/meld-1.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.4.ebuild,v 1.1 2014/02/06 23:01:54 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils python-single-r1 gnome2
+
+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"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: switch 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}
+	app-text/scrollkeeper
+	dev-util/gtk-doc-am
+	dev-util/intltool
+"
+
+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"
+
+	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
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	:
+}
+
+src_install() {
+	gnome2_src_install
+	python_fix_shebang "${ED}"/usr/bin
+	doman meld.1
+}