Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-util/meld/ChangeLog7
-rw-r--r--dev-util/meld/files/digest-meld-1.1.4-r13
-rw-r--r--dev-util/meld/files/fix-po.patch185
-rw-r--r--dev-util/meld/files/meld-1.1.4-syntax.patch41
-rw-r--r--dev-util/meld/meld-1.1.4-r1.ebuild57
5 files changed, 6 insertions, 287 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index e4a173e75cc3..580d27965d84 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/meld
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.69 2007/07/30 07:20:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.70 2007/07/30 07:27:23 leio Exp $
+
+ 30 Jul 2007; Mart Raudsepp <leio@gentoo.org>
+ -files/meld-1.1.4-syntax.patch, -files/fix-po.patch,
+ -meld-1.1.4-r1.ebuild:
+ Remove old
30 Jul 2007; Christian Faulhammer <opfer@gentoo.org> meld-1.1.5.1.ebuild:
stable x86, bug 186773
diff --git a/dev-util/meld/files/digest-meld-1.1.4-r1 b/dev-util/meld/files/digest-meld-1.1.4-r1
deleted file mode 100644
index 86dc17b3f05c..000000000000
--- a/dev-util/meld/files/digest-meld-1.1.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e780a8f67183acf7f51b13aa4a62ac85 meld-1.1.4.tar.bz2 599912
-RMD160 ae327557458cae31660d3c30bcd6640f0406f1fa meld-1.1.4.tar.bz2 599912
-SHA256 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f meld-1.1.4.tar.bz2 599912
diff --git a/dev-util/meld/files/fix-po.patch b/dev-util/meld/files/fix-po.patch
deleted file mode 100644
index 12915d61cdb1..000000000000
--- a/dev-util/meld/files/fix-po.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- po/ru.po.orig 2006/08/27 09:11:02 1.1
-+++ po/ru.po 2006/08/27 09:11:53
-@@ -190,57 +190,57 @@
- #, python-format
- msgid "%i second"
- msgid_plural "%i seconds"
--msgstr[0] "секунда"
--msgstr[1] "секунды"
--msgstr[2] "секунд"
-+msgstr[0] "%i секунда"
-+msgstr[1] "%i секунды"
-+msgstr[2] "%i секунд"
-
- #: ../dirdiff.py:571
- #, python-format
- msgid "%i minute"
- msgid_plural "%i minutes"
--msgstr[0] "минута"
--msgstr[1] "минуты"
--msgstr[2] "минут"
-+msgstr[0] "%i минута"
-+msgstr[1] "%i минуты"
-+msgstr[2] "%i минут"
-
- #: ../dirdiff.py:572
- #, python-format
- msgid "%i hour"
- msgid_plural "%i hours"
--msgstr[0] "час"
--msgstr[1] "часа"
--msgstr[2] "часов"
-+msgstr[0] "%i час"
-+msgstr[1] "%i часа"
-+msgstr[2] "%i часов"
-
- #: ../dirdiff.py:573
- #, python-format
- msgid "%i day"
- msgid_plural "%i days"
--msgstr[0] "день"
--msgstr[1] "дня"
--msgstr[2] "дней"
-+msgstr[0] "%i день"
-+msgstr[1] "%i дня"
-+msgstr[2] "%i дней"
-
- #: ../dirdiff.py:574
- #, python-format
- msgid "%i week"
- msgid_plural "%i weeks"
--msgstr[0] "неделя"
--msgstr[1] "недели"
--msgstr[2] "недель"
-+msgstr[0] "%i неделя"
-+msgstr[1] "%i недели"
-+msgstr[2] "%i недель"
-
- #: ../dirdiff.py:575
- #, python-format
- msgid "%i month"
- msgid_plural "%i months"
--msgstr[0] "месяц"
--msgstr[1] "месяца"
--msgstr[2] "месяцев"
-+msgstr[0] "%i месяц"
-+msgstr[1] "%i месяца"
-+msgstr[2] "%i месяцев"
-
- #: ../dirdiff.py:576
- #, python-format
- msgid "%i year"
- msgid_plural "%i years"
--msgstr[0] "год"
--msgstr[1] "года"
--msgstr[2] "лет"
-+msgstr[0] "%i год"
-+msgstr[1] "%i года"
-+msgstr[2] "%i лет"
-
- #. Abbreviation for insert,overwrite so that it will fit in the status bar
- #: ../filediff.py:224
---- po/hu.po.orig 2006-02-24 19:19:25.000000000 -0500
-+++ po/hu.po 2006-09-11 13:18:43.000000000 -0400
-@@ -99,49 +99,42 @@
- msgid "%i second"
- msgid_plural "%i seconds"
- msgstr[0] "%i másodperc"
--msgstr[1] "%i másodperc"
-
- #: ../dirdiff.py:570
- #, python-format
- msgid "%i minute"
- msgid_plural "%i minutes"
- msgstr[0] "%i perc"
--msgstr[1] "%i perc"
-
- #: ../dirdiff.py:571
- #, python-format
- msgid "%i hour"
- msgid_plural "%i hours"
- msgstr[0] "%i óra"
--msgstr[1] "%i óra"
-
- #: ../dirdiff.py:572
- #, python-format
- msgid "%i day"
- msgid_plural "%i days"
- msgstr[0] "%i nap"
--msgstr[1] "%i nap"
-
- #: ../dirdiff.py:573
- #, python-format
- msgid "%i week"
- msgid_plural "%i weeks"
- msgstr[0] "%i hét"
--msgstr[1] "%i hét"
-
- #: ../dirdiff.py:574
- #, python-format
- msgid "%i month"
- msgid_plural "%i months"
- msgstr[0] "%i hónap"
--msgstr[1] "%i hónap"
-
- #: ../dirdiff.py:575
- #, python-format
- msgid "%i year"
- msgid_plural "%i years"
- msgstr[0] "%i év"
--msgstr[1] "%i év"
-
- #. Abbreviation for insert,overwrite so that it will fit in the status bar
- #: ../filediff.py:214
---- po/ja.po.orig 2006-03-05 06:03:44.000000000 -0500
-+++ po/ja.po 2006-09-11 13:19:58.000000000 -0400
-@@ -97,49 +97,42 @@
- msgid "%i second"
- msgid_plural "%i seconds"
- msgstr[0] "%i 秒"
--msgstr[1] "%i 秒"
-
- #: ../dirdiff.py:570
- #, python-format
- msgid "%i minute"
- msgid_plural "%i minutes"
- msgstr[0] "%i 分"
--msgstr[1] "%i 分"
-
- #: ../dirdiff.py:571
- #, python-format
- msgid "%i hour"
- msgid_plural "%i hours"
- msgstr[0] "%i 時間"
--msgstr[1] "%i 時間"
-
- #: ../dirdiff.py:572
- #, python-format
- msgid "%i day"
- msgid_plural "%i days"
- msgstr[0] "%i 日"
--msgstr[1] "%i 日"
-
- #: ../dirdiff.py:573
- #, python-format
- msgid "%i week"
- msgid_plural "%i weeks"
- msgstr[0] "%i 週間"
--msgstr[1] "%i 週間"
-
- #: ../dirdiff.py:574
- #, python-format
- msgid "%i month"
- msgid_plural "%i months"
- msgstr[0] "%i ヶ月"
--msgstr[1] "%i ヶ月"
-
- #: ../dirdiff.py:575
- #, python-format
- msgid "%i year"
- msgid_plural "%i years"
- msgstr[0] "%i 年"
--msgstr[1] "%i 年"
-
- #. Abbreviation for insert,overwrite so that it will fit in the status bar
- #: ../filediff.py:215
diff --git a/dev-util/meld/files/meld-1.1.4-syntax.patch b/dev-util/meld/files/meld-1.1.4-syntax.patch
deleted file mode 100644
index 9c8b6431a307..000000000000
--- a/dev-util/meld/files/meld-1.1.4-syntax.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN meld-1.1.4.orig/filediff.py meld-1.1.4/filediff.py
---- meld-1.1.4.orig/filediff.py 2006-05-27 18:45:47.000000000 -0400
-+++ meld-1.1.4/filediff.py 2007-03-02 11:37:55.000000000 -0500
-@@ -45,30 +45,15 @@ for sourceview in "gtksourceview sourcev
- pass
-
- if sourceview_available:
-+ import gnomevfs
- def set_highlighting_enabled(buf, fname, enabled):
-- # gnome.vfs.get_mime_type seems to be broken. fake it.
-- extmap = { "xml":"text/xml",
-- "glade":"text/xml",
-- "cpp":"text/x-cpp",
-- "cxx":"text/x-cpp",
-- "cc":"text/x-cpp",
-- "C":"text/x-cpp",
-- "c":"text/x-c",
-- "hpp":"text/x-cpp",
-- "hxx":"text/x-cpp",
-- "hh":"text/x-cpp",
-- "H":"text/x-cpp",
-- "h":"text/x-cpp",
-- "inl":"text/x-cpp",
-- "desktop": "application/x-desktop",
-- "diff": "text/x-diff",
-- "patch": "text/x-diff",
-- "html": "text/html",
-- "po": "text/x-po",
-- "py": "text/x-python" }
-- ext = fname.split(".")[-1]
- man = gsv.SourceLanguagesManager()
-- gsl = man.get_language_from_mime_type( extmap.get(ext, "text/plain") )
-+ cwd = gnomevfs.URI(os.getcwd())
-+ if str(cwd)[-1] != '/':
-+ cwd = cwd.append_string('/')
-+ file = cwd.resolve_relative(fname)
-+ file_info = gnomevfs.get_file_info(file, gnomevfs.FILE_INFO_GET_MIME_TYPE)
-+ gsl = man.get_language_from_mime_type( file_info.mime_type )
- if gsl:
- buf.set_language(gsl)
- buf.set_highlight(enabled)
diff --git a/dev-util/meld/meld-1.1.4-r1.ebuild b/dev-util/meld/meld-1.1.4-r1.ebuild
deleted file mode 100644
index 8020c15668f7..000000000000
--- a/dev-util/meld/meld-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.1.4-r1.ebuild,v 1.6 2007/06/01 18:03:57 nixnut 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="alpha amd64 ia64 ppc 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}
- app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
- gnome2_src_unpack
-
- # Fix build with gettext-0.15, patch by Ed Catmur #143120
- epatch ${FILESDIR}/fix-po.patch
-
- # Fix the .desktop icon name
- sed -i -e "s:Icon=meld:Icon=/usr/share/pixmaps/meld.png:" ./meld.desktop.in
-
- # fix the prefix so its not in */local/*
- sed -i -e 's:/usr/local:/usr:' INSTALL
-
- # don't run scrollkeeper (with the wrong path), leave that to gnome2.eclass #145833
- sed -i -e '/scrollkeeper-update/s/\t/&#/' help/*/GNUmakefile
-
- # Fix syntax highlighting. Bug #169001
- epatch ${FILESDIR}/${P}-syntax.patch
-}
-
-src_compile() {
- emake || die "make failed"
-}
-
-pkg_postinst() {
- python_mod_optimize /usr/lib/meld
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/lib/meld
-}