Version bump.

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

3 files changed, 99 insertions, 2 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 130e31a3da1f..cf08a5dd6114 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.109 2010/09/09 13:34:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.110 2010/09/13 20:58:17 eva Exp $
+
+*meld-1.3.3 (13 Sep 2010)
+
+  13 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.3.3.ebuild:
+  Version bump.
 
   09 Sep 2010; Brent Baude <ranger@gentoo.org> meld-1.3.1.ebuild:
   Marking meld-1.3.1 ppc64 for bug 320271
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index da1a5be33bc3..ce54646c7d65 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST meld-1.3.2.tar.bz2 741154 RMD160 7ff1bbbb46448366693f9095c7687fde7b952bd2 SHA1 1cb5174385365127d5b2e02343c73fc01c8a89ef SHA256 c2868f902c4e6eaa3a02c623fbe1c9277a64aad133030ef7fda1e34baff32fc9
+DIST meld-1.3.3.tar.bz2 333460 RMD160 2041864c14be2fc2c10f82ac300da80c9a51272c SHA1 2f0555a69430e4ab4bd9c0b69beb0658daa2132f SHA256 bfdf9a5e33a7ebc5b976fbd2925033e2bbd46e8f632437959b88aac35676d08a
 EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SHA1 19d14f440d1835890ede7d5d88f031d36f15b1c8 SHA256 6da17b08d0a341012c4515fecf670d2770665c08424105260486176b97c15f42
 EBUILD meld-1.3.1.ebuild 1874 RMD160 7ee313ceca2f9ffd4dfc772a70adc9657bd7dad6 SHA1 70d7204d2906ee698d821f235ed6aff047e593e0 SHA256 9764fbe9bbf6c1457409d246371119070e6b011f86294f02571c8050ee263d56
 EBUILD meld-1.3.2.ebuild 2044 RMD160 657d3857938b8f04f309e25b80bebcea003e6bfb SHA1 09a8879daa9c23c896712a4ccf9c8bb5d95d27ae SHA256 51b7815794b423ec17e21779dae411fbeb241195ac0a392e505102681486e617
-MISC ChangeLog 14543 RMD160 8e65053f13c335440614de59173bb57f5a05ad17 SHA1 4712c50c60a68ca12087bcd9fde22c69ca93ee3e SHA256 bb275ff2ced01e962081acd7743e33bb0b0c4711f05edd85a260d0fc25da39ef
+EBUILD meld-1.3.3.ebuild 2038 RMD160 6fdb490c7572f2069b11d7b39d19f08febb80fc5 SHA1 8856d59afa9ea52594ccba282c4b1f6a1eca93de SHA256 019e1aa6a8f79b4c4bd9b354526a7badda2a3cbada2f74f1e3cfa953d3a96076
+MISC ChangeLog 14658 RMD160 419a45f79e393fa7a11916e552385916fe92c300 SHA1 528b9a15de80d4ebdd1fcef7e413a55daf238e22 SHA256 5bf00411fd87998d8feb3052a16b80159ea1f3307ba140475708d44a5feae16d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyOkG4ACgkQ1fmVwcYIWAbZwACgyoynlhp1Gl7KR+AbQ2ZBrrVv
+pFsAoJPSemkK0ZMAOybhGgJ9b/OWAeqU
+=vOYH
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.3.3.ebuild b/dev-util/meld/meld-1.3.3.ebuild
new file mode 100644
index 000000000000..39b8e05f8b0f
--- /dev/null
+++ b/dev-util/meld/meld-1.3.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.3.ebuild,v 1.1 2010/09/13 20:58:17 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
+	>=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 Makefile || 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/*/Makefile || die "sed 4 failed"
+
+	# fix test suite
+	sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \
+		-e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \
+		-i tools/check_release || 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 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
+}