Version bump. Add support for svk.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

3 files changed, 87 insertions, 5 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 5c4b54a494e8..f641f7f47802 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.102 2009/07/27 08:47:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.103 2009/08/31 22:15:43 eva Exp $
+
+*meld-1.3.1 (31 Aug 2009)
+
+  31 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.3.1.ebuild:
+  Version bump. Add support for svk.
 
   27 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.2.1.ebuild,
   -files/meld-1.2-fr-help-install-fix.patch,
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 0fcccd4f08e0..7f0148d3790f 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA1
 
 DIST meld-1.3.0.tar.bz2 799554 RMD160 d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b SHA1 a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75 SHA256 94a6f834ce236fc1efb026fb9a875c8cb51d2c4f82361b0c989bef38ae015bfc
+DIST meld-1.3.1.tar.bz2 795145 RMD160 bf9bace33ddf1d3b6b99e358799316791390cec0 SHA1 d3ab96a364b73afdfd9f26cc9bec18321f04c9df SHA256 d60e735869bb64cc7007466eea3ad639e22eb223c6d5379508ffd0b4f0901647
 EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SHA1 19d14f440d1835890ede7d5d88f031d36f15b1c8 SHA256 6da17b08d0a341012c4515fecf670d2770665c08424105260486176b97c15f42
-MISC ChangeLog 13777 RMD160 ecc144756b97fcbd331c0242eb56164012e14c02 SHA1 30be37ede8fe5813972881badbc52b4b3c736a50 SHA256 27028095bfd24850b97cd98c4ce81b067c6493cfb3d08cfbde9061230e313fed
+EBUILD meld-1.3.1.ebuild 1879 RMD160 b07b348bfaeb2cff7e3be330736adbd22a7c861b SHA1 724ffc0cd8c82f26045416c6f6dc5c4a70927b57 SHA256 6526fee03ee2af00d6d29b2bb3b2b5df389127d2576677dfdaef6347a209be1b
+MISC ChangeLog 13916 RMD160 4843b31c9418c2d89d7bdbd583e115cd3a44036c SHA1 8dd786db2566c0a2bdcbd944e2f6573769a32021 SHA256 8e4829387d1c825a2e234f991eb9c38cce2b4fedc196d4afa8201e0d01ebf154
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkptabsACgkQ1fmVwcYIWAYANgCfT59uu0/VYBGobmoJemKb9FzO
-xMgAoKvia9TGFwvLaA4rS3PevA0nfmLz
-=/0ko
+iEYEARECAAYFAkqcS5UACgkQ1fmVwcYIWAZiFwCgweap5CZeQwb9CDmGAvbz6c65
++v0AoMCgFB1rUFRLD3GrJPdcVSjOSIAL
+=kHNw
 -----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.3.1.ebuild b/dev-util/meld/meld-1.3.1.ebuild
new file mode 100644
index 000000000000..cca4cbc842db
--- /dev/null
+++ b/dev-util/meld/meld-1.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.1.ebuild,v 1.1 2009/08/31 22:15:43 eva Exp $
+
+GCONF_DEBUG="no"
+
+inherit python gnome2 eutils multilib
+
+DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
+HOMEPAGE="http://meld.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=gnome-base/libglade-2
+	gnome? (
+		>=gnome-base/libgnome-2
+		>=dev-python/libgnome-python-2.22
+		>=dev-python/gconf-python-2.22
+		>=dev-python/gnome-vfs-python-2.22 )
+	>=dev-python/pygtk-2.8.0
+	>=dev-python/pygobject-2.8"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	app-text/scrollkeeper"
+
+DOCS="AUTHORS NEWS help/ChangeLog"
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix the prefix so its not in */local/*
+	sed -e 's:/usr/local:/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"
+
+	# let the python eclass handle python objects
+	sed -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' \
+		-i GNUmakefile || die "sed 3 failed"
+
+	# don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
+	sed -e '/scrollkeeper-update/s/\t/&#/' \
+		-i help/*/GNUmakefile || 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/GNUmakefile || die "sed 5 failed"
+	fi
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/meld
+}