4 files changed, 7 insertions, 152 deletions
diff --git a/app-accessibility/gnome-mag/ChangeLog b/app-accessibility/gnome-mag/ChangeLog
index 98d3f314a15a..9e5a2eaddaaa 100644
--- a/app-accessibility/gnome-mag/ChangeLog
+++ b/app-accessibility/gnome-mag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/gnome-mag
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.184 2011/03/22 20:02:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/ChangeLog,v 1.185 2011/08/19 11:26:34 nirbheek Exp $
+
+  19 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gnome-mag-0.16.1.ebuild,
+  -gnome-mag-0.16.2.ebuild, gnome-mag-0.16.3.ebuild:
+  Fix slot dep on at-spi, remove old
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-mag-0.16.3.ebuild:
   Marking gnome-mag-0.16.3 ppc stable for bug 353436
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.16.1.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.1.ebuild
deleted file mode 100644
index 0bcd843ced7a..000000000000
--- a/app-accessibility/gnome-mag/gnome-mag-0.16.1.ebuild
+++ /dev/null
@@ -1,76 +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/gnome-mag/gnome-mag-0.16.1.ebuild,v 1.8 2011/03/06 22:55:26 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome magnification service definition"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.11.1:2
-	>=x11-libs/gtk+-2.6:2"
-
-# FIXME: need libcolorblind (debian package)
-# python deps are for applets
-#	applet? (
-#		>=dev-python/pygtk-2.6
-#		dev-python/pygobject
-#
-#		>=dev-python/libbonobo-python-2.10
-#		>=dev-python/gconf-python-2.10
-#		>=dev-python/libgnome-python-2.10
-#		>=dev-python/gnome-applets-python-2.10 )
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/orbit-2.3.100
-
-	dev-libs/dbus-glib
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXcomposite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable applet colorblind-applet)"
-#}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix some ugly warnings, originally per upstream bug #578798
-	epatch "${FILESDIR}/${PN}-0.15.9-magnifier-fix-warnings.patch"
-
-	# Workaround intltool tests failure
-	echo "colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
-colorblind/data/Colorblind_Applet.xml
-colorblind/data/colorblind-applet.schemas.in
-colorblind/data/colorblind-prefs.ui
-colorblind/ui/About.py
-colorblind/ui/ColorblindPreferencesUI.py
-colorblind/ui/WindowUI.py" >> "${S}"/po/POTFILES.skip
-}
-
-src_test() {
-	Xemake check || die "emake check failed"
-}
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild
deleted file mode 100644
index 0a8177b70886..000000000000
--- a/app-accessibility/gnome-mag/gnome-mag-0.16.2.ebuild
+++ /dev/null
@@ -1,73 +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/gnome-mag/gnome-mag-0.16.2.ebuild,v 1.2 2011/03/06 22:55:26 nirbheek Exp $
-
-EAPI="3"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="Gnome magnification service definition"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.11.1:2
-	>=x11-libs/gtk+-2.14:2"
-
-# FIXME: need libcolorblind (debian package)
-# python deps are for applets
-#	applet? (
-#		>=dev-python/pygtk-2.6
-#		dev-python/pygobject
-#
-#		>=dev-python/libbonobo-python-2.10
-#		>=dev-python/gconf-python-2.10
-#		>=dev-python/libgnome-python-2.10
-#		>=dev-python/gnome-applets-python-2.10 )
-
-RDEPEND="${RDEPEND}
-	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
-	>=gnome-base/orbit-2.3.100
-
-	dev-libs/dbus-glib
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXcomposite"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-#pkg_setup() {
-#	G2CONF="${G2CONF} $(use_enable applet colorblind-applet)"
-#}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Workaround intltool tests failure
-	echo "colorblind/GNOME_Magnifier_ColorblindApplet.server.in.in
-colorblind/data/Colorblind_Applet.xml
-colorblind/data/colorblind-applet.schemas.in
-colorblind/data/colorblind-prefs.ui
-colorblind/ui/About.py
-colorblind/ui/ColorblindPreferencesUI.py
-colorblind/ui/WindowUI.py" >> "${S}"/po/POTFILES.skip
-}
-
-src_test() {
-	Xemake check || die "emake check failed"
-}
diff --git a/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild b/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild
index 8b6914c9735e..725ea0d77e6f 100644
--- a/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild
+++ b/app-accessibility/gnome-mag/gnome-mag-0.16.3.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/gnome-mag/gnome-mag-0.16.3.ebuild,v 1.6 2011/03/22 20:02:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/gnome-mag/gnome-mag-0.16.3.ebuild,v 1.7 2011/08/19 11:26:34 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.11.1:2
 
 RDEPEND="${RDEPEND}
 	>=gnome-base/libbonobo-1.107
-	>=gnome-extra/at-spi-1.5.2
+	>=gnome-extra/at-spi-1.5.2:1
 	>=gnome-base/orbit-2.3.100
 
 	dev-libs/dbus-glib