Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 16 insertions, 109 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 210e5e145f73..92f694afb500 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.136 2011/10/30 15:37:11 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.137 2012/01/29 10:54:23 pacho Exp $
+
+*meld-1.5.3 (29 Jan 2012)
+
+  29 Jan 2012; Pacho Ramos <pacho@gentoo.org> +meld-1.5.3.ebuild,
+  -meld-1.5.0.ebuild, -meld-1.5.1.ebuild:
+  Version bump, remove old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> meld-1.5.2.ebuild:
   alpha/ia64/sparc stable wrt #385699
diff --git a/dev-util/meld/meld-1.5.0.ebuild b/dev-util/meld/meld-1.5.0.ebuild
deleted file mode 100644
index cf8f980c4c59..000000000000
--- a/dev-util/meld/meld-1.5.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.0.ebuild,v 1.8 2011/10/19 20:23:35 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-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 ~amd64-linux ~x86-linux"
-IUSE="doc gnome"
-
-RDEPEND="
-	>=gnome-base/libglade-2
-	>=dev-python/pygtk-2.14
-	>=dev-python/pygobject-2.8:2
-	gnome? ( >=dev-python/gconf-python-2.22 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS help/ChangeLog"
-	# Needed for optimizing python modules against proper interpreter
-	python_set_active_version 2
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# fix the prefix so its not in */local/*
-	sed -e "s:/usr/local:${EPREFIX}/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 Makefile || 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/*/Makefile || die "sed 4 failed"
-
-	# fix test suite
-	sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \
-		-e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \
-		-i tools/check_release || die "sed 5 failed"
-
-	# replace all calls to python by specific major version
-	sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \
-		-i INSTALL || die "sed 6 failed"
-	python_convert_shebangs 2 "${S}"/tools/*
-
-	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/Makefile || die "sed 5 failed"
-	fi
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	gnome2_src_install
-	python_convert_shebangs 2 "${ED}"usr/bin/meld
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize /usr/$(get_libdir)/meld
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/meld
-}
diff --git a/dev-util/meld/meld-1.5.1.ebuild b/dev-util/meld/meld-1.5.3.ebuild
index 5c5deeb9cafe..cce5e0a1cddc 100644
--- a/dev-util/meld/meld-1.5.1.ebuild
+++ b/dev-util/meld/meld-1.5.3.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.1.ebuild,v 1.7 2011/10/05 16:59:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.3.ebuild,v 1.1 2012/01/29 10:54:23 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.5"
 
 inherit python gnome2 eutils multilib
 
-DESCRIPTION="A graphical (GNOME 2) diff and merge tool"
-HOMEPAGE="http://meld.sourceforge.net/"
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc gnome"
 
 RDEPEND="
@@ -26,9 +26,10 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper"
 
 pkg_setup() {
-	DOCS="AUTHORS NEWS help/ChangeLog"
+	DOCS="NEWS"
 	# Needed for optimizing python modules against proper interpreter
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -52,11 +53,6 @@ src_prepare() {
 	sed -e '/scrollkeeper-update/s/\t/&#/' \
 		-i help/*/Makefile || die "sed 4 failed"
 
-	# fix test suite
-	sed -e 's,\(for file in \["\)\(meld"\]\),\1bin/\2,' \
-		-e 's,\(open("\)\(meldapp.py")\),\1meld/\2,' \
-		-i tools/check_release || die "sed 5 failed"
-
 	# replace all calls to python by specific major version
 	sed -e "s/\(PYTHON ?= \).*/\1$(PYTHON -2)/" \
 		-i INSTALL || die "sed 6 failed"