From 08575acc62c73e31887e2b6a504b450da035c4ce Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 25 Jul 2011 10:53:54 +0000 Subject: [PATCH] Version bump. Package-Manager: portage-2.1.10.6/cvs/Linux x86_64 --- dev-util/meld/ChangeLog | 7 ++- dev-util/meld/Manifest | 10 ++-- dev-util/meld/meld-1.5.2.ebuild | 95 +++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 dev-util/meld/meld-1.5.2.ebuild diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 152e9c84f765..2383c926a4b2 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/meld # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.127 2011/07/17 20:51:34 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.128 2011/07/25 10:53:54 pacho Exp $ + +*meld-1.5.2 (25 Jul 2011) + + 25 Jul 2011; Pacho Ramos +meld-1.5.2.ebuild: + Version bump. 17 Jul 2011; Markus Meier meld-1.5.1.ebuild: arm stable, bug #369909 diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 910d2835d90f..52b869912bac 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -3,14 +3,16 @@ Hash: SHA1 DIST meld-1.5.0.tar.bz2 330845 RMD160 c88302518e924287e68fff0fd7a9c1815dc35753 SHA1 53632204635807b6c3c0eba1d2fbb3b69ba2c13a SHA256 35e75eb3f7b89a6a8a71fafa1e9f0049bc9facd18b0a2a2c54d5d911d098c0cd DIST meld-1.5.1.tar.bz2 343099 RMD160 2ebce6f9209295fe67d7e471c8ecac844c9dbc97 SHA1 cf87316307bd3511ba79b5b9144efed87f0edef3 SHA256 822936d58adee8e7dcf6a7872d08803adb190746bf8ac26a23996d58561e727a +DIST meld-1.5.2.tar.xz 326260 RMD160 a6dc1b37ea7e1571eee03deffd1343a7d5de826d SHA1 84af8c5c45a321edb25f676d8796aff9e650ab3d SHA256 bddd8322437fc4d5cf0d17e6f7e85ee273d86275a209640813d0e2451d9e2b17 EBUILD meld-1.5.0.ebuild 2380 RMD160 45c8fd5d682ebc149824c2e54eb2fa3236537f1b SHA1 ff73fa8d55ebad759a39ba635275f6a982edf8b5 SHA256 1f8b04ee58cffac66cac1adab5d07b49522b0e7f2527a1a284d1a4de7803eb99 EBUILD meld-1.5.1.ebuild 2366 RMD160 276f265c10d09ef4668b7f177a61e26ea06ec2f5 SHA1 8c18d9b581849b7c705b12da00be186367bba5c5 SHA256 1cfcbb3de168b2d053014a9f4bebf6dbb2eb734ad633c45c2b4d018da00e870f -MISC ChangeLog 16884 RMD160 f55999051cdd99c4b85d80914176178e7b0eb8a5 SHA1 bc2380d018cc74b9c69987e3edf1ccf47398cb4b SHA256 1554cd7dd737f8180da1863e40f390864076446149b32c7b3439d55c1acb1c9d +EBUILD meld-1.5.2.ebuild 2406 RMD160 221e8512c7105970ae35e9181dcc3a3f601fd123 SHA1 0599ae4a0917736e98aece00b92a6bc481efd374 SHA256 a0a1abcbf35dfe9730904a51b064c2deefbee6b290afd0423547b4d2f1f1b7cf +MISC ChangeLog 16993 RMD160 0ceb9871d36f3bd4a1ce324784b1bc9c4d39dd77 SHA1 d3469da2ace56a16606d3e06db08e9713d9f96bf SHA256 9c2f6f67e21d60180c1213bab8f5d3776c702d0bcde162f6a43d69a4d98589f3 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4jS3wACgkQkKaRLQcq0GKFngCdE0rs6qeJzSu2X0pi3tlK3C5N -8qgAn3aGrIv3fwptbHBcfjbBalen1OvZ -=kp7B +iEYEARECAAYFAk4tS0gACgkQCaWpQKGI+9TzjQCfXXviGJslFT+ZeuNleMbc+2Lp +keYAn2zAmldhxufMQ43tzjWZ4C4btU+i +=wL7y -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.5.2.ebuild b/dev-util/meld/meld-1.5.2.ebuild new file mode 100644 index 000000000000..9787f347021a --- /dev/null +++ b/dev-util/meld/meld-1.5.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.2.ebuild,v 1.1 2011/07/25 10:53:54 pacho Exp $ + +EAPI="3" +GNOME_TARBALL_SUFFIX="xz" +GCONF_DEBUG="no" +PYTHON_DEPEND="2:2.5" + +inherit python gnome2 eutils multilib + +DESCRIPTION="A graphical 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=" + >=dev-python/pygtk-2.14:2 + >=dev-python/pygobject-2.8:2 + gnome? ( >=dev-python/gconf-python-2.22:2 ) +" +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, upstream bug #655251 + 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 +} -- 2.26.2