From b1d88b50bd89f46f79df72f9fa7d1a26558be49b Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 11 Feb 2008 22:40:50 +0000 Subject: [PATCH] * fix python eclass use, bug #207667 Package-Manager: portage-2.1.4.1 --- dev-util/meld/ChangeLog | 8 ++++- dev-util/meld/Manifest | 13 ++++++- dev-util/meld/meld-1.1.5.1-r1.ebuild | 53 ++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 dev-util/meld/meld-1.1.5.1-r1.ebuild diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 6275091260e1..18fa735de3ee 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.72 2008/01/18 12:40:10 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.73 2008/02/11 22:40:50 eva Exp $ + +*meld-1.1.5.1-r1 (11 Feb 2008) + + 11 Feb 2008; Gilles Dartiguelongue + +meld-1.1.5.1-r1.ebuild: + fix python eclass use, bug #207667 18 Jan 2008; Rémi Cardona meld-1.1.5.1.ebuild: add intltool dep (fixes bug #206238) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 433f8ecb0ef7..097d7cfb1f04 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38 +EBUILD meld-1.1.5.1-r1.ebuild 1393 RMD160 a01c2041c32dd2bf2f63a109598ad457f652111d SHA1 a94d926c4f7c10ac42304331f43900ec8a994580 SHA256 5299b6ae3849bb7886f07d41c3f61f4a92ab3439b89d416d2b420a2f7f273a88 EBUILD meld-1.1.5.1.ebuild 1175 RMD160 4f18994198a61706cc98e858cbfabd6ddafc8e57 SHA1 610b451cead5c82637194f475241439f74d7c4c7 SHA256 f6b407197ebea959cc68b51a5446d2945ff2877a2fa97e2870d111f708b69bb0 -MISC ChangeLog 9881 RMD160 8b0441cbb6c8385bf94f7789b822bb0d7cd7cc1a SHA1 3264e3e7fc884c990e12000628b90bfe69c834d6 SHA256 cc3fa331bd44bf7a12647c857f31c12825dba7f9f4356037b5beb75a5f8e0bb5 +MISC ChangeLog 10031 RMD160 d9e84cef8ef5ebd9691fd30129a40ef0b179da19 SHA1 a3d6857d6a90143083e4661c77760dc3749cfa24 SHA256 784b73088ab6115f3d5bc97b44d39a895376c38c763409da426778a3ca24f2bb MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHsM771fmVwcYIWAYRAvhtAJ45k1yQmBnEZEqXqdXMd8BoIIMeWACfaFG6 +FKDFLynZ7Xm3C7ud0/p+/08= +=rwu8 +-----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.1.5.1-r1.ebuild b/dev-util/meld/meld-1.1.5.1-r1.ebuild new file mode 100644 index 000000000000..ff2deb26c313 --- /dev/null +++ b/dev-util/meld/meld-1.1.5.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.5.1-r1.ebuild,v 1.1 2008/02/11 22:40:50 eva Exp $ + +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 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc gnome" + +RDEPEND=">=dev-lang/python-2.3 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=dev-python/gnome-python-2.6.0 + >=dev-python/pygtk-2.6.0 + >=dev-python/pyorbit-1.99.0 + gnome? ( dev-python/gnome-python-desktop )" + +DEPEND="${RDEPEND} + dev-util/intltool + app-text/scrollkeeper" + +DOCS="AUTHORS README.CVS changelog help/" + +src_unpack() { + gnome2_src_unpack + + # fix the prefix so its not in */local/* + sed -i -e 's:/usr/local:/usr:' INSTALL + sed -i -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):" INSTALL + + # let the python eclass handle python objects + sed -i -e '/$(PYTHON) .* .import compileall;/s/\t/&#/g' GNUmakefile + + # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833 + sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile +} + +src_compile() { + emake || die "make failed" +} + +pkg_postinst() { + python_mod_optimize /usr/$(get_libdir)/meld +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/meld +} -- 2.26.2