4 files changed, 9 insertions, 54 deletions
diff --git a/gnome-extra/libgail-gnome/ChangeLog b/gnome-extra/libgail-gnome/ChangeLog
index 59a769187154..b4c7fd21122f 100644
--- a/gnome-extra/libgail-gnome/ChangeLog
+++ b/gnome-extra/libgail-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgail-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/ChangeLog,v 1.118 2010/11/01 14:31:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/ChangeLog,v 1.119 2010/12/08 17:29:46 pacho Exp $
+
+  08 Dec 2010; Pacho Ramos <pacho@gentoo.org> -libgail-gnome-1.20.1.ebuild,
+  -libgail-gnome-1.20.2.ebuild, libgail-gnome-1.20.3.ebuild:
+  Needs gnome-panel with bonobo support. Remove old.
 
   01 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
   libgail-gnome-1.20.3.ebuild:
diff --git a/gnome-extra/libgail-gnome/libgail-gnome-1.20.1.ebuild b/gnome-extra/libgail-gnome/libgail-gnome-1.20.1.ebuild
deleted file mode 100644
index 8c6f6ce0beaa..000000000000
--- a/gnome-extra/libgail-gnome/libgail-gnome-1.20.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/libgail-gnome-1.20.1.ebuild,v 1.13 2010/07/20 02:21:00 jer Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gail libraries for GNOME"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/atk-1.7.2
-	>=x11-libs/gtk+-1.3.11
-	>=gnome-base/libbonobo-1.1
-	>=gnome-base/libbonoboui-1.1
-	>=gnome-base/libgnomeui-1.1
-	>=gnome-base/gnome-panel-0.0.18
-	>=gnome-extra/at-spi-0.10"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/gnome-extra/libgail-gnome/libgail-gnome-1.20.2.ebuild b/gnome-extra/libgail-gnome/libgail-gnome-1.20.2.ebuild
deleted file mode 100644
index 42ca9cc7a87f..000000000000
--- a/gnome-extra/libgail-gnome/libgail-gnome-1.20.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/libgail-gnome-1.20.2.ebuild,v 1.6 2010/08/18 21:29:44 maekke Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gail libraries for GNOME"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/atk-1.7.2
-	>=x11-libs/gtk+-1.3.11
-	>=gnome-base/libbonobo-1.1
-	>=gnome-base/libbonoboui-1.1
-	>=gnome-base/libgnomeui-1.1
-	>=gnome-base/gnome-panel-0.0.18
-	>=gnome-extra/at-spi-0.10"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild b/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild
index 33d3e50a1cf6..b00806506873 100644
--- a/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild
+++ b/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild,v 1.9 2010/11/01 14:31:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgail-gnome/libgail-gnome-1.20.3.ebuild,v 1.10 2010/12/08 17:29:46 pacho Exp $
 
+EAPI="3"
 inherit gnome2
 
 DESCRIPTION="Gail libraries for GNOME"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
+HOMEPAGE="http://live.gnome.org/Accessibility/"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -17,7 +18,7 @@ RDEPEND=">=dev-libs/atk-1.7.2
 	>=gnome-base/libbonobo-1.1
 	>=gnome-base/libbonoboui-1.1
 	>=gnome-base/libgnomeui-1.1
-	>=gnome-base/gnome-panel-0.0.18
+	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
 	>=gnome-base/gconf-2
 	>=gnome-extra/at-spi-0.10"
 DEPEND="${RDEPEND}