From 652b84ebae0248a132261fcc61cbf2ea7688a1c2 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 31 Dec 2010 18:29:35 +0000 Subject: Version bump, no longer uses gnome-vfs, requires at least python-2.5 and other fixes. Package-Manager: portage-2.1.9.27/cvs/Linux x86_64 --- dev-util/meld/ChangeLog | 8 +++- dev-util/meld/Manifest | 10 +++-- dev-util/meld/meld-1.5.0.ebuild | 98 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 dev-util/meld/meld-1.5.0.ebuild (limited to 'dev-util/meld') diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 6e8f07fcbfbf..c7d8b71cb5ec 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # 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.115 2010/11/23 16:12:05 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.116 2010/12/31 18:29:35 pacho Exp $ + +*meld-1.5.0 (31 Dec 2010) + + 31 Dec 2010; Pacho Ramos +meld-1.5.0.ebuild: + Version bump, no longer uses gnome-vfs, requires at least python-2.5 and + other fixes. 23 Nov 2010; Gilles Dartiguelongue -meld-1.3.0.ebuild, -meld-1.3.2.ebuild, -meld-1.3.3.ebuild: diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 148157fd6dfb..f4a06cf85e2d 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -3,14 +3,16 @@ Hash: SHA1 DIST meld-1.3.1.tar.bz2 795145 RMD160 bf9bace33ddf1d3b6b99e358799316791390cec0 SHA1 d3ab96a364b73afdfd9f26cc9bec18321f04c9df SHA256 d60e735869bb64cc7007466eea3ad639e22eb223c6d5379508ffd0b4f0901647 DIST meld-1.4.0.tar.bz2 333793 RMD160 5e244b450cd1a11b8eeb8176a77043a0a6eff63a SHA1 2db6d610f1d1e2ef2bd0e0027695e72f6f6a6ac9 SHA256 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469 +DIST meld-1.5.0.tar.bz2 330845 RMD160 c88302518e924287e68fff0fd7a9c1815dc35753 SHA1 53632204635807b6c3c0eba1d2fbb3b69ba2c13a SHA256 35e75eb3f7b89a6a8a71fafa1e9f0049bc9facd18b0a2a2c54d5d911d098c0cd EBUILD meld-1.3.1.ebuild 1874 RMD160 7ee313ceca2f9ffd4dfc772a70adc9657bd7dad6 SHA1 70d7204d2906ee698d821f235ed6aff047e593e0 SHA256 9764fbe9bbf6c1457409d246371119070e6b011f86294f02571c8050ee263d56 EBUILD meld-1.4.0.ebuild 2485 RMD160 f331d6dcb85a5ad5784c70ebac5c48d7d4e0f674 SHA1 22d65a6d201b27f20312bf75a42d845cc05605a5 SHA256 813eb00c38b01594ef036a0f62464a9060faebe6d3ede8e95fff4768f052b880 -MISC ChangeLog 15354 RMD160 199eb2e75845f6cae1ca8d4b4caa46acc1ec1657 SHA1 e360261d5c279b15dd24ea9c8f71acb8d7a50f85 SHA256 c5894781ded32945d26ee885d534b56f89d3924cffb763557a62984717071ab2 +EBUILD meld-1.5.0.ebuild 2451 RMD160 ba91006c768259d6d771473b23224dc9124fe5de SHA1 749838f67796897d88e7aeb805ef8f5392ec7cd8 SHA256 a3fb899f79d304d5319613163150b62ea2f9feabe5f60d37877af2895d99f480 +MISC ChangeLog 15540 RMD160 cfb77cac641106169dfcd1aa5709119c432d644e SHA1 3173fc3849766dcd8d3989feb9d019855ca431c3 SHA256 4f0ec597d752a2f54054f75c0f19194be53de91cb62ebc3a2d621faa918eb768 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkzr5+gACgkQ1fmVwcYIWAbPAgCgz8zedIAWJeUm6do8DemnaojC -mmgAnRb9ElZvgOW5ZBDxwQTIDQu0Hs34 -=+yY/ +iEYEARECAAYFAk0eIRkACgkQCaWpQKGI+9SrBgCeOKypZC7dXL4oKsYlg9Rlx5gV +wVMAn1Rr7RZRGyWh5rOU7LM5WrnxMRRT +=tY2V -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.5.0.ebuild b/dev-util/meld/meld-1.5.0.ebuild new file mode 100644 index 000000000000..2c0e05d3ffe4 --- /dev/null +++ b/dev-util/meld/meld-1.5.0.ebuild @@ -0,0 +1,98 @@ +# 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.5.0.ebuild,v 1.1 2010/12/31 18:29:35 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" +PYTHON_DEPEND="2:2.5" + +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 ~amd64-linux ~x86-linux" +IUSE="doc gnome" + +RDEPEND=" + >=gnome-base/libglade-2 + >=dev-python/pygtk-2.14 + >=dev-python/pygobject-2.8 + gnome? ( + >=gnome-base/libgnome-2 + >=dev-python/libgnome-python-2.22 + >=dev-python/gconf-python-2.22 ) +" +DEPEND="${RDEPEND} + dev-util/intltool + app-text/scrollkeeper" + +pkg_setup() { + DOCS="AUTHORS NEWS help/ChangeLog" + # Needed for optimizing python modules against proper interpreter + python_set_active_version 2 +} + +src_prepare() { + gnome2_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" + + # 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" + + # replace all calls to python by specific major version + sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \ + -i INSTALL || die "sed 6 failed" + python_convert_shebangs 2 "${S}"/tools/* + + 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_configure() { + : +} + +src_install() { + gnome2_src_install + python_convert_shebangs 2 "${ED}"usr/bin/meld +} + +pkg_postinst() { + gnome2_pkg_postinst + python_mod_optimize /usr/$(get_libdir)/meld +} + +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup /usr/$(get_libdir)/meld +} -- cgit v1.2.3-65-gdbad