4 files changed, 8 insertions, 103 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index da4a558ff1e6..8239679bd8ae 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/meld
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.188 2014/10/25 22:33:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.189 2014/11/25 09:06:50 pacho Exp $
+
+*meld-3.12.2 (25 Nov 2014)
+
+  25 Nov 2014; Pacho Ramos <pacho@gentoo.org> +meld-3.12.2.ebuild,
+  -files/meld-3.12.0-c-locale.patch, -meld-1.8.6.ebuild, -meld-3.12.0.ebuild:
+  Version bump, drop old
 
 *meld-3.12.1 (25 Oct 2014)
 
diff --git a/dev-util/meld/files/meld-3.12.0-c-locale.patch b/dev-util/meld/files/meld-3.12.0-c-locale.patch
deleted file mode 100644
index eee7b9695649..000000000000
--- a/dev-util/meld/files/meld-3.12.0-c-locale.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c361e4eaccfaed4f5c5d64a206ea7941e3ef8a57 Mon Sep 17 00:00:00 2001
-From: Kai Willadsen <kai.willadsen@gmail.com>
-Date: Sat, 4 Oct 2014 10:01:05 +1000
-Subject: build_helpers: Make sure that we build help for C locale (bgo#737833)
-
-
-diff --git a/meld/build_helpers.py b/meld/build_helpers.py
-index 385e3dc..69ad5bf 100644
---- a/meld/build_helpers.py
-+++ b/meld/build_helpers.py
-@@ -117,6 +117,9 @@ class build_help(distutils.cmd.Command):
-         else:
-             self.selected_languages = os.listdir(self.help_dir)
- 
-+        if 'C' not in self.selected_languages:
-+            self.selected_languages.append('C')
-+
-         self.C_PAGES = glob.glob(os.path.join(self.help_dir, 'C', '*.page'))
-         self.C_EXTRA = glob.glob(os.path.join(self.help_dir, 'C', '*.xml'))
- 
--- 
-cgit v0.10.1
-
diff --git a/dev-util/meld/meld-1.8.6.ebuild b/dev-util/meld/meld-1.8.6.ebuild
deleted file mode 100644
index 41b58f94fe86..000000000000
--- a/dev-util/meld/meld-1.8.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.8.6.ebuild,v 1.1 2014/09/04 12:06:31 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit eutils python-single-r1 gnome2
-
-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="+highlight gnome"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pygtk-2.14:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.8:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	highlight? ( >=dev-python/pygtksourceview-2.10[${PYTHON_USEDEP}] )
-	gnome? ( >=dev-python/gconf-python-2.22:2[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/gtk-doc-am
-	dev-util/intltool
-"
-
-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"
-
-	# 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"
-
-	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 6 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	:
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"/usr/bin
-	doman meld.1
-}
diff --git a/dev-util/meld/meld-3.12.0.ebuild b/dev-util/meld/meld-3.12.2.ebuild
index 9bcd868c4495..e90abe830cd9 100644
--- a/dev-util/meld/meld-3.12.0.ebuild
+++ b/dev-util/meld/meld-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.0.ebuild,v 1.2 2014/10/05 10:25:09 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-3.12.2.ebuild,v 1.1 2014/11/25 09:06:50 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -34,11 +34,6 @@ DEPEND="${RDEPEND}
 	dev-util/itstool
 "
 
-PATCHES=(
-	# Build with C locale (from 'master')
-	"${FILESDIR}"/${P}-c-locale.patch
-)
-
 python_compile_all() {
 	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
 }