Drop libglade dependency as reported in bug #358153, done in Arch and confirmed by me. Remove old.

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 7 insertions, 78 deletions

diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog
index 25557856b206..dd5b18a9af8e 100644
--- a/dev-util/meld/ChangeLog
+++ b/dev-util/meld/ChangeLog
@@ -1,6 +1,11 @@
 # 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.123 2011/03/22 19:07:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.124 2011/04/13 17:22:21 pacho Exp $
+
+  13 Apr 2011; Pacho Ramos <pacho@gentoo.org> -meld-1.3.1.ebuild,
+  meld-1.5.1.ebuild:
+  Drop libglade dependency as reported in bug #358153, done in Arch and
+  confirmed by me. Remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> meld-1.5.0.ebuild:
   Marking meld-1.5.0 ppc stable for bug 353436
diff --git a/dev-util/meld/meld-1.3.1.ebuild b/dev-util/meld/meld-1.3.1.ebuild
deleted file mode 100644
index bbf500844ce9..000000000000
--- a/dev-util/meld/meld-1.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.3.1.ebuild,v 1.6 2010/09/09 13:34:00 ranger Exp $
-
-GCONF_DEBUG="no"
-
-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 gnome"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=gnome-base/libglade-2
-	gnome? (
-		>=gnome-base/libgnome-2
-		>=dev-python/libgnome-python-2.22
-		>=dev-python/gconf-python-2.22
-		>=dev-python/gnome-vfs-python-2.22 )
-	>=dev-python/pygtk-2.8.0
-	>=dev-python/pygobject-2.8"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS NEWS help/ChangeLog"
-
-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
-}
diff --git a/dev-util/meld/meld-1.5.1.ebuild b/dev-util/meld/meld-1.5.1.ebuild
index 343940a74822..7aa46d9e8c11 100644
--- a/dev-util/meld/meld-1.5.1.ebuild
+++ b/dev-util/meld/meld-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2011/03/20 12:02:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-1.5.1.ebuild,v 1.2 2011/04/13 17:22:21 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -17,7 +17,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-lin
 IUSE="doc gnome"
 
 RDEPEND="
-	>=gnome-base/libglade-2:2.0
 	>=dev-python/pygtk-2.14:2
 	>=dev-python/pygobject-2.8:2
 	gnome? ( >=dev-python/gconf-python-2.22:2 )