pkgmove gnome-extra/libgtkhtml gnome-extra/gtkhtml

(Portage version: 2.1_pre3-r1)

8 files changed, 32 insertions, 36 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 26f1f5ce15a4..dfc300be178f 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/evolution
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.106 2006/01/12 23:16:38 compnerd Exp $
+
+  12 Jan 2006; Saleem Abdulrasool <compnerd@gentoo.org>
+  evolution-2.0.3-r2.ebuild, evolution-2.0.4.ebuild,
+  evolution-2.2.3-r3.ebuild, evolution-2.4.1.ebuild, evolution-2.4.2.ebuild,
+  evolution-2.4.2.1.ebuild:
+  pkgmove gnome-extra/libgtkhtml gnome-extra/gtkhtml
 
   12 Jan 2006; <dang@gentoo.org> evolution-1.2.4.ebuild:
   Change gtkhtml dep prior to libgtkhmtl->gtkhtml
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 7d5bcb662b91..21248b62b764 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,14 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b961487779728e43e470607ea97a6074 ChangeLog 31373
+MD5 a0c9217103d9a2215a3709d7a9192589 ChangeLog 31641
 MD5 95f6cf79b236723dc8e09937391dd4de evolution-1.2.4.ebuild 6245
-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 b8b6e85957f1c53b8c75270fd6c9987b evolution-2.4.1.ebuild 6384
-MD5 25c8a8ff3811c3704a8cfb672eb6fc6e evolution-2.4.2.1.ebuild 5771
-MD5 4bdbcc2757f5a3eddb5a03bc170e3a4e evolution-2.4.2.ebuild 5662
+MD5 37241f514469bbf857e819d5c4829ea3 evolution-2.0.3-r2.ebuild 4203
+MD5 d925ef327d961d66264a5f393b52d859 evolution-2.0.4.ebuild 4090
+MD5 439325360111fe4f6fc3d005757d4b2f evolution-2.2.3-r3.ebuild 6060
+MD5 64420f6729cea5cc45afe38c7f1bf363 evolution-2.4.1.ebuild 6381
+MD5 394e612e8ff39703f7272c646f99e892 evolution-2.4.2.1.ebuild 5768
+MD5 20fbef4d26962a0301c5b73cef59a01a evolution-2.4.2.ebuild 5659
 MD5 457d67c67b8f0b497d3f667be6e92577 files/digest-evolution-1.2.4 131
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
 MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70
@@ -31,10 +28,3 @@ 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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDxry6omPajV0RnrERAmyTAJ4t3Kii69JW0iIY1SkCD/p/i4RVPgCdHTJL
-z1cKZc0j2IDoy3gRFQRIkBE=
-=cTfh
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.0.3-r2.ebuild b/mail-client/evolution/evolution-2.0.3-r2.ebuild
index 66338ac52418..4d6911d14bf3 100644
--- a/mail-client/evolution/evolution-2.0.3-r2.ebuild
+++ b/mail-client/evolution/evolution-2.0.3-r2.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-2.0.3-r2.ebuild,v 1.10 2005/07/10 20:52:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3-r2.ebuild,v 1.11 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
@@ -13,7 +13,7 @@ KEYWORDS="x86 amd64 ppc sparc hppa ~ia64 mips alpha"
 IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
 
 # Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.4
+RDEPEND=">=gnome-extra/gtkhtml-3.2.4
 	>=gnome-extra/gal-2.2.4
 	>=gnome-extra/evolution-data-server-1.0.3
 	>=net-libs/libsoup-2.2.1
diff --git a/mail-client/evolution/evolution-2.0.4.ebuild b/mail-client/evolution/evolution-2.0.4.ebuild
index e20f3476ef80..de4de033b4c4 100644
--- a/mail-client/evolution/evolution-2.0.4.ebuild
+++ b/mail-client/evolution/evolution-2.0.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-2.0.4.ebuild,v 1.10 2005/07/10 20:52:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.4.ebuild,v 1.11 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils gnome2 flag-o-matic alternatives
 
@@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
 
 # Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.2.5
+RDEPEND=">=gnome-extra/gtkhtml-3.2.5
 	>=gnome-extra/gal-2.2.5
 	>=gnome-extra/evolution-data-server-1.0.4
 	>=net-libs/libsoup-2.2.1
diff --git a/mail-client/evolution/evolution-2.2.3-r3.ebuild b/mail-client/evolution/evolution-2.2.3-r3.ebuild
index 805e34a596ee..b7f1395fd7c6 100644
--- a/mail-client/evolution/evolution-2.2.3-r3.ebuild
+++ b/mail-client/evolution/evolution-2.2.3-r3.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-2.2.3-r3.ebuild,v 1.7 2005/08/24 16:08:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r3.ebuild,v 1.8 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -14,7 +14,7 @@ IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp p
 
 # Top stanza are ximian deps
 # Pango dependency required to avoid font rendering problems
-RDEPEND=">=gnome-extra/libgtkhtml-3.6.2
+RDEPEND=">=gnome-extra/gtkhtml-3.6.2
 	>=gnome-extra/gal-2.4.2
 	>=gnome-extra/evolution-data-server-1.2.2
 	>=net-libs/libsoup-2.2
diff --git a/mail-client/evolution/evolution-2.4.1.ebuild b/mail-client/evolution/evolution-2.4.1.ebuild
index 23a5d4e8a066..fe1beeadbf8e 100644
--- a/mail-client/evolution/evolution-2.4.1.ebuild
+++ b/mail-client/evolution/evolution-2.4.1.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-2.4.1.ebuild,v 1.2 2005/10/04 22:07:51 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.1.ebuild,v 1.3 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -15,7 +15,7 @@ IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp p
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	dev-libs/atk
-	>=gnome-extra/libgtkhtml-3.7
+	>=gnome-extra/gtkhtml-3.7
 	>=dev-libs/glib-2
 	>=gnome-base/orbit-2.9.8
 	>=gnome-base/libbonobo-2
diff --git a/mail-client/evolution/evolution-2.4.2.1.ebuild b/mail-client/evolution/evolution-2.4.2.1.ebuild
index af0b9112709d..feb307bfd5ee 100644
--- a/mail-client/evolution/evolution-2.4.2.1.ebuild
+++ b/mail-client/evolution/evolution-2.4.2.1.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-2.4.2.1.ebuild,v 1.1 2005/12/08 20:07:12 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.2.1.ebuild,v 1.2 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -15,7 +15,7 @@ IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profi
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	dev-libs/atk
-	>=gnome-extra/libgtkhtml-3.7
+	>=gnome-extra/gtkhtml-3.7
 	>=dev-libs/glib-2
 	>=gnome-base/orbit-2.9.8
 	>=gnome-base/libbonobo-2
diff --git a/mail-client/evolution/evolution-2.4.2.ebuild b/mail-client/evolution/evolution-2.4.2.ebuild
index dbc0c940c7dc..f60d900e33f8 100644
--- a/mail-client/evolution/evolution-2.4.2.ebuild
+++ b/mail-client/evolution/evolution-2.4.2.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-2.4.2.ebuild,v 1.2 2005/12/05 01:18:28 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.4.2.ebuild,v 1.3 2006/01/12 23:16:38 compnerd Exp $
 
 inherit eutils flag-o-matic alternatives gnome2
 
@@ -15,7 +15,7 @@ IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono nntp pda profi
 # Pango dependency required to avoid font rendering problems
 RDEPEND=">=x11-themes/gnome-icon-theme-1.2
 	dev-libs/atk
-	>=gnome-extra/libgtkhtml-3.7
+	>=gnome-extra/gtkhtml-3.7
 	>=dev-libs/glib-2
 	>=gnome-base/orbit-2.9.8
 	>=gnome-base/libbonobo-2