New version

11 files changed, 186 insertions, 27 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 8ec33410991d..ec7bae865de5 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.19 2004/12/23 16:27:29 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.20 2004/12/29 17:07:01 obz Exp $
+
+*evolution-data-server-1.0.3 (30 Dec 2004)
+
+  30 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +evolution-data-server-1.0.3.ebuild:
+  New version
 
   23 Dec 2004; Guy Martin <gmsoft@gentoo.org>
   evolution-data-server-1.0.2.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 9fbb5a21a920..a09d88ae53d1 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,7 +1,9 @@
-MD5 54b54216994d72888dcb391921cb1a91 ChangeLog 2792
+MD5 8dfb8373d6b9c27cc0b3ff1701932a32 evolution-data-server-1.0.3.ebuild 953
 MD5 bd8d9b31ca51536333884d26fdb51fcc evolution-data-server-1.0.2.ebuild 1069
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 029c31aed22ab6b162b419af429af30f evolution-data-server-1.0.1.ebuild 887
+MD5 54b54216994d72888dcb391921cb1a91 ChangeLog 2792
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 9d35355b61cdb08f0f918e3f106ce953 files/digest-evolution-data-server-1.0.1 81
 MD5 e72d151eb141e23240770c222c39e317 files/digest-evolution-data-server-1.0.2 81
+MD5 dfc34218a032bcd275fc5fb09376abea files/digest-evolution-data-server-1.0.3 81
 MD5 c93bb2769f43f6e88e5fcb385a0ab498 files/evolution-data-server-1.0.2-amd64_mutex.patch 1114
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild
new file mode 100644
index 000000000000..4c3debf650d7
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.0.3.ebuild
@@ -0,0 +1,47 @@
+# 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.3.ebuild,v 1.1 2004/12/29 17:07:01 obz Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="http://www.ximian.com/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~ppc64"
+IUSE="doc ldap"
+
+RDEPEND=">=dev-libs/glib-2
+	>=gnome-base/libbonobo-2.4.2
+	>=gnome-base/orbit-2.9.8
+	>=gnome-base/gnome-vfs-2
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.2.1
+	ldap? ( >=net-nds/openldap-2.0 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.30
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+G2CONF="${G2CONF} `use_with ldap openldap`"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR=1
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-1.0.2-amd64_mutex.patch
+}
+
+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.3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.3
new file mode 100644
index 000000000000..4ad6d94e21ee
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.0.3
@@ -0,0 +1 @@
+MD5 6fc9aa8178540828c0056e2b070b7546 evolution-data-server-1.0.3.tar.bz2 4869529
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index fa2ba67c1f97..8218d55ab3c4 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,14 +1,16 @@
+MD5 8af27b810b493362a9d4d3b86266e564 gal-1.99.11.ebuild 969
+MD5 1f63d0f0b89da02803c10abb9f349ac8 gal-2.2.4.ebuild 1199
 MD5 1d162abbe393a1ea3438771628c0002c gal-2.2.3.ebuild 1288
 MD5 be086a4130449a3c53e1df31e6cb75d2 gal-0.24.ebuild 2087
 MD5 0b6f832cd34eafa28e6885ec7062860f gal-2.2.2.ebuild 1287
 MD5 d715789a7ed75efc315208bd705ab935 ChangeLog 9104
-MD5 8af27b810b493362a9d4d3b86266e564 gal-1.99.11.ebuild 969
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
+MD5 d3f2cb3e99716f24029dd7afa3fa97a3 files/digest-gal-0.24 62
 MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
-MD5 091ca91bcf117dc0fdb319d85e98ffeb files/digest-gal-2.2.3 63
-MD5 f912b63413502c12279194f0150e7987 files/digest-gal-2.2.2 63
-MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
 MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
-MD5 d3f2cb3e99716f24029dd7afa3fa97a3 files/digest-gal-0.24 62
+MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
 MD5 97951a1b0e70fcbb12ca490084442b33 files/gal-2.2.0-docfix.patch 2569
+MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
+MD5 f912b63413502c12279194f0150e7987 files/digest-gal-2.2.2 63
+MD5 091ca91bcf117dc0fdb319d85e98ffeb files/digest-gal-2.2.3 63
+MD5 c6255084120bc27d90ae92dd62826c16 files/digest-gal-2.2.4 63
diff --git a/gnome-extra/gal/files/digest-gal-2.2.4 b/gnome-extra/gal/files/digest-gal-2.2.4
new file mode 100644
index 000000000000..9a5b6af05f31
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-2.2.4
@@ -0,0 +1 @@
+MD5 55382b07a9dbe6c31889ae77bf467ba8 gal-2.2.4.tar.bz2 1161452
diff --git a/gnome-extra/gal/gal-2.2.4.ebuild b/gnome-extra/gal/gal-2.2.4.ebuild
new file mode 100644
index 000000000000..c859580a9729
--- /dev/null
+++ b/gnome-extra/gal/gal-2.2.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.2.4.ebuild,v 1.1 2004/12/29 17:01:41 obz Exp $
+
+inherit gnome2 libtool eutils
+
+DESCRIPTION="The Gnome Application Libraries"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="2.2"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomecanvas-2.2.0.2
+	>=dev-libs/libxml2-2
+	app-text/scrollkeeper"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.30
+	doc? ( dev-util/gtk-doc )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+USE_DESTDIR="1"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+
+	unpack ${A}
+	gnome2_omf_fix
+
+	#GCC 3.4 fix
+	cd ${S}
+	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
+
+	ln -s ${S}/docs/gal-decl.txt ${S}/docs/gal-2.2-decl.txt
+	ln -s ${S}/docs/gal-sections.txt ${S}/docs/gal-2.2-sections.txt
+
+	#USE=doc build fix
+	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
+	#cd ${S}/docs
+	#for x in gal*; do mv "$x" `echo $x | sed -e 's/gal/gal-2.2/g';`; done
+	# FIXME : builds now, but docs aren't generated
+
+}
diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 26651582b60f..b1ba249ee4a4 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # 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.104 2004/12/29 02:27:18 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.105 2004/12/29 17:04:40 obz Exp $
+
+*libgtkhtml-3.2.4 (30 Dec 2004)
+
+  30 Dec 2004; Mike Gardiner <obz@gentoo.org> +libgtkhtml-3.2.4.ebuild:
+  New version
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 2ce81c92267b..9df9e98d7c7f 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,25 +1,27 @@
-MD5 be4e5e188d0b5717ecfb74b88ba115ff libgtkhtml-3.2.2.ebuild 1092
+MD5 8632089b6020f33a5591e71bbb838ffd libgtkhtml-2.6.0.ebuild 931
 MD5 bc5fca32cbca890743487c8947e1679c libgtkhtml-2.4.1.ebuild 848
-MD5 531f95eb89f37f51a12d938d2ae95824 ChangeLog 13420
-MD5 f63b01a4d64590ec5792838ee4acc08b libgtkhtml-3.0.10.ebuild 1200
-MD5 8acfa41ae70e02c74b94da8d51dcaee7 libgtkhtml-2.4.0.ebuild 838
-MD5 703344ac47772366ce5195c232876732 libgtkhtml-2.6.1.ebuild 937
 MD5 30db95792c9b2d9af7cd6ce78aa4d282 libgtkhtml-2.6.2.ebuild 941
+MD5 be4e5e188d0b5717ecfb74b88ba115ff libgtkhtml-3.2.2.ebuild 1092
 MD5 a9ae5a3210e19aafd2aa7d89772d9746 libgtkhtml-3.0.10-r1.ebuild 1335
-MD5 099534f0a5dec7b98ad8a515e709465d libgtkhtml-3.2.3.ebuild 1094
+MD5 8acfa41ae70e02c74b94da8d51dcaee7 libgtkhtml-2.4.0.ebuild 838
+MD5 cf77846edb66f1832ed100102af08b72 libgtkhtml-3.2.4.ebuild 960
+MD5 703344ac47772366ce5195c232876732 libgtkhtml-2.6.1.ebuild 937
+MD5 531f95eb89f37f51a12d938d2ae95824 ChangeLog 13420
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 8632089b6020f33a5591e71bbb838ffd libgtkhtml-2.6.0.ebuild 931
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
-MD5 11d0e80cc10335bb6025b2b270cb8bc4 files/digest-libgtkhtml-3.2.2 67
-MD5 1f2800f5de2c490d27d8befe0bf150e3 files/digest-libgtkhtml-2.6.0 69
-MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
-MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
-MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
+MD5 099534f0a5dec7b98ad8a515e709465d libgtkhtml-3.2.3.ebuild 1094
+MD5 f63b01a4d64590ec5792838ee4acc08b libgtkhtml-3.0.10.ebuild 1200
 MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
-MD5 a5a0241e2812997e4266c6ba1df009ee files/digest-libgtkhtml-2.4.1 69
-MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
+MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
+MD5 e34bf128bd5fd129fbc7ed28558c2d5b files/libgtkhtml-3.0.9-gtk-2.4.patch 3582
 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
 MD5 eb876ffb327ae10a0bdbc7efda2ca329 files/digest-libgtkhtml-2.6.1 69
-MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10 68
-MD5 91961ab08a6720382576581f1c879963 files/libgtkhtml-3.0.8-alpha.patch 700
+MD5 61ab3b67f222041451c0d1fa3f69df9d files/digest-libgtkhtml-2.6.2 69
+MD5 11d0e80cc10335bb6025b2b270cb8bc4 files/digest-libgtkhtml-3.2.2 67
+MD5 100e54c4c0cff7ebf097652fd2276015 files/digest-libgtkhtml-3.2.3 67
+MD5 714aa2ab68649c7292585791ef3b2cf8 files/digest-libgtkhtml-3.2.4 67
+MD5 c3a4d4c5994a804fef9d7c8009d5bb67 files/libgtkhtml-fix_preedit.patch 2439
+MD5 2e7135d7b2ce243b2df4b22e6f8531ce files/digest-libgtkhtml-3.0.10-r1 68
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.4 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.4
new file mode 100644
index 000000000000..f8b455572697
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.2.4
@@ -0,0 +1 @@
+MD5 1978a1ef8f376593e579ab3ad9f48426 gtkhtml-3.2.4.tar.bz2 1311427
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
new file mode 100644
index 000000000000..01ba4ecbbc25
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
@@ -0,0 +1,40 @@
+# 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.4.ebuild,v 1.1 2004/12/29 17:04:40 obz Exp $
+
+inherit gnome2 versionator
+
+MY_P=${P/lib/}
+MY_PN=${PN/lib/}
+MY_MAJ_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${MY_MAJ_PV}/${MY_P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="3.2"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=net-libs/libsoup-2.2.1
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=x11-themes/gnome-icon-theme-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonoboui-2.2.4
+	>=gnome-base/gail-1
+	!=gnome-extra/libgtkhtml-3.1*"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.30
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+