Using goffice-0.6 requires latest gtkhtml (#204798)

Package-Manager: portage-2.1.4_rc14

3 files changed, 19 insertions, 19 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 8a1f0c4d2359..e3043adea2e6 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.146 2008/01/07 08:39:19 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.147 2008/01/08 06:56:04 tove Exp $
+
+  08 Jan 2008; Torsten Veller <tove@gentoo.org> gnucash-2.2.2-r1.ebuild:
+  Using goffice-0.6 requires latest gtkhtml (#204798)
 
 *gnucash-2.2.2-r1 (07 Jan 2008)
 
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index a56417a3cddf..41582e14facb 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -26,18 +26,18 @@ EBUILD gnucash-2.2.1-r1.ebuild 2687 RMD160 96861a788661df4b61b47c6746758bf81143c
 MD5 ce36553bf8d85d280fce8c434c9d867d gnucash-2.2.1-r1.ebuild 2687
 RMD160 96861a788661df4b61b47c6746758bf81143cd11 gnucash-2.2.1-r1.ebuild 2687
 SHA256 3900b8781918f904ff317e3430525bc9b12befad39f6621e5283e6c710d70cb8 gnucash-2.2.1-r1.ebuild 2687
-EBUILD gnucash-2.2.2-r1.ebuild 2986 RMD160 6cb823ea018616156c232ab7d6fdf2a3def9cfc0 SHA1 8561fb7abcbe834e66d655964a2f2247240b6833 SHA256 bb8bf90a51633084dd7cc13a559b2d1160d80973d24e5e21b40cd5e8d1b1ab33
-MD5 c4181b6beb7a868b9dbd299c9c044051 gnucash-2.2.2-r1.ebuild 2986
-RMD160 6cb823ea018616156c232ab7d6fdf2a3def9cfc0 gnucash-2.2.2-r1.ebuild 2986
-SHA256 bb8bf90a51633084dd7cc13a559b2d1160d80973d24e5e21b40cd5e8d1b1ab33 gnucash-2.2.2-r1.ebuild 2986
+EBUILD gnucash-2.2.2-r1.ebuild 2954 RMD160 4215cf808941aa38fe38cb240e59f5802ce0ae11 SHA1 97eda6a658592a2624ff15cd2d89a181eb12b262 SHA256 3a042a7a6e3d8bbaf6699137d5d6630ed25b93b2f9c625489968ac1e642b844a
+MD5 08d37bf5c097044fedd5665b011cfc59 gnucash-2.2.2-r1.ebuild 2954
+RMD160 4215cf808941aa38fe38cb240e59f5802ce0ae11 gnucash-2.2.2-r1.ebuild 2954
+SHA256 3a042a7a6e3d8bbaf6699137d5d6630ed25b93b2f9c625489968ac1e642b844a gnucash-2.2.2-r1.ebuild 2954
 EBUILD gnucash-2.2.2.ebuild 2895 RMD160 08c28179cb6ceaa9bcb52b8eef3d2a1bfe7be727 SHA1 5615f58014dcfc928efb8bff1161e3fcbd8580c8 SHA256 961ddef489a185b5f7cf4367e727bc9493fae714dea50ae00c4f23f30fe8149e
 MD5 dce412c620085f038e8b7fb021db4bc4 gnucash-2.2.2.ebuild 2895
 RMD160 08c28179cb6ceaa9bcb52b8eef3d2a1bfe7be727 gnucash-2.2.2.ebuild 2895
 SHA256 961ddef489a185b5f7cf4367e727bc9493fae714dea50ae00c4f23f30fe8149e gnucash-2.2.2.ebuild 2895
-MISC ChangeLog 22386 RMD160 610e9641f1895072dd5b53cc5a0b6ca30dce7caa SHA1 52702ffc0900d21924117e3ca4c8927e7e594d4c SHA256 c20b4b8ce0702ba7a8f715279d3a3a4351e957cbe266576ae0aa1ac17d739fc9
-MD5 fc43b09e21f4b86a24e83bc578e6f001 ChangeLog 22386
-RMD160 610e9641f1895072dd5b53cc5a0b6ca30dce7caa ChangeLog 22386
-SHA256 c20b4b8ce0702ba7a8f715279d3a3a4351e957cbe266576ae0aa1ac17d739fc9 ChangeLog 22386
+MISC ChangeLog 22514 RMD160 74dfc0965ab7132f3819bc9fbe96cd556516e828 SHA1 f1f7793bd8d023155f523f6ca580608e4b89e6a2 SHA256 80956d44f45603e7c0581899cdf3974bf4929d1d3ea7450827ea22336f00c3ba
+MD5 676f4e1d419190263ee9e62a8dce9cc7 ChangeLog 22514
+RMD160 74dfc0965ab7132f3819bc9fbe96cd556516e828 ChangeLog 22514
+SHA256 80956d44f45603e7c0581899cdf3974bf4929d1d3ea7450827ea22336f00c3ba ChangeLog 22514
 MISC metadata.xml 255 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 SHA1 7f6701628873130644bd55c3898c8baf59279c74 SHA256 8405513ba61307253676b41faad6234e851a4d136c47fb92fb08eab1d5f0ea76
 MD5 5a997c1c189832cfc13e114ed77828e2 metadata.xml 255
 RMD160 eed2a430ff95a969fb224cec79676fc1651de745 metadata.xml 255
@@ -57,7 +57,7 @@ SHA256 192e3a93a4b76816fc57ef38076a19098e0a39f2496cc2774e86ba16deab5f26 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkeB5T4ACgkQV3J2n04Eaux8awCgo09CBGiHaEhf56BKNVNS40aA
-AaYAn2WhwbhrbgViTbPMRXE8WEzsUrTw
-=1zGc
+iEYEARECAAYFAkeDHosACgkQV3J2n04EauyNJgCfT6AbMZYEOMhDiy3safF6WGvu
+QA0An2mt1WSrBrftruvNN/7SVXbg1JMO
+=NZTI
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/gnucash-2.2.2-r1.ebuild b/app-office/gnucash/gnucash-2.2.2-r1.ebuild
index 92e218f42964..8e6dae619f6e 100644
--- a/app-office/gnucash/gnucash-2.2.2-r1.ebuild
+++ b/app-office/gnucash/gnucash-2.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.2-r1.ebuild,v 1.1 2008/01/07 08:39:19 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.2-r1.ebuild,v 1.2 2008/01/08 06:56:05 tove Exp $
 
 inherit autotools eutils gnome2
 
@@ -22,19 +22,16 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	     (  <dev-scheme/guile-1.8.3  =dev-scheme/slib-3.1.1* ) )
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/popt-1.5
-	>=x11-libs/gtk+-2.6
+	>=x11-libs/gtk+-2.10
 	>=gnome-base/libgnomeui-2.4
 	>=gnome-base/libgnomeprint-2.10
 	>=gnome-base/libgnomeprintui-2.10
 	>=gnome-base/libglade-2.4
-	|| (
-		=gnome-extra/gtkhtml-3.12*
-		=gnome-extra/gtkhtml-3.10*
-	)
+	>=gnome-extra/gtkhtml-3.14
 	>=dev-libs/libxml2-2.5.10
 	>=gnome-base/gconf-2
 	>=app-text/scrollkeeper-0.3
-	x11-libs/goffice
+	>=x11-libs/goffice-0.6
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	hbci? ( net-libs/aqbanking
 		chipcard? ( sys-libs/libchipcard )