Fix gnome-panel dependencies wrt #348177 by Pacho Ramos. drop old

(Portage version: 2.2.0_alpha13/cvs/Linux x86_64)

3 files changed, 20 insertions, 39 deletions

diff --git a/media-gfx/byzanz/ChangeLog b/media-gfx/byzanz/ChangeLog
index 72bae16ad70f..e050e3451b1f 100644
--- a/media-gfx/byzanz/ChangeLog
+++ b/media-gfx/byzanz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/byzanz
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/byzanz/ChangeLog,v 1.3 2010/10/06 19:03:07 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/byzanz/ChangeLog,v 1.4 2011/01/06 14:06:58 ssuominen Exp $
+
+  06 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> byzanz-0.2.2.ebuild:
+  Fix gnome-panel dependencies wrt #348177 by Pacho Ramos.
 
 *byzanz-0.2.2 (06 Oct 2010)
 
diff --git a/media-gfx/byzanz/byzanz-0.1.1.ebuild b/media-gfx/byzanz/byzanz-0.1.1.ebuild
deleted file mode 100644
index 0fc1f379ba38..000000000000
--- a/media-gfx/byzanz/byzanz-0.1.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/byzanz/byzanz-0.1.1.ebuild,v 1.2 2006/09/28 13:56:11 wolf31o2 Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Screencasting program that saves casts as GIF files"
-HOMEPAGE="http://people.freedesktop.org/~company/byzanz/"
-SRC_URI="http://people.freedesktop.org/~company/byzanz/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libXdamage-1.0
-		>=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6
-		>=gnome-base/gconf-2.10
-		>=gnome-base/gnome-panel-2.10
-		>=gnome-base/gnome-vfs-2.12
-		>=gnome-base/libgnomeui-2.12"
-DEPEND="dev-util/pkgconfig
-		>=x11-proto/damageproto-1.0
-		${RDEPEND}"
diff --git a/media-gfx/byzanz/byzanz-0.2.2.ebuild b/media-gfx/byzanz/byzanz-0.2.2.ebuild
index 9e486a4a4527..16cc4001a153 100644
--- a/media-gfx/byzanz/byzanz-0.2.2.ebuild
+++ b/media-gfx/byzanz/byzanz-0.2.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/byzanz/byzanz-0.2.2.ebuild,v 1.1 2010/10/06 19:03:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/byzanz/byzanz-0.2.2.ebuild,v 1.2 2011/01/06 14:06:58 ssuominen Exp $
 
-GCONF_DEBUG="no"
+EAPI=2
+
+GCONF_DEBUG=no
 
 inherit gnome2
 
@@ -15,15 +17,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libXdamage-1.0
-		>=dev-libs/glib-2.16
-		>=x11-libs/gtk+-2.17.10
-		>=gnome-base/gconf-2.10
-		>=gnome-base/gnome-panel-2.10
-		>=media-libs/gst-plugins-base-0.10.24
-		>=x11-libs/cairo-1.8.10"
-DEPEND="dev-util/pkgconfig
-		dev-util/intltool
-		>=x11-proto/damageproto-1.0
-		${RDEPEND}"
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/gtk+-2.17.10:2
+	>=gnome-base/gconf-2.10
+	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+	>=media-libs/gst-plugins-base-0.10.24
+	>=x11-libs/cairo-1.8.10"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	>=x11-proto/damageproto-1.0"
 
 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"