Clean up old revisions.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key C6085806)

2 files changed, 5 insertions, 95 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 23a6641b9f2a..a7d5cb25b278 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/meld
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.154 2012/11/25 10:51:59 eva Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.155 2013/03/07 08:10:07 eva Exp $
+
+  07 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -meld-1.6.1.ebuild:
+  Clean up old revisions.
 
 *meld-1.7.0 (25 Nov 2012)
 
diff --git a/dev-util/meld/meld-1.6.1.ebuild b/dev-util/meld/meld-1.6.1.ebuild
deleted file mode 100644
index bdb233496e3f..000000000000
--- a/dev-util/meld/meld-1.6.1.ebuild
+++ /dev/null
@@ -1,93 +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.1.ebuild,v 1.1 2012/10/27 11:53:02 pacho 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="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/gtk-doc-am
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-pkg_setup() {
-	# Needed for optimizing python modules against proper interpreter
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	DOCS="NEWS"
-
-	# 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
-
-	# Fix .desktop entry, upstream bug #686978
-	sed -i -e '/Encoding/d' data/meld.desktop.in || die
-
-	gnome2_src_prepare
-}
-
-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
-}