version bump

12 files changed, 35 insertions, 66 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 5d2fb825cd41..9c20afdb8a70 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.10 2004/10/03 22:48:22 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.11 2004/10/16 19:12:41 liquidx Exp $
+
+*evolution-data-server-1.0.2 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  -evolution-data-server-1.0.0.ebuild, +evolution-data-server-1.0.2.ebuild:
+  version bump. add amd64 fix for libdb (#64911).
 
   04 Oct 2004; Guy Martin <gmsoft@gentoo.org>
   evolution-data-server-1.0.1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 3f2078048942..2eb7f4031f67 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 57388c4a93b7ed5503517900f67b450c ChangeLog 1666
+MD5 7327deae3b47d9d62f086f91ca9a7ce7 evolution-data-server-1.0.0.ebuild 869
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9fcd25eb590d49e8c13b7634e3e3ce7d evolution-data-server-1.0.1.ebuild 869
-MD5 7327deae3b47d9d62f086f91ca9a7ce7 evolution-data-server-1.0.0.ebuild 869
-MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
+MD5 30b7c8f1a46b0771dce37c99e174cfb1 evolution-data-server-1.0.2.ebuild 871
 MD5 3fd1c3fafa70f6f1d534749bfd1430cb files/digest-evolution-data-server-1.0.0 81
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBaeFFHTu7gpaalycRAkgKAKCS3vYSEsD7yCvzxxMDLoMWFHT0hgCgvCgb
-FupbwlTk0aP+x2Ce4TE5J/o=
-=dmyw
------END PGP SIGNATURE-----
+MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
+MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
index 6b29b26fea20..0a1c1b27895a 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.0.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.0.0.ebuild,v 1.5 2004/10/11 01:26:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.0.2.ebuild,v 1.1 2004/10/16 19:12:41 liquidx Exp $
 
 inherit gnome2
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2
 	>=gnome-base/libgnome-2
 	>=gnome-base/gconf-2
 	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.2
+	>=net-libs/libsoup-2.2.1
 	ldap? ( >=net-nds/openldap-2.0 )"
 
 DEPEND="${RDEPEND}
@@ -31,3 +31,11 @@ G2CONF="${G2CONF} `use_with ldap openldap`"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR=1
+
+src_compile() {
+	cd ${S}/libdb/dist
+	./s_config || die
+
+	cd ${S}
+	gnome2_src_compile
+}
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.0 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.0
deleted file mode 100644
index c64dccc63824..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0f4f0a188a1021c2bd11cf5d8e2b47a9 evolution-data-server-1.0.0.tar.bz2 5011606
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2
new file mode 100644
index 000000000000..331bbcf8e9ee
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.2
@@ -0,0 +1 @@
+MD5 ca13b5dd751cd30c55e889d9a07e70fb evolution-data-server-1.0.2.tar.bz2 4939846
diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index a4aa113396e5..54eb0fa09c96 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.96 2004/10/08 14:19:44 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.97 2004/10/16 19:07:53 liquidx Exp $
+
+*libgtkhtml-3.2.3 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org> -libgtkhtml-3.2.0.ebuild,
+  -libgtkhtml-3.2.1.ebuild, +libgtkhtml-3.2.3.ebuild:
+  version bump
 
   08 Oct 2004; Guy Martin <gmsoft@gentoo.org> libgtkhtml-3.0.10-r1.ebuild:
   Marked stable on hppa.
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index e01bb5bd5ebc..176743c6b7dc 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -10,6 +10,7 @@ MD5 a34719c00644669069d45aa606c8e11f libgtkhtml-3.2.0.ebuild 1279
 MD5 acd44f134b8f47b70370ebdc996072ed libgtkhtml-3.2.1.ebuild 1163
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e8efbc1eed003f5d595e842b7530c8bf libgtkhtml-3.2.2.ebuild 1164
+MD5 c7dd7a291214d093ac06d7ba097d0c45 libgtkhtml-3.2.3.ebuild 1166
 MD5 c4945ff6d58733accdf9ff738ddc34b1 files/digest-libgtkhtml-2.4.0 69
 MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
 MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
@@ -25,3 +26,4 @@ MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
 MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
 MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
 MD5 11d0e80cc10335bb6025b2b270cb8bc4 files/digest-libgtkhtml-3.2.2 67
+MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.0 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.0
deleted file mode 100644
index dbe335e56272..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67cff3717a2914c630a30a78a0ac4d1d gtkhtml-3.2.0.tar.bz2 1299356
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1
deleted file mode 100644
index bd3127825cbd..000000000000
--- a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 271bab24a21005537773402964e5550f gtkhtml-3.2.1.tar.bz2 1315940
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3
new file mode 100644
index 000000000000..187d02bb9553
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.3
@@ -0,0 +1 @@
+MD5 fe7aa0259a4cd7c99280c076711f8f80 gtkhtml-3.2.3.tar.bz2 1304520
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.0.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.0.ebuild
deleted file mode 100644
index 67470f3cf529..000000000000
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.0.ebuild,v 1.1 2004/09/13 21:47:00 tseng Exp $
-
-inherit gnome2 eutils debug
-
-MY_P=${P/lib/}
-MY_PN=${PN/lib/}
-DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
-HOMEPAGE="http://www.gnome.org/"
-
-# stolen from gnome.org eclass because it support this one-off name-mangling
-
-[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
-PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
-LICENSE="GPL-2"
-SLOT="3.1"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=gnome-extra/gal-2.1.14
-	>=net-libs/libsoup-2.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=x11-themes/gnome-icon-theme-1.2.3
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonoboui-2.2.4
-	>=gnome-base/orbit-2.5.6
-	>=gnome-base/gnome-vfs-2.1
-	>=gnome-base/gail-1
-	>=dev-libs/libxml2-2.5"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	>=dev-util/pkgconfig-0.12.0"
-
-USE_DESTDIR="1"
-SCROLLKEEPER_UPDATE="0"
-ELTCONF="--reverse-deps"
-
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
index 55a9f6af492d..4f142c95ec79 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.1.ebuild,v 1.1 2004/09/17 11:32:44 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.1 2004/10/16 19:07:53 liquidx Exp $
 
 inherit gnome2 eutils
 
@@ -21,8 +21,8 @@ IUSE=""
 
 S=${WORKDIR}/${MY_P}
 
-RDEPEND=">=gnome-extra/gal-2.1.14
-	>=net-libs/libsoup-2.2
+RDEPEND=">=gnome-extra/gal-2.2.3
+	>=net-libs/libsoup-2.2.1
 	>=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomeprint-2.2