Version bump, drop old

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 12 insertions, 103 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index e6421aaa7818..b217377788e0 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.166 2013/04/22 18:17:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.167 2013/06/03 20:24:26 pacho Exp $
+
+*meld-1.7.3 (03 Jun 2013)
+
+  03 Jun 2013; Pacho Ramos <pacho@gentoo.org> +meld-1.7.3.ebuild,
+  -meld-1.6.0.ebuild, -meld-1.7.1.ebuild:
+  Version bump, drop old
 
 *meld-1.7.2 (22 Apr 2013)
 
diff --git a/dev-util/meld/meld-1.6.0.ebuild b/dev-util/meld/meld-1.6.0.ebuild
deleted file mode 100644
index c7fa68c3e74f..000000000000
--- a/dev-util/meld/meld-1.6.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# 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.6.0.ebuild,v 1.8 2012/10/28 15:49:00 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-
-inherit python gnome2 eutils multilib
-
-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"
-IUSE="doc gnome"
-
-RDEPEND="
-	>=dev-python/pygtk-2.14:2
-	>=dev-python/pygobject-2.8:2
-	gnome? ( >=dev-python/gconf-python-2.22:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-pkg_setup() {
-	DOCS="NEWS"
-	# Needed for optimizing python modules against proper interpreter
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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"
-
-	# 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.7.1.ebuild b/dev-util/meld/meld-1.7.3.ebuild
index 8a367cfdaf15..d964782faa86 100644
--- a/dev-util/meld/meld-1.7.1.ebuild
+++ b/dev-util/meld/meld-1.7.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.1.ebuild,v 1.2 2013/03/31 04:18:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.7.3.ebuild,v 1.1 2013/06/03 20:24:26 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 PYTHON_COMPAT=( python2_{6,7} )
 
-inherit eutils python-single-r1 gnome2 multilib
+inherit eutils python-single-r1 gnome2
 
 DESCRIPTION="A graphical diff and merge tool"
 HOMEPAGE="http://meldmerge.org/"
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+highlight gnome"
 
-# FIXME: switch pygtksourceview and gconf-python to python-r1
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: switch gconf-python to python-r1
 RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
@@ -47,10 +49,6 @@ src_prepare() {
 	sed -e '/scrollkeeper-update/s/\t/&#/' \
 		-i help/*/Makefile || die "sed 4 failed"
 
-	# don't run update-*-database, leave that to eclass
-	sed -e '/update-.*-database/d' \
-		-i Makefile || die "sed 5 failed"
-
 	strip-linguas -i "${S}/po"
 	local mylinguas=""
 	for x in ${LINGUAS}; do
@@ -62,10 +60,6 @@ src_prepare() {
 			-i po/Makefile || die "sed 6 failed"
 	fi
 
-	# Fix .desktop entry
-	sed -e 's/\(MimeType.*\)/\1;/' \
-		-i data/meld.desktop.in || die
-
 	gnome2_src_prepare
 }
 
@@ -74,7 +68,6 @@ src_configure() {
 }
 
 src_install() {
-	DOCS="NEWS"
 	gnome2_src_install
 	python_fix_shebang "${ED}"/usr/bin
 	doman meld.1