Fix slot-deps on gnome libs, remove old

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 10 insertions, 52 deletions

diff --git a/x11-libs/gtksourceview/ChangeLog b/x11-libs/gtksourceview/ChangeLog
index 2130bc060480..08725615860f 100644
--- a/x11-libs/gtksourceview/ChangeLog
+++ b/x11-libs/gtksourceview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtksourceview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.197 2011/03/22 19:49:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/ChangeLog,v 1.198 2011/03/27 12:57:48 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -gtksourceview-2.10.4.ebuild, gtksourceview-2.10.5-r1.ebuild:
+  Fix slot-deps on gnome libs, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   gtksourceview-2.10.5-r1.ebuild:
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild
deleted file mode 100644
index 87e331c7f05f..000000000000
--- a/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.4.ebuild,v 1.11 2010/10/17 14:58:40 armin76 Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 virtualx
-
-DESCRIPTION="A text widget implementing syntax highlighting and other features"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2.0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc glade"
-
-RDEPEND=">=x11-libs/gtk+-2.12
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/glib-2.14
-	glade? ( >=dev-util/glade-3.2 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Skip broken test until upstream bug #621383 is solved
-	sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
-}
-
-src_test() {
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	insinto /usr/share/${PN}-2.0/language-specs
-	doins "${FILESDIR}"/2.0/gentoo.lang || die "doins failed"
-}
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
index 1326bc3daff4..5995ce29d489 100644
--- a/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.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/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.7 2011/03/22 19:49:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r1.ebuild,v 1.8 2011/03/27 12:57:48 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -18,10 +18,10 @@ IUSE="doc glade"
 # FIXME: We could avoid the glade conditional and dep completely if upstream
 # would have a --with-glade-catalogdir that would allow to pass the system
 # glade catalog dir, instead of needing gladeui-1.0.pc installed from dev-util/glade
-RDEPEND=">=x11-libs/gtk+-2.12
-	>=dev-libs/libxml2-2.5
-	>=dev-libs/glib-2.14
-	glade? ( >=dev-util/glade-3.2 )
+RDEPEND=">=x11-libs/gtk+-2.12:2
+	>=dev-libs/libxml2-2.5:2
+	>=dev-libs/glib-2.14:2
+	glade? ( >=dev-util/glade-3.2:3 )
 	kernel_Darwin? ( x11-libs/ige-mac-integration )"
 DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17