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

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

5 files changed, 13 insertions, 67 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/Manifest b/gnome-extra/swfdec-gnome/Manifest
index c2395f016014..027cdd9d6c1a 100644
--- a/gnome-extra/swfdec-gnome/Manifest
+++ b/gnome-extra/swfdec-gnome/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST swfdec-gnome-2.26.0.tar.bz2 193839 RMD160 4cc489679f285926142b0cc450711f990e9ed5ec SHA1 8b381932865aa2eac74f306eb66e523baa763850 SHA256 bf48dcadd9ca015f40a9aaa9cc94d402e9daf7c88b747789c79fcc921e9e1626
-DIST swfdec-gnome-2.28.0.tar.bz2 170434 RMD160 b6dad5d915812ccf78417ada0b447a2270593ae6 SHA1 7f06daf86a56a7ae15f50a8bb7fdc5713542ce04 SHA256 960ebd98fdfb5b02cdb2bc5681d5937e8c0369f7706ae2ddcfb3774344b389a4
 DIST swfdec-gnome-2.30.0.tar.bz2 177557 RMD160 5f92ec9f9df652bfac96418352573ba7c7b1a399 SHA1 fb59836c1d6e8c7fcbd9b5c9571c6b0e133b343b SHA256 d9e5f0a2460726518c9cde14a137d3e0045d4ec64c40a8254914e5a08d2bb459
 DIST swfdec-gnome-2.30.1.tar.bz2 176616 RMD160 93655b9b18b3a51cb18eac0909e4cf7b77b6d5ae SHA1 dd75516c52bce253f8b30cb6ba11beaee8cdd016 SHA256 e684a2ae44ff52b925796734813c32fa222d4aba0aa85fd77276e99a12317b88
-EBUILD swfdec-gnome-2.26.0.ebuild 620 RMD160 e94a791fc5177b29da78c42fde2e0a39f4db156f SHA1 a6ea8e10244379f5afc5a959b057b9e106d8c709 SHA256 713987da3c63d735d093270808cd49f28a6d6107301aba373249e6e5c6912475
-EBUILD swfdec-gnome-2.28.0-r1.ebuild 806 RMD160 283428e99c24333aee2bb96dea7831d632979141 SHA1 5c2885b38030eab1364f0bfd2a58f0f8e9bd5f77 SHA256 ffb9fb6a527802308d50c9089ba82247602f0bf766ad79f7d2247eac683b9176
 EBUILD swfdec-gnome-2.30.0.ebuild 624 RMD160 46c7a0ab2afec726239b0606e9ba7725f76dbc0d SHA1 2a1bfda78b0001d0ef018b9e22c57c9681c52db1 SHA256 ce9dc6ffebc5d40e7e86c0180a40c15dea59fed03dfefdc9c57a03b74cb210ea
-EBUILD swfdec-gnome-2.30.1.ebuild 647 RMD160 b663adf8d0ac9a657ebc7997a4664bf6add1923f SHA1 7026907dfde3a3a3f35af90ff696ff7dd354ffb2 SHA256 86b88a213b36061e46e871c17826a5c2ad711044e1600a087a1f166172f6a1f2
-MISC ChangeLog 6620 RMD160 3554beca98ac3866c3900de7b7ab67ebe9acf295 SHA1 245bd17764d18dfcbecc937ff416baa0f1857d71 SHA256 14ae9132b46e140e4d5ed44536e0097f162c47227280bf8c30584468f5e4773b
+EBUILD swfdec-gnome-2.30.1.ebuild 644 RMD160 03bba45130b20bf81395bd4cce6006352ad7d0a3 SHA1 544e06968a4479c0f88e0f14371cb9a271ee4673 SHA256 cabc5e50cd45eab9fc53290374c06098208c205592ca9aa488ce7e1aa847ee25
+MISC ChangeLog 6820 RMD160 0ec51272b0356da415a65d194e7482ce123680ab SHA1 2a12f590812508d5a12bc9735469d4a9b2507137 SHA256 4ce9382793a0f20cf5887ed249547663e5f6ceade60ef640df24657365b95232
 MISC metadata.xml 237 RMD160 97d6ebb4f1b140e07ce9ffbf2382d65b09aaf8bc SHA1 2e8d6bf26ea32cfc185e2d6ab0fe1385d415a593 SHA256 940e435cc25e105445a895e7fb0c318ae581ebf97a940879f2bca2687236af07
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk03Vp4ACgkQ9/cejkQaxBB6KgCfQxIWzN/EVIDT2vVWY9lQAUg4
-oCEAnRvE11aenuW06V33pqbXhuC2A871
-=+DVM
+iEYEARECAAYFAk09ezUACgkQ1fmVwcYIWAZfhACgwGgxv/nwp8aLKsycrSEBepL0
+cgcAn2GHI4HCx3B+8H8YINWgchLkaja5
+=g8rt
 -----END PGP SIGNATURE-----
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}