Bump to 1.3.0. Add die clause everywhere, fix installation of all locales when LINGUAS is unset. Support for subversion 1.6 and a few other things. Remove old revisions.

(Portage version: 2.2_rc30/cvs/Linux x86_64)

6 files changed, 84 insertions, 243 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 7fe91ccc8258..58d7d1776e73 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/meld
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.94 2009/03/25 19:10:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.95 2009/04/20 22:37:24 eva Exp $
+
+*meld-1.3.0 (20 Apr 2009)
+
+  20 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> +meld-1.3.0.ebuild:
+  Bump to 1.3.0. Add die clause everywhere, fix installation of all locales
+  when LINGUAS is unset. Support for subversion 1.6 and a few other things.
+
+  20 Apr 2009; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.1.5.1.ebuild,
+  -meld-1.1.5.1-r1.ebuild, -meld-1.2.ebuild, -meld-1.2-r1.ebuild:
+  Remove old revisions.
 
   25 Mar 2009; Raúl Porcel <armin76@gentoo.org> meld-1.2.1.ebuild:
   ia64/sparc stable wrt #263618
diff --git a/dev-util/meld/meld-1.1.5.1-r1.ebuild b/dev-util/meld/meld-1.1.5.1-r1.ebuild
deleted file mode 100644
index 0b632761a0a6..000000000000
--- a/dev-util/meld/meld-1.1.5.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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.1.5.1-r1.ebuild,v 1.7 2008/07/25 16:39:15 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 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.6.0
-	>=dev-python/pyorbit-1.99.0
-	gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS 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
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.1.5.1.ebuild b/dev-util/meld/meld-1.1.5.1.ebuild
deleted file mode 100644
index 0c6487f321bf..000000000000
--- a/dev-util/meld/meld-1.1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.1.5.1.ebuild,v 1.9 2008/05/29 16:48:04 hawking 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.6.0
-	>=dev-python/pyorbit-1.99.0
-	gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# 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
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.2-r1.ebuild b/dev-util/meld/meld-1.2-r1.ebuild
deleted file mode 100644
index ec7890828886..000000000000
--- a/dev-util/meld/meld-1.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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-r1.ebuild,v 1.1 2008/11/16 19:33:00 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.6.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 installation bug for french help, mentioned in bug 230665
-	epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
-
-	# Fix word-wrapping option list, bug #246261
-	epatch "${FILESDIR}/${P}-wrap-list.patch"
-
-	# 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
-}
diff --git a/dev-util/meld/meld-1.2.ebuild b/dev-util/meld/meld-1.2.ebuild
deleted file mode 100644
index 3a9eff0eac74..000000000000
--- a/dev-util/meld/meld-1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.ebuild,v 1.6 2008/11/12 21:53:54 ranger 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.6.0
-	>=dev-python/pyorbit-1.99.0
-	gnome? ( dev-python/gnome-python-desktop )"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS README.CVS changelog help/"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix installation bug for french help, mentioned in bug 230665
-	epatch "${FILESDIR}/${P}-fr-help-install-fix.patch"
-
-	# 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
-}
diff --git a/dev-util/meld/meld-1.3.0.ebuild b/dev-util/meld/meld-1.3.0.ebuild
new file mode 100644
index 000000000000..0826b71faced
--- /dev/null
+++ b/dev-util/meld/meld-1.3.0.ebuild
@@ -0,0 +1,73 @@
+# 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.3.0.ebuild,v 1.1 2009/04/20 22:37:24 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 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=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-2.8"
+
+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 -e 's:/usr/local:/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 GNUmakefile || 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/*/GNUmakefile || die "sed 4 failed"
+
+	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/GNUmakefile || die "sed 5 failed"
+	fi
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/meld
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/meld
+}