summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-08-29 15:48:12 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-08-29 15:48:12 +0000
commitb7a785ccc997f224c442aabf188497404b451b11 (patch)
tree7a6ae66a5df6cb7b293e90147652917729589554
parentDrop sparc keyword (diff)
downloadhistorical-b7a785ccc997f224c442aabf188497404b451b11.tar.gz
historical-b7a785ccc997f224c442aabf188497404b451b11.tar.bz2
historical-b7a785ccc997f224c442aabf188497404b451b11.zip
Version bump, bug #326409.
Package-Manager: portage-2.2_rc68/cvs/Linux x86_64
-rw-r--r--dev-util/meld/ChangeLog7
-rw-r--r--dev-util/meld/Manifest14
-rw-r--r--dev-util/meld/meld-1.3.2.ebuild80
3 files changed, 99 insertions, 2 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 602f5d73492a..2002ac59188a 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.107 2010/06/19 16:55:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.108 2010/08/29 15:48:12 eva Exp $
+
+*meld-1.3.2 (29 Aug 2010)
+
+ 29 Aug 2010; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.3.2.ebuild:
+ Version bump, bug #326409.
19 Jun 2010; Raúl Porcel <armin76@gentoo.org> meld-1.3.1.ebuild:
alpha/arm/ia64/sparc stable wrt #320271
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 5416cfddf5cc..bfd824003de9 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,6 +1,18 @@
+-----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
EBUILD meld-1.3.0.ebuild 1852 RMD160 8d28d2e8bfd76f4a27d788ca5f660bdc1a421eaa SHA1 19d14f440d1835890ede7d5d88f031d36f15b1c8 SHA256 6da17b08d0a341012c4515fecf670d2770665c08424105260486176b97c15f42
EBUILD meld-1.3.1.ebuild 1876 RMD160 4457456bd672eae2bcd114b4bde3a62c18b8a08b SHA1 e57f7fcf177d5a33b2f5389b7a45f6aa3316aa43 SHA256 a98ad1bad79703d9f36c1af9b87a98373c570865bcc9156ed7c4a17444744784
-MISC ChangeLog 14304 RMD160 5f5d056305d4c2f322efbbc06e97be900bb12b3b SHA1 cae64412a9cea398a1bec7f933897598fa794274 SHA256 c88b8af6d075c3c768def6c72b00c0cc77b7bde187cf14b35fc3107027b7c93a
+EBUILD meld-1.3.2.ebuild 2039 RMD160 fc658dbc7680ca81e94aa02484db3d1ab2c4a061 SHA1 374537bbe703bb45ed63dfd2c32272a30fffead1 SHA256 c2d623859559430b481ee415dbbbf33360b431862581747bc65206d3b0d637a8
+MISC ChangeLog 14431 RMD160 1cde17f8f5d44010a50ebff852732b3e2d133138 SHA1 3949a907c594666f66e943170b68c9ed30c8ce7b SHA256 f0a31d744bc0458e34172a7d68fa5c72b557b1a3113ff91076fdf129c02885d0
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkx6gU4ACgkQ1fmVwcYIWAZttgCfVFmdB55M1N+gTeKSMSWd88Ll
+MukAoNJlFLUU2xT6q6ECNJ7rq/fzsi3v
+=OLmX
+-----END PGP SIGNATURE-----
diff --git a/dev-util/meld/meld-1.3.2.ebuild b/dev-util/meld/meld-1.3.2.ebuild
new file mode 100644
index 000000000000..d9bfc9db4909
--- /dev/null
+++ b/dev-util/meld/meld-1.3.2.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.2.ebuild,v 1.1 2010/08/29 15:48:12 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
+}