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

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

4 files changed, 22 insertions, 43 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/Manifest b/media-gfx/byzanz/Manifest
index 6de60b1c53b7..c35300db6be1 100644
--- a/media-gfx/byzanz/Manifest
+++ b/media-gfx/byzanz/Manifest
@@ -1,6 +1,4 @@
-DIST byzanz-0.1.1.tar.gz 426488 RMD160 a6ef43fd8d2eeb0373f6289db4c4e01b9d85f471 SHA1 148ea21d45d5e9daa7ecfbb3bba48eda6ac9273d SHA256 0e0b042a336eb039c8d6560919ae1829b2df6378adc5ac7b835d685b909c2531
 DIST byzanz-0.2.2.tar.bz2 369472 RMD160 4b1a19b6af83a373ea32f7f7f436b18d880cd1ae SHA1 fd0264c98fbb52323c630835da7b79d4f569743d SHA256 4d3cdea39e536341f0a083ce003c404496131705ba5ced394d683c00e7fa144c
-EBUILD byzanz-0.1.1.ebuild 763 RMD160 f0f8b8591b51c342451696479693519dcac28ca6 SHA1 8c5cc95bf207bc7537bf45ca300245102e7ed4e8 SHA256 c9d56a61ac978a0f58e664eb0be98f54c1e002b74d88fa903a11023d4ef2c020
-EBUILD byzanz-0.2.2.ebuild 782 RMD160 8b170ebbc486c7e11f344ca08d9c3c89ba1473a8 SHA1 8d807a031ae197cf0afd0ad60b425d57732ff36f SHA256 5281c70e257c01902ee2de32ca48971a07da3e8f9069cee00266e6a030552a32
-MISC ChangeLog 675 RMD160 166068d5e03277393cbcede677baabeec0c3cd4a SHA1 5ac7233913ac88356f19a3c60c7ffc45903e992f SHA256 520a4ad950f6611f5cd80a1e22354799f8382ecbc7bce9f67545dd37091c816a
+EBUILD byzanz-0.2.2.ebuild 826 RMD160 5e19d5a00bdc3c304c17e501101eba423587537f SHA1 2aaeb0dcc5e95e9c539e120f9ec5924e138286c5 SHA256 4eba39db491fc9ce869341ec744d822a1c8b528bff905431aa9d1c5cde515a7a
+MISC ChangeLog 816 RMD160 2e00b988ec0dfcd2cd83f583b789ad66dd132155 SHA1 9e2e9bc18edf5b7d231b2a1a26f6be8617e50206 SHA256 67f3ee5eb905006427bcce2297ff149a426160a2a2567c396244efa69ac6044d
 MISC metadata.xml 222 RMD160 d1a3fdf35754f259a53541e6f3fdf4685c621b4c SHA1 2669a0aa4051cb9d7eca5b8e5719f5039bf850b9 SHA256 2744b911fd4a893fc26fd4fbfcf4bad6189fbbd14a6b525c84c95d012e8c06da
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"