Fix slot dep on at-spi, remove old

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 7 insertions, 58 deletions

diff --git a/app-accessibility/gok/ChangeLog b/app-accessibility/gok/ChangeLog
index 44cdaad6944c..e3b1111bc67c 100644
--- a/app-accessibility/gok/ChangeLog
+++ b/app-accessibility/gok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/gok
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.151 2011/03/22 20:02:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/ChangeLog,v 1.152 2011/08/19 11:26:37 nirbheek Exp $
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gok-2.30.0.ebuild,
+  gok-2.30.1.ebuild:
+  Fix slot dep on at-spi, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gok-2.30.1.ebuild:
   Marking gok-2.30.1 ppc stable for bug 353436
diff --git a/app-accessibility/gok/gok-2.30.0.ebuild b/app-accessibility/gok/gok-2.30.0.ebuild
deleted file mode 100644
index 5f06108bfd86..000000000000
--- a/app-accessibility/gok/gok-2.30.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-2.30.0.ebuild,v 1.9 2011/03/06 22:59:17 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Onscreen Keyboard"
-HOMEPAGE="http://www.gok.ca/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="accessibility doc usb"
-
-# accessibility will disappear with new xorg-server (1.6)
-RDEPEND=">=dev-libs/glib-2.17.4:2
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/libbonobo-2.5.1
-	>=dev-libs/atk-1.3
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/libwnck-2.13.5:1
-	app-accessibility/gnome-speech
-	>=dev-libs/dbus-glib-0.7
-	>=media-libs/libcanberra-0.3[gtk]
-	dev-libs/libxml2:2
-	>=gnome-base/gconf-2.16:2
-	>=gnome-base/orbit-2:2
-	usb? ( =virtual/libusb-0* )
-	x11-libs/libXi
-	x11-libs/libX11
-	accessibility? ( x11-libs/libXevie )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40.1
-	>=dev-util/pkgconfig-0.9
-	app-text/scrollkeeper
-	doc? ( >=dev-util/gtk-doc-1 )
-	x11-proto/inputproto
-	x11-proto/kbproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable usb libusb-input)
-		$(use_enable accessibility xevie)"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	Xmake check || die "test failed"
-}
diff --git a/app-accessibility/gok/gok-2.30.1.ebuild b/app-accessibility/gok/gok-2.30.1.ebuild
index b74378d45452..ca6fb9cfb890 100644
--- a/app-accessibility/gok/gok-2.30.1.ebuild
+++ b/app-accessibility/gok/gok-2.30.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/app-accessibility/gok/gok-2.30.1.ebuild,v 1.7 2011/03/22 20:02:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gok/gok-2.30.1.ebuild,v 1.8 2011/08/19 11:26:37 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE="accessibility doc usb"
 
 # accessibility will disappear with new xorg-server (1.6)
 RDEPEND=">=dev-libs/glib-2.17.4:2
-	>=gnome-extra/at-spi-1.5.2
+	>=gnome-extra/at-spi-1.5.2:1
 	>=gnome-base/libbonobo-2.5.1
 	>=dev-libs/atk-1.3
 	>=x11-libs/gtk+-2.18:2