Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-util/meld
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/meld')
-rw-r--r--dev-util/meld/ChangeLog7
-rw-r--r--dev-util/meld/files/meld-1.2-fr-help-install-fix.patch18
-rw-r--r--dev-util/meld/files/meld-1.2-wrap-list.patch45
-rw-r--r--dev-util/meld/meld-1.2.1.ebuild66
4 files changed, 6 insertions, 130 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 47f9e0f786f6..5c4b54a494e8 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/meld
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.101 2009/07/19 13:02:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.102 2009/07/27 08:47:50 eva Exp $
+
+ 27 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.2.1.ebuild,
+ -files/meld-1.2-fr-help-install-fix.patch,
+ -files/meld-1.2-wrap-list.patch:
+ Clean up old revisions.
19 Jul 2009; nixnut <nixnut@gentoo.org> meld-1.3.0.ebuild:
ppc stable #273728
diff --git a/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch b/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch
deleted file mode 100644
index 4a07ad894dc8..000000000000
--- a/dev-util/meld/files/meld-1.2-fr-help-install-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From http://bugzilla.gnome.org/attachment.cgi?id=113669&action=view
-from upstream bug 540442. Bug 540848 describes the exact problem, while 540442
-might originally be about something else
-
-diff -p -up meld-1.2/help/fr/GNUmakefile~ meld-1.2/help/fr/GNUmakefile
---- meld-1.2/help/fr/GNUmakefile~ 2008-03-31 22:44:53.000000000 +0200
-+++ meld-1.2/help/fr/GNUmakefile 2008-06-27 10:37:54.000000000 +0200
-@@ -15,9 +15,8 @@ all $(OMF_NAME).install : $(OMF_NAME)
-
- .PHONY : install
- install : $(OMF_NAME).install
-- -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
-+ -mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_)
- install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
-- install -m 644 figures/*.png $(XML_DIR_)/figures
- -install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
- -scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)
-
diff --git a/dev-util/meld/files/meld-1.2-wrap-list.patch b/dev-util/meld/files/meld-1.2-wrap-list.patch
deleted file mode 100644
index e52074cf0b47..000000000000
--- a/dev-util/meld/files/meld-1.2-wrap-list.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -dPNur meld-1.2/glade2/meldapp.glade meld-1.2-1/glade2/meldapp.glade
---- meld-1.2/glade2/meldapp.glade 2008-06-20 01:17:32.000000000 +0200
-+++ meld-1.2-1/glade2/meldapp.glade 2008-11-14 19:07:20.000000000 +0100
-@@ -1403,8 +1403,40 @@
- <widget class="GtkOptionMenu" id="option_wrap_lines">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
-- <property name="response_id">0</property>
-+ <property name="history">0</property>
- <signal name="changed" handler="on_option_wrap_lines_changed"/>
-+
-+ <child>
-+ <widget class="GtkMenu" id="menu1">
-+
-+ <child>
-+ <widget class="GtkMenuItem" id="menu_wrap_none">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">_None</property>
-+ <property name="use_underline">True</property>
-+ <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkMenuItem" id="menu_wrap_char">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">_Character</property>
-+ <property name="use_underline">True</property>
-+ <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkMenuItem" id="menu_wrap_word">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">_Word</property>
-+ <property name="use_underline">True</property>
-+ <signal name="activate" handler="on_wrap_activate" last_modification_time="Wed, 17 Mar 2004 21:30:49 GMT"/>
-+ </widget>
-+ </child>
-+ </widget>
-+ </child>
- </widget>
- <packing>
- <property name="expand">False</property>
diff --git a/dev-util/meld/meld-1.2.1.ebuild b/dev-util/meld/meld-1.2.1.ebuild
deleted file mode 100644
index 2716b373c1ee..000000000000
--- a/dev-util/meld/meld-1.2.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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.8 2009/03/25 19:10:38 armin76 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 ~arm ia64 ppc ppc64 sparc x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-lang/python-2.3
- >=gnome-base/libglade-2
- >=gnome-base/libgnome-2
- >=dev-python/gconf-python-2.22
- >=dev-python/libgnome-python-2.22
- >=dev-python/gnome-vfs-python-2.22
- >=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
-}