diff options
author | John N. Laliberte <allanonjl@gentoo.org> | 2005-07-03 23:43:14 +0000 |
---|---|---|
committer | John N. Laliberte <allanonjl@gentoo.org> | 2005-07-03 23:43:14 +0000 |
commit | 9687a75b35ef2b82601baa7e6bee31bff5ecc0c9 (patch) | |
tree | 1343f6af032b687841daf550dcdad62c39806415 /dev-util | |
parent | depend on cervisia (diff) | |
download | historical-9687a75b35ef2b82601baa7e6bee31bff5ecc0c9.tar.gz historical-9687a75b35ef2b82601baa7e6bee31bff5ecc0c9.tar.bz2 historical-9687a75b35ef2b82601baa7e6bee31bff5ecc0c9.zip |
new 1.0.0 version. large changes to the ebuild to make it much easier to handle. submitted patch upstream for the fr.po file.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/meld/ChangeLog | 9 | ||||
-rw-r--r-- | dev-util/meld/Manifest | 5 | ||||
-rw-r--r-- | dev-util/meld/files/digest-meld-1.0.0 | 1 | ||||
-rw-r--r-- | dev-util/meld/files/meld-1.0.0-frpo.patch | 10 | ||||
-rw-r--r-- | dev-util/meld/meld-1.0.0.ebuild | 77 |
5 files changed, 100 insertions, 2 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 832042610ee6..dcfd8a73cef1 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/meld # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.22 2005/07/03 20:36:36 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.23 2005/07/03 23:43:14 allanonjl Exp $ + +*meld-1.0.0 (03 Jul 2005) + + 03 Jul 2005; John N. Laliberte <allanonjl@gentoo.org> + +files/meld-1.0.0-frpo.patch, +meld-1.0.0.ebuild: + new 1.0.0 version. large changes to the ebuild to make it much easier to + handle. submitted patch upstream for the fr.po file. *meld-0.9.5 (02 Jul 2005) diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 304e16e7b702..e5108b5161d3 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,10 +1,13 @@ MD5 96ed5fd3c9961f4e4787f897e666bddb meld-0.9.2.ebuild 1538 MD5 46b08e3752195ea4162e574e4fa5dff8 meld-0.9.4.1.ebuild 1785 -MD5 1675df734c0ee0b201b90151b5edd4f4 ChangeLog 3388 +MD5 867399dd526e551bc6b18dac48ac949f meld-1.0.0.ebuild 1924 +MD5 a7961639d46140d2d31f1c50d561025a ChangeLog 3654 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222 MD5 eeabce0c4942083a42738302deb53c3c meld-0.9.4.1-r1.ebuild 2071 MD5 d84b937a4b699901bd79b64c52a7a4c5 meld-0.9.5.ebuild 1996 +MD5 e2cf0267e1fb705025019ee2840d509b files/meld-1.0.0-frpo.patch 377 MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1-r1 65 MD5 a594b965f0dc8995e79d245c4cb37fd3 files/digest-meld-0.9.4.1 65 MD5 204fd0bd70dc55fec4d8b060a3165d94 files/digest-meld-0.9.2 63 MD5 f5c312891794c9078a4c034256c3901c files/digest-meld-0.9.5 63 +MD5 1bd76e477a20630600aeb1d8ff952dc7 files/digest-meld-1.0.0 63 diff --git a/dev-util/meld/files/digest-meld-1.0.0 b/dev-util/meld/files/digest-meld-1.0.0 new file mode 100644 index 000000000000..2712553dbca4 --- /dev/null +++ b/dev-util/meld/files/digest-meld-1.0.0 @@ -0,0 +1 @@ +MD5 ccde817f0396d39e9e40f31a3a7611f6 meld-1.0.0.tar.bz2 304181 diff --git a/dev-util/meld/files/meld-1.0.0-frpo.patch b/dev-util/meld/files/meld-1.0.0-frpo.patch new file mode 100644 index 000000000000..4f8528563f09 --- /dev/null +++ b/dev-util/meld/files/meld-1.0.0-frpo.patch @@ -0,0 +1,10 @@ +--- meld-1.0.0.old/po/fr.po 2005-07-03 18:41:20.000000000 -0400 ++++ meld-1.0.0/po/fr.po 2005-07-03 18:40:45.000000000 -0400 +@@ -15,6 +15,7 @@ + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Generated-By: pygettext.py 1.5\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" + + #: ../meld.desktop.in.h:1 + msgid "Compare and merge your files." diff --git a/dev-util/meld/meld-1.0.0.ebuild b/dev-util/meld/meld-1.0.0.ebuild new file mode 100644 index 000000000000..23c1270247f4 --- /dev/null +++ b/dev-util/meld/meld-1.0.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.0.0.ebuild,v 1.1 2005/07/03 23:43:14 allanonjl Exp $ + +inherit python gnome2 eutils + +DESCRIPTION="A graphical (GNOME 2) diff and merge tool" +HOMEPAGE="http://meld.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64" +IUSE="doc" + +DEPEND=">=dev-lang/python-2.2 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=dev-python/gnome-python-1.99.15 + >=dev-python/pygtk-1.99.15 + >=dev-python/pyorbit-1.99.0 + dev-python/gnome-python-extras + " + +#MAKEOPTS="${MAKEOPTS} -j1" + +pkg_setup() { + + if ! built_with_use pygtk gnome ; then + einfo "" + einfo "Meld requires pygtk be built with the gnome use flag set." + einfo "Please re-emerge pygtk with the gnome use flag set." + einfo "" + die "You need to re-emerge pygtk with gnome use flag." + fi + # same check for gnome-python-extras with gtkhtml + if ! built_with_use gnome-python-extras gtkhtml ; then + einfo "" + einfo "Meld requires gnome-python-extras be built " + einfo "with gtkhtml use flag set to enable line " + einfo "numbering and source highlighting. " + einfo "" + einfo "You need to re-emerge gnome-python-extras " + einfo "with gtkhtml use flag." + fi +} + +src_unpack() { + + unpack ${A} + cd ${S} + # Fix the .desktop icon name + sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in + + # error in fr.po, sent upstream + epatch ${FILESDIR}/meld-1.0.0-frpo.patch + + # fix omf scrollkeeper + sed -i -e 's:-scrollkeeper-install.*::' ./help/C/GNUmakefile + + # fix the prefix so its not in */local/* + sed -i -e 's:/usr/local:/usr:' INSTALL +} + +src_compile() { + emake || die "make failed" +} + +USE_DESTDIR="1" +DOCS="AUTHORS COPYING INSTALL README.CVS changelog help/" + +pkg_postinst() { + python_mod_optimize /usr/lib/meld +} + +pkg_postrm() { + python_mod_cleanup /usr/lib/meld +} |