Slotted gtk+ depend and EAPI=2 bump to support it.

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

4 files changed, 16 insertions, 23 deletions

diff --git a/x11-misc/zim/ChangeLog b/x11-misc/zim/ChangeLog
index cd7570572a01..3ce52360093e 100644
--- a/x11-misc/zim/ChangeLog
+++ b/x11-misc/zim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/zim
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.11 2010/06/15 17:06:53 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/ChangeLog,v 1.12 2011/03/02 19:22:25 signals Exp $
+
+  02 Mar 2011; Kevin McCarthy <signals@gentoo.org> zim-0.28.ebuild,
+  zim-0.46.ebuild:
+  Slotted gtk+ depend and EAPI=2 bump to support it.
 
 *zim-0.47 (15 Jun 2010)
 
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 73160d482797..94a9713633d3 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX zim-0.28-disable-updates.patch 1013 RMD160 a576cdaaeeb74092e93575c66e14a7cfacf84f92 SHA1 41cefbcc281695d1e49235b2d79af2bf9a825862 SHA256 857ba4fe2d01ae801bd9216ab394379617abc94eaaf4dbe14d793dd3889ade65
 AUX zim-0.46-disable-updates.patch 826 RMD160 d3b28b81f4b16106ea59fcaa813f0fe7b7f7faab SHA1 22d46e43916cfecd60721eb512d8107caec9c866 SHA256 f5cc77aec143b3b3d71da0cf16dc8400ad50ef7bc460f601b93d57670e4b4642
 DIST Zim-0.28.tar.gz 897945 RMD160 b6ecc7c6f094670754b4219e7506edefd00b2ca1 SHA1 c0d1d5ad956ee682f01ecbd89009eb9f0852f34c SHA256 de1f3b476a07b171d884c96fa02e4094cebe36b890c730e6a629f8062db0724c
 DIST zim-0.46.tar.gz 669891 RMD160 8b10467cac9682438feba504a56b52aaf7c65273 SHA1 58591e0bbbb0fa9b6856356ad02f9b6b4ea20779 SHA256 8aaa1c890c1c09cae77e842d1427c5858c0b9c3b1c60e2434e0eda5a7eb312b1
 DIST zim-0.47.tar.gz 882667 RMD160 e6653703bb0f9c2f14026d8ae197aaa36891a60b SHA1 a59f55576f2c94edfb22af0418c29f489b91fe88 SHA256 04d1304df2b7a544a6b0ced8ce45e29cdb78d1505fc402823da6a44426a5246b
-EBUILD zim-0.28.ebuild 1627 RMD160 23d967ef1577a043200df8b151431d6eafe2e68e SHA1 76295e266966b6c5d1b521e0887119c436c826d7 SHA256 f22d62c24b26492947602b70ce1cd1b7bee975d316381aab6080a822f199a64a
-EBUILD zim-0.46.ebuild 1686 RMD160 40579b8c9e997fd25616c63c40840952cf5e59d0 SHA1 758af535f5af3cdd92a4857c88a515241422e617 SHA256 4016cd408a6869ee808c76ec6a2da92fda24dcbcec419144d740eba4eb67ee70
+EBUILD zim-0.28.ebuild 1632 RMD160 a171c74ec777a31dcc19e7d561b6f06079873cd8 SHA1 05de257e33b947452e82151481ad23d6753a3820 SHA256 8715d7475e89e358d7744e2b56bbbc511f6139c62d389a1d8d06574d661c1c91
+EBUILD zim-0.46.ebuild 1680 RMD160 996e9aebdb428ff6ce184b83813bdc330fa71a1a SHA1 40172c4024d4aca0f8caa01d02018721817b5424 SHA256 3a0ec161056969b62bcccb37c879653c9f812cfd7c5e6078e9628e8c3e190d91
 EBUILD zim-0.47.ebuild 1576 RMD160 3303729ddc6f54164ac575ae2ede980608bc62f1 SHA1 5bc64f5e2bad10cd12392bdeb215868d35921188 SHA256 f368b659e3280fb23efedd9c11329adb0768c6fc77e43bc52deb3c0a2795ccbc
-MISC ChangeLog 2468 RMD160 ab2c28e6e044a715c2ff2ce6994cad7c24011c9f SHA1 9f86f7ba62a65361e5a7984259e7aeb3d1f0e79c SHA256 98469dda064312a63bcf2377bb97ca36bb6a015a2502a43f06c851920a883243
+MISC ChangeLog 2606 RMD160 146c7bc817baabff27a81effe03a7302691d0e4b SHA1 94d76113d7a2380b504a163dc2ce374da0d6f14f SHA256 c5182f773a8707293f95b12a5aa731050725d0fd50f2d6caec1e5b4cfc6f66f2
 MISC metadata.xml 813 RMD160 a35b3e3a805640795c34f0bce74ea458b21f94e2 SHA1 b9bd7c60ff23aa83d61efb24e2fd83fbcff6cd17 SHA256 d8b1a3f54c3aa3e256fec9d9a9db6459b530b3232d54d0db17439a24ce57b980
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iJwEAQECAAYFAkwXszYACgkQIiMqcbOVdxS1GwP9GbQrdh8qf4yhorC2LCEyLXtt
-3GS3ccaQ8/yTTYiJ0ynAehVPLUWwgEqRpp143gw6tgOnkYdsfn317drWWomPHntt
-DXGYJnHmkGBZypsXduiUMarWSCfMQIasTYU8QEcgDqCl2FJEetsUqWctTBPaICAC
-LQAfLDiWt1X+ueS581I=
-=LmZM
------END PGP SIGNATURE-----
diff --git a/x11-misc/zim/zim-0.28.ebuild b/x11-misc/zim/zim-0.28.ebuild
index 82b91ee6d232..104a5cd7ab1f 100644
--- a/x11-misc/zim/zim-0.28.ebuild
+++ b/x11-misc/zim/zim-0.28.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.28.ebuild,v 1.2 2009/08/10 17:54:54 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.28.ebuild,v 1.3 2011/03/02 19:22:25 signals Exp $
 
+EAPI=2
 inherit eutils fdo-mime perl-module
 
 MY_P=${P/z/Z}
@@ -16,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="latex screenshot spell test"
 
 COMMON_DEPEND=">=dev-lang/perl-5.8
-	>=x11-libs/gtk+-2.10
+	x11-libs/gtk+:2
 	virtual/perl-Storable
 	virtual/perl-IO
 	virtual/perl-File-Spec
diff --git a/x11-misc/zim/zim-0.46.ebuild b/x11-misc/zim/zim-0.46.ebuild
index ce01577e4bb8..6303823c031a 100644
--- a/x11-misc/zim/zim-0.46.ebuild
+++ b/x11-misc/zim/zim-0.46.ebuild
@@ -1,6 +1,6 @@
-# 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/x11-misc/zim/zim-0.46.ebuild,v 1.2 2010/06/15 15:27:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/zim/zim-0.46.ebuild,v 1.3 2011/03/02 19:22:25 signals Exp $
 
 PYTHON_USE_WITH="sqlite"
 PYTHON_DEPEND="2:2.5"
@@ -21,7 +21,7 @@ IUSE="graphviz latex screenshot spell test"
 RDEPEND="|| ( >=dev-lang/python-2.6 dev-python/simplejson )
 	dev-python/pygobject
 	dev-python/pygtk
-	>=x11-libs/gtk+-2.10
+	x11-libs/gtk+:2
 	x11-misc/xdg-utils
 	graphviz? ( media-gfx/graphviz )
 	latex? ( virtual/latex-base app-text/dvipng )