From 26c7febc344d3ed018f087923211d585ebc1ca5d Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sat, 29 Nov 2008 12:54:03 +0000 Subject: Bump to 1.2.1. UI Tweaks, command line enhancements, handles spaces in svn path. Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64 --- dev-util/meld/ChangeLog | 8 +++++- dev-util/meld/Manifest | 10 ++++--- dev-util/meld/meld-1.2.1.ebuild | 64 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 dev-util/meld/meld-1.2.1.ebuild (limited to 'dev-util') diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 8a7d9f738084..19fb29024338 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.86 2008/11/16 19:33:00 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.87 2008/11/29 12:54:03 eva Exp $ + +*meld-1.2.1 (29 Nov 2008) + + 29 Nov 2008; Gilles Dartiguelongue +meld-1.2.1.ebuild: + Bump to 1.2.1. UI Tweaks, command line enhancements, handles spaces + in svn path. *meld-1.2-r1 (16 Nov 2008) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index a89d6cbf028e..ac636209de47 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -4,17 +4,19 @@ Hash: SHA1 AUX meld-1.2-fr-help-install-fix.patch 819 RMD160 06c6bdfea5346139feb912bc259d750e0b744ae3 SHA1 0338d0331cad4efb4f2a51dd0307ff4be092254d SHA256 d3380b4cb233a66440c5f1738d8fe3b40b508ced7c4e4902d2d22a06ecfbfa30 AUX meld-1.2-wrap-list.patch 3322 RMD160 3e34936ae64ff7c00c6294721f3bd79e2e67e8d4 SHA1 32389e752a947a1b57132dd4f7757c6573479aea SHA256 6c65d11b84be0a6c6ec2b39cc24f68b1f1ce75c8246d5c61b503ef65ea973520 DIST meld-1.1.5.1.tar.bz2 602859 RMD160 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 SHA1 047bc68184ed18d490bc41658c7d2d3d8950696a SHA256 6d415c68670474e2800994bbf4162fa438fca1b1332cc34052d4cb9b8a51bc38 +DIST meld-1.2.1.tar.bz2 699861 RMD160 4b38b786bbe1551a5434c54f00b77556e2f8f8b3 SHA1 8c50e2b03ebc175d771539043c9db3a128373ab8 SHA256 8ed7834a40fa10aaea33981bcc8f9862afd073461a258fe008e16b6b0c156394 DIST meld-1.2.tar.bz2 616975 RMD160 a06fee2f8f882a1edba329bd0be7797f89852920 SHA1 aa246307226332b865216d139c10de4c73562fc1 SHA256 361befb14a0391b21ab9d96ee1ebd93c09246a135c07a0636d6d50895ededc0f EBUILD meld-1.1.5.1-r1.ebuild 1497 RMD160 1be9bf2a35108ae03fc121f621704ec781e183a1 SHA1 22220c6d5414f62c5d79b1b270a02d23fa925f72 SHA256 0f8607da349cf7dde2fe5afec815e70656d12c649cecc5d0421ddb481fb9f7ca EBUILD meld-1.1.5.1.ebuild 1207 RMD160 3ba400cd955be3555f2bea1c0d38906a6aff899f SHA1 a9bfe86a1c653592c9fe8ccae83485a56171e0ef SHA256 55fad28cd6fd96ae958cf9852f675fd99b330916ef9cdeca06707076644abea4 EBUILD meld-1.2-r1.ebuild 1865 RMD160 7cf6cf5b69b845b9c4ed452ca8a245d15160c9de SHA1 8e94e7a4393aeed6d14b6b1c5e64517cfbb5b8be SHA256 2e7cf3903616283f378b58f921b297ced88171604ad7b2a7334b31a04048e648 +EBUILD meld-1.2.1.ebuild 1655 RMD160 61aa93104bed70c82de42d836fd7eac297cf0c8f SHA1 246712edf384c23e7eb6e1b47b996bf26c597624 SHA256 93f953743afb4c7fa16bd6ac998c78541f4a9ac598c4b0f95327a0cdb1847868 EBUILD meld-1.2.ebuild 1779 RMD160 30811a2691cd190d83bc6ba0f2a766a92332fbe7 SHA1 54434bc43f659cd5448085765413865249c3ebe7 SHA256 9e239a735a8f996083f2149decb144559ce73184f1c5507d4bba820600a9649e -MISC ChangeLog 11655 RMD160 d4fd12112e466011d396383e8c88a63131a8228e SHA1 0fff8d97cadf8cc697df5745e8c248eaad4ac76e SHA256 0880810ee3b2fb38b271630c911264dd38eb1ce7b7cade4a0ce1fd5fef7bc451 +MISC ChangeLog 11842 RMD160 3f7debbbd2c898a46163570466a2a699742010e2 SHA1 509d6cf0baa0bd853b5c094124a7a3968e99db98 SHA256 4328dbfef6070e1b8062e6436170ca1152635da07a48d5ca08e4625bd0ea1709 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) -iEYEARECAAYFAkkgg4MACgkQ1fmVwcYIWAbdSACgiPFgewpZWwl0igeiDZsTZATm -y4wAoLScfqzDLDm48g1YZiFz9dictE9P -=Qd9F +iEYEARECAAYFAkkxO3EACgkQ1fmVwcYIWAZefQCfZENaz+9IMqCH7AyiR41RT2nR +/M0AoNkaY7b9oZ+x25i8b9TK5n9SeCBv +=LV3p -----END PGP SIGNATURE----- diff --git a/dev-util/meld/meld-1.2.1.ebuild b/dev-util/meld/meld-1.2.1.ebuild new file mode 100644 index 000000000000..de68e9e931e9 --- /dev/null +++ b/dev-util/meld/meld-1.2.1.ebuild @@ -0,0 +1,64 @@ +# 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.2.1.ebuild,v 1.1 2008/11/29 12:54:03 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.8.0 + >=dev-python/pyorbit-1.99.0 + gnome? ( dev-python/gnome-python-desktop )" + +DEPEND="${RDEPEND} + dev-util/intltool + app-text/scrollkeeper" + +DOCS="AUTHORS 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 + + # don't install anything to /usr/share/doc/meld + sed -i -e "s:\$(docdir)/meld:\$(docdir)/${PF}:" 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 + + strip-linguas -i "${S}/po" + local mylinguas="" + for x in ${LINGUAS}; do + mylinguas="${mylinguas} ${x}.po" + done + + sed -i -e "s/PO:=.*/PO:=${mylinguas}/" po/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 +} -- cgit v1.2.3-65-gdbad