Change gtkhtml dep prior to libgtkhmtl->gtkhtml

Package-Manager: portage-2.1_pre3-r1

7 files changed, 40 insertions, 44 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 711466db0506..0ac841dea31c 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/balsa
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.35 2005/09/17 14:53:21 kloeri Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.36 2006/01/12 20:29:13 dang Exp $
+
+  12 Jan 2006; <dang@gentoo.org> balsa-1.4.3.ebuild:
+  Change gtkhtml dep prior to libgtkhmtl->gtkhtml
 
 *balsa-2.3.4-r1 (07 Jul 2005)
 
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 2731184c1c53..c3717f43b252 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,13 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d4f6dbc31e378077014bb877a6be7feb balsa-1.4.3.ebuild 1700
+MD5 3445d433a2b61de596e6918696169ff1 ChangeLog 13834
+MD5 cf91e5c9d4e3edef7d36be3e90fcbe8c balsa-1.4.3.ebuild 1695
 MD5 ba29ad8f611eb27379e2a0e89bbf5460 balsa-2.0.15-r2.ebuild 1898
 MD5 200266fcc87c5e7e698c879b5496dad8 balsa-2.2.6-r3.ebuild 1877
 MD5 df7483c9cdf03456bd33b9388a1bd49d balsa-2.2.6-r4.ebuild 1971
 MD5 080af7166791ef512199de757756b103 balsa-2.3.4-r1.ebuild 1914
-MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 3445d433a2b61de596e6918696169ff1 ChangeLog 13834
 MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
 MD5 cb6019030e00d143459011755f8f525f files/balsa-2.2.6-deprecation.fix.patch 3352
 MD5 ac3aa7f8b055ab95a1ee266c1067c801 files/balsa-2.3.4-icon-cache.patch 399
@@ -20,10 +16,4 @@ MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r3 65
 MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r4 65
 MD5 954743342b34b3832c47b8913748d98d files/digest-balsa-2.3.4-r1 65
 MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLC35Kf2g/qXtneoRAuYbAKC+AfMyrx7v2JBlRfOX8BfzV67ezwCgxVMW
-OIlOYcqLk6/C9+OdQXePQc0=
-=+UjL
------END PGP SIGNATURE-----
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
diff --git a/mail-client/balsa/balsa-1.4.3.ebuild b/mail-client/balsa/balsa-1.4.3.ebuild
index ee5a0e60cd96..99b69d4db933 100644
--- a/mail-client/balsa/balsa-1.4.3.ebuild
+++ b/mail-client/balsa/balsa-1.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-1.4.3.ebuild,v 1.7 2005/03/26 04:23:12 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-1.4.3.ebuild,v 1.8 2006/01/12 20:29:13 dang Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ DEPEND="=dev-libs/glib-1.2*
 	cups? ( >=gnome-base/gnome-print-0.30 )
 	perl? ( >=dev-libs/libpcre-3.4 )
 	spell? ( virtual/aspell-dict )
-	gtkhtml? ( >=gnome-extra/gtkhtml-0.16.1 )"
+	gtkhtml? ( =gnome-extra/gtkhtml-1* )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index dd794d265139..26f1f5ce15a4 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/evolution
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.104 2005/12/08 20:07:12 allanonjl Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.105 2006/01/12 20:31:05 dang Exp $
+
+  12 Jan 2006; <dang@gentoo.org> evolution-1.2.4.ebuild:
+  Change gtkhtml dep prior to libgtkhmtl->gtkhtml
 
 *evolution-2.4.2.1 (08 Dec 2005)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 6847d9397d2d..251a65355c02 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,30 +1,30 @@
-MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254
-MD5 25c8a8ff3811c3704a8cfb672eb6fc6e evolution-2.4.2.1.ebuild 5771
-MD5 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
-MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
+MD5 23f6bc38d985c648017965ba3d3d6b46 ChangeLog 31270
+MD5 7ae04e666a48f26825d6da3b3f9897d6 evolution-1.2.4.ebuild 6249
 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206
+MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093
 MD5 3c3a045e22357b7bbb98e000ebf161c1 evolution-2.2.3-r3.ebuild 6063
-MD5 23f6bc38d985c648017965ba3d3d6b46 ChangeLog 31270
-MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
 MD5 b8b6e85957f1c53b8c75270fd6c9987b evolution-2.4.1.ebuild 6384
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
-MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
-MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
-MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
-MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
-MD5 5b251dccca668c00b3b15692399253a9 files/digest-evolution-2.4.2.1 72
-MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
-MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
-MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 25c8a8ff3811c3704a8cfb672eb6fc6e evolution-2.4.2.1.ebuild 5771
+MD5 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
+MD5 457d67c67b8f0b497d3f667be6e92577 files/digest-evolution-1.2.4 131
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
-MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r3 70
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
 MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
+MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r3 70
 MD5 df16d9e1a97c7c51943e481671bbe509 files/digest-evolution-2.4.1 70
 MD5 5ed7243a0f9ac1f4533f95f2ac2cd159 files/digest-evolution-2.4.2 70
-MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
-MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
+MD5 5b251dccca668c00b3b15692399253a9 files/digest-evolution-2.4.2.1 72
+MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733
+MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838
 MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491
+MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570
+MD5 b5eaa2e30f75b8ec2df29cfd90a1e1f0 files/evolution-2.3.7-configure_plugins.patch 3010
+MD5 35dfdb3422f49ada8891285f5104d29c files/evolution-2.3.8-gentoo.patch 660
+MD5 c6f7cb2777a5622bc3ea45b046713895 files/evolution-2.4.2.1-link.patch 2625
 MD5 56a0d793e598c8e0c91ec5ab0e2a4e4b files/evolution.formatstring.patch 2146
+MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737
+MD5 f0750af493d9560f5faf50f39fd644c5 metadata.xml 285
diff --git a/mail-client/evolution/evolution-1.2.4.ebuild b/mail-client/evolution/evolution-1.2.4.ebuild
index 226eae82f1e5..381e414d0791 100644
--- a/mail-client/evolution/evolution-1.2.4.ebuild
+++ b/mail-client/evolution/evolution-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.2.4.ebuild,v 1.8 2005/07/10 20:52:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-1.2.4.ebuild,v 1.9 2006/01/12 20:31:05 dang Exp $
 
 IUSE="ssl nls mozilla ldap doc spell pda ipv6 kerberos kde crypt"
 
@@ -23,7 +23,7 @@ RDEPEND="app-text/scrollkeeper
 	>=gnome-base/gnome-common-1.2
 	=gnome-extra/gal-0.24*
 	=gnome-base/gconf-1.0*
-	>=gnome-extra/gtkhtml-1.1.10
+	=gnome-extra/gtkhtml-1*
 	>=gnome-base/oaf-0.6.10
 	=gnome-base/orbit-0*
 	<gnome-base/libglade-2.0
diff --git a/mail-client/evolution/files/digest-evolution-1.2.4 b/mail-client/evolution/files/digest-evolution-1.2.4
index 31ca57ed3cf8..bbc0518e6bba 100644
--- a/mail-client/evolution/files/digest-evolution-1.2.4
+++ b/mail-client/evolution/files/digest-evolution-1.2.4
@@ -1,2 +1,2 @@
-MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251
 MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
+MD5 2c525e0d0e570c96e4fb1fd95e46354c evolution-1.2.4.tar.gz 16673251