Pin gtk+ dependency to slot 2. Clean up old revisions.

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

4 files changed, 8 insertions, 58 deletions

diff --git a/gnome-extra/swfdec-gnome/ChangeLog b/gnome-extra/swfdec-gnome/ChangeLog
index 453ca942288f..a2da1c596d81 100644
--- a/gnome-extra/swfdec-gnome/ChangeLog
+++ b/gnome-extra/swfdec-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/swfdec-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/ChangeLog,v 1.49 2011/01/19 21:25:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/ChangeLog,v 1.50 2011/01/24 13:14:24 eva Exp $
+
+  24 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -swfdec-gnome-2.26.0.ebuild, -swfdec-gnome-2.28.0-r1.ebuild,
+  swfdec-gnome-2.30.1.ebuild:
+  Pin gtk+ dependency to slot 2. Clean up old revisions.
 
   19 Jan 2011; Markos Chandras <hwoarang@gentoo.org>
   swfdec-gnome-2.30.1.ebuild:
diff --git a/gnome-extra/swfdec-gnome/swfdec-gnome-2.26.0.ebuild b/gnome-extra/swfdec-gnome/swfdec-gnome-2.26.0.ebuild
deleted file mode 100644
index 4429789a971c..000000000000
--- a/gnome-extra/swfdec-gnome/swfdec-gnome-2.26.0.ebuild
+++ /dev/null
@@ -1,24 +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/swfdec-gnome/swfdec-gnome-2.26.0.ebuild,v 1.8 2010/07/20 02:21:52 jer Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Flash player and thumbnailer for GNOME"
-HOMEPAGE="http://swfdec.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.12.0
-		gnome-base/gconf
-		>=media-libs/swfdec-0.8[gtk]"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext"
-
-DOCS="NEWS README"
diff --git a/gnome-extra/swfdec-gnome/swfdec-gnome-2.28.0-r1.ebuild b/gnome-extra/swfdec-gnome/swfdec-gnome-2.28.0-r1.ebuild
deleted file mode 100644
index a4df95ab7896..000000000000
--- a/gnome-extra/swfdec-gnome/swfdec-gnome-2.28.0-r1.ebuild
+++ /dev/null
@@ -1,31 +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/swfdec-gnome/swfdec-gnome-2.28.0-r1.ebuild,v 1.5 2010/08/14 17:44:19 armin76 Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Flash player and thumbnailer for GNOME"
-HOMEPAGE="http://swfdec.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.12.0
-		gnome-base/gconf
-		>=media-libs/swfdec-0.8[gtk]"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext"
-
-DOCS="NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
diff --git a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild b/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild
index 8eccbf48737f..d4e607c8ea97 100644
--- a/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild
+++ b/gnome-extra/swfdec-gnome/swfdec-gnome-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/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild,v 1.3 2011/01/19 21:25:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/swfdec-gnome/swfdec-gnome-2.30.1.ebuild,v 1.4 2011/01/24 13:14:24 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.14
+RDEPEND=">=x11-libs/gtk+-2.14:2
 	>=gnome-base/gconf-2
 	>=media-libs/swfdec-0.8[gtk]"
 DEPEND="${RDEPEND}