cleanup libgtkhtml/gal deps

26 files changed, 75 insertions, 403 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 0d0e5f695304..56347ec5f61c 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.37 2003/06/08 00:40:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.38 2003/06/10 13:26:03 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> abiword-1.0.2-r1.ebuild,
+  abiword-1.0.3.ebuild:
+  fix gal deps
 
 *abiword-1.0.6-r1 (07 Jun 2003)
 
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index af49794ae7b7..5dbef27d5d4f 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,17 +1,17 @@
-MD5 45ef3c97f810939b519b426c06cb5309 abiword-1.0.6-r1.ebuild 1932
-MD5 abc2e2533728780d556f1b3b4f76208b abiword-1.0.2-r1.ebuild 4692
-MD5 c5ae3337735d638b699db192edaf03b0 abiword-1.0.6.ebuild 2017
-MD5 621e5db238b3aea21cf8dbb65aa6f5fb abiword-1.0.3.ebuild 4648
+MD5 a0ec4c89b1b74c7c4eb6cb857e902c33 ChangeLog 6219
+MD5 1abe03d14ed3a4064bb061324361cab9 abiword-1.0.2-r1.ebuild 4687
+MD5 5d335866619430ebf4d97f86ec2c347f abiword-1.0.3.ebuild 4643
 MD5 2b025fa06432cfef4ab76f015d7af6af abiword-1.9.1.ebuild 2385
-MD5 6ac38d8943763af06e5dacd39aeba919 ChangeLog 6103
+MD5 c5ae3337735d638b699db192edaf03b0 abiword-1.0.6.ebuild 2017
+MD5 45ef3c97f810939b519b426c06cb5309 abiword-1.0.6-r1.ebuild 1932
 MD5 24e5e79582e10e3a1bde1472b096c790 abiword-1.0.5.ebuild 2012
-MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
-MD5 ec999635047cabecdcece23cd40d4bd9 files/digest-abiword-1.0.3 67
-MD5 41164f9198cc3cf8a02759a7c5aba5af files/digest-abiword-1.0.5 67
-MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6 67
-MD5 5932156df44ca8ad04841c4ba8b29e4c files/digest-abiword-1.9.1 68
 MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
-MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
 MD5 e6d9565092f5a6c2243401eccf1ca5a1 files/abiword-1.0.3-aspell.patch 812
 MD5 7e39e4fdc4561d314daedcd78dce7ce3 files/digest-abiword-1.0.2-r1 67
+MD5 ec999635047cabecdcece23cd40d4bd9 files/digest-abiword-1.0.3 67
+MD5 5932156df44ca8ad04841c4ba8b29e4c files/digest-abiword-1.9.1 68
+MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6 67
 MD5 55d85bca7cd645ef338336da3d6e6a7e files/digest-abiword-1.0.6-r1 67
+MD5 41164f9198cc3cf8a02759a7c5aba5af files/digest-abiword-1.0.5 67
+MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
+MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
diff --git a/app-office/abiword/abiword-1.0.2-r1.ebuild b/app-office/abiword/abiword-1.0.2-r1.ebuild
index 2dfde2a3ec6e..291d7325e1bc 100644
--- a/app-office/abiword/abiword-1.0.2-r1.ebuild
+++ b/app-office/abiword/abiword-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.2-r1.ebuild,v 1.10 2003/03/11 21:11:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.2-r1.ebuild,v 1.11 2003/06/10 13:26:03 liquidx Exp $
 
 IUSE="perl nls gnome build spell jpeg xml2"
 
@@ -20,7 +20,7 @@ DEPEND="virtual/x11
 	xml2?  ( >=dev-libs/libxml2-2.4.10 )
 	spell? ( >=app-text/aspell-0.50 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		>=gnome-extra/gal-0.13-r1 
+		<gnome-extra/gal-1.99
 		>=gnome-base/bonobo-1.0.9-r1 )"
 
 
diff --git a/app-office/abiword/abiword-1.0.3.ebuild b/app-office/abiword/abiword-1.0.3.ebuild
index 3ae3bad4ddb2..b94b8fd77d48 100644
--- a/app-office/abiword/abiword-1.0.3.ebuild
+++ b/app-office/abiword/abiword-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.3.ebuild,v 1.8 2003/03/11 21:11:44 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.3.ebuild,v 1.9 2003/06/10 13:26:03 liquidx Exp $
 
 IUSE="perl nls gnome build spell jpeg xml2"
 
@@ -20,7 +20,7 @@ DEPEND="virtual/x11
 	xml2?  ( >=dev-libs/libxml2-2.4.10 )
 	spell? ( >=app-text/aspell-0.50 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		>=gnome-extra/gal-0.13-r1 
+		<gnome-extra/gal-1.99
 		>=gnome-base/bonobo-1.0.9-r1 )
 	!app-shells/bash-completion"
 
diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index b2d610b62748..3b9e4a1a1cdb 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.25 2003/05/27 16:16:17 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.26 2003/06/10 13:22:35 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnucash-1.6.8.ebuild,
+  gnucash-1.8.1.ebuild, gnucash-1.8.2-r1.ebuild, gnucash-1.8.2.ebuild,
+  gnucash-1.8.3-r1.ebuild, gnucash-1.8.3.ebuild, gnucash-1.8.4.ebuild,
+  files/gnucash-1.8.3-qif-file.patch:
+  cleanup and fixed gal deps
 
 *gnucash-1.8.4 (27 May 2003)
 
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 6c53ba89e7cb..acde0d7e84b6 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,16 +1,9 @@
-MD5 294b5783036e675d2a3df52a9516b294 ChangeLog 4230
-MD5 b8e0eec1a6bcd963f2ce26db9abf9b9f gnucash-1.8.1.ebuild 1455
-MD5 54902cd500c04f0659cd9a7d3438f1cd gnucash-1.8.2.ebuild 1546
-MD5 7d1c851062c5082d57cda39101ca1e8a gnucash-1.6.8.ebuild 1902
-MD5 283f9e5907c2337f6516e9fa81cbc48c gnucash-1.8.2-r1.ebuild 2718
-MD5 313cb3b273a9ccf25a498bfafef5a918 gnucash-1.8.4.ebuild 2646
-MD5 b790010032b6a0c476e8242236f53829 gnucash-1.8.3-r1.ebuild 2720
-MD5 7e5e1bb02bd5c517c2141e43d5189947 gnucash-1.8.3.ebuild 2646
+MD5 54494b08d6d7b5dc4a7f0616943fbcc2 ChangeLog 4511
+MD5 19a34d8e7f6711d65b24833c2c2d9ac2 gnucash-1.8.1.ebuild 1454
+MD5 1b954cc1ac731a818811513f781d92e6 gnucash-1.8.2.ebuild 1544
+MD5 41f3e83501dd66a9bd46ee1b96cbfdb3 gnucash-1.6.8.ebuild 1894
+MD5 85296e773c3c00b5c2b8023f98ed3439 gnucash-1.8.4.ebuild 2648
 MD5 e298b9154a60df27ab519e6b88dd4c47 files/digest-gnucash-1.8.1 66
 MD5 cdaa1f2adfbd3112916a8c2076fa04bd files/digest-gnucash-1.8.2 66
-MD5 ab8939bf0268b9ac866d99709c22f420 files/digest-gnucash-1.8.2-r1 137
 MD5 8ccd6e0765bb53caad58e8f736b020e9 files/digest-gnucash-1.6.8 67
-MD5 5bb39d9e803ae87681b2b40baa94d919 files/digest-gnucash-1.8.3 137
-MD5 b11b22208604e79d9ab6be4245646e4a files/gnucash-1.8.3-qif-file.patch 440
-MD5 5bb39d9e803ae87681b2b40baa94d919 files/digest-gnucash-1.8.3-r1 137
 MD5 6ccd22f551213649d30be28d42195243 files/digest-gnucash-1.8.4 137
diff --git a/app-office/gnucash/files/digest-gnucash-1.8.2-r1 b/app-office/gnucash/files/digest-gnucash-1.8.2-r1
deleted file mode 100644
index cf28763f0848..000000000000
--- a/app-office/gnucash/files/digest-gnucash-1.8.2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3995f9df6766d2573b1cf96b6b12bea0 gnucash-1.8.2.tar.gz 6555050
-MD5 26e245da5e045e5bf4a581fea3a7287d gnucash-docs-1.8.0.tar.gz 1249716
diff --git a/app-office/gnucash/files/digest-gnucash-1.8.3 b/app-office/gnucash/files/digest-gnucash-1.8.3
deleted file mode 100644
index cd2101d5a6b3..000000000000
--- a/app-office/gnucash/files/digest-gnucash-1.8.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa299733e3827800077e6352d025bbae gnucash-1.8.3.tar.gz 6805055
-MD5 c547c36737ae189ab7ad516d132b807e gnucash-docs-1.8.1.tar.gz 1256883
diff --git a/app-office/gnucash/files/digest-gnucash-1.8.3-r1 b/app-office/gnucash/files/digest-gnucash-1.8.3-r1
deleted file mode 100644
index cd2101d5a6b3..000000000000
--- a/app-office/gnucash/files/digest-gnucash-1.8.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aa299733e3827800077e6352d025bbae gnucash-1.8.3.tar.gz 6805055
-MD5 c547c36737ae189ab7ad516d132b807e gnucash-docs-1.8.1.tar.gz 1256883
diff --git a/app-office/gnucash/files/gnucash-1.8.3-qif-file.patch b/app-office/gnucash/files/gnucash-1.8.3-qif-file.patch
deleted file mode 100644
index 98552f1a050b..000000000000
--- a/app-office/gnucash/files/gnucash-1.8.3-qif-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnucash-1.8.3/src/import-export/qif-import/qif-file.scm	2003-05-17 20:01:50.000000000 +0100
-+++ gnucash-1.8.3/src/import-export/qif-import/qif-file.scm	2003-05-17 20:02:04.000000000 +0100
-@@ -18,7 +18,7 @@
-  (else (use-modules (ice-9 rdelim))))
- 
- (define qif-bad-numeric-rexp 
--  (make-regexp "^\.\.\."))
-+  (make-regexp "^\\.\\.\\."))
- 
- (define (not-bad-numeric-string? input)
-   (if (regexp-exec qif-bad-numeric-rexp input) #f #t))
diff --git a/app-office/gnucash/gnucash-1.6.8.ebuild b/app-office/gnucash/gnucash-1.6.8.ebuild
index a2f1bafaf8ef..ee2105b2939a 100644
--- a/app-office/gnucash/gnucash-1.6.8.ebuild
+++ b/app-office/gnucash/gnucash-1.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.8.ebuild,v 1.12 2003/05/16 17:36:12 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.6.8.ebuild,v 1.13 2003/06/10 13:22:35 liquidx Exp $
 
 inherit flag-o-matic
 
@@ -15,12 +15,12 @@ IUSE="nls postgres"
 
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=dev-libs/popt-1.5
-	 >=dev-libs/libxml-1.8.3
-	 >=gnome-extra/gtkhtml-0.14.0-r1
-	 >=gnome-extra/gal-0.13-r1
-	 >=gnome-extra/guppi-0.35.5-r2
-	 >=gnome-base/gnome-print-0.21
-	 postgres? ( dev-db/postgresql )"
+	>=dev-libs/libxml-1.8.3
+	>=gnome-extra/gtkhtml-0.14.0-r1
+	<gnome-extra/gal-1.99
+	>=gnome-extra/guppi-0.35.5-r2
+	>=gnome-base/gnome-print-0.21
+	postgres? ( dev-db/postgresql )"
 DEPEND="${RDEPEND}
 	>=dev-lang/perl-5
 	>=dev-libs/slib-2.3.8
diff --git a/app-office/gnucash/gnucash-1.8.1.ebuild b/app-office/gnucash/gnucash-1.8.1.ebuild
index ddc16584b4cd..844f64ab37ff 100644
--- a/app-office/gnucash/gnucash-1.8.1.ebuild
+++ b/app-office/gnucash/gnucash-1.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.1.ebuild,v 1.3 2003/03/20 01:00:33 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.1.ebuild,v 1.4 2003/06/10 13:22:35 liquidx Exp $
 
 inherit flag-o-matic
 inherit	libtool
@@ -17,7 +17,7 @@ IUSE="nls postgres"
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=dev-libs/libxml-1.8.3
 	 >=gnome-extra/gtkhtml-0.14.0-r1
-	 >=gnome-extra/gal-0.13-r1
+	 <gnome-extra/gal-1.99
 	 >=gnome-extra/guppi-0.35.5-r2
 	 >=gnome-base/gnome-print-0.21
 	 postgres? ( dev-db/postgresql )"
diff --git a/app-office/gnucash/gnucash-1.8.2-r1.ebuild b/app-office/gnucash/gnucash-1.8.2-r1.ebuild
deleted file mode 100644
index 425396f4acd4..000000000000
--- a/app-office/gnucash/gnucash-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.2-r1.ebuild,v 1.4 2003/05/01 15:49:15 liquidx Exp $
-
-inherit flag-o-matic libtool
-
-# won't configure with this
-filter-flags -fomit-frame-pointer
-
-DOC_VER="1.8.0"
-IUSE="nls postgres ofx hbci doc"
-
-DESCRIPTION="A personal finance manager"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.gz )"
-HOMEPAGE="http://www.gnucash.org/"
-
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-util/guile-1.6
-	>=dev-libs/slib-2.3.8
-	>=media-libs/libpng-1.0.9
-	>=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/xpm-3.4
-	>=gnome-base/gnome-print-0.21
-	media-libs/gdk-pixbuf
-	>=gnome-extra/gtkhtml-0.14.0
-	>=gnome-extra/gal-0.13-r1
-	>=dev-libs/libxml-1.8.3		
-	>=dev-libs/g-wrap-1.3.3
-	>=gnome-extra/guppi-0.35.5-r2
-
-	=sys-libs/db-1*
-	hbci? ( >=net-libs/openhbci-0.9.6 )
-	ofx? ( >=dev-libs/libofx-0.6.4 )
-	postgres? ( dev-db/postgresql )"
-	
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-libs/slib-2.3.8
-	>=dev-lang/swig-1.3_alpha4
-	<gnome-base/libglade-2
-	gnome-base/libghttp
-	nls? ( sys-devel/gettext )
-	doc? ( >=app-text/scrollkeeper-0.3.1
-		app-text/docbook-xsl-stylesheets )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile() {
-	elibtoolize
-	local myconf=""
-
-	# allow warnings to go unheeded
-	myconf="--enable-compile-warnings=no --disable-error-on-warning"
-
-	use postgres && myconf="${myconf} --enable-sql"
-	# note: --disable-ofx doesn't work
-	use ofx && myconf="${myconf} --enable-ofx"
-	use hbci && myconf="${myconf} --enable-hbci"
-	
-	econf \
-		`use_enable nls` \
-		${myconf} || die "configure failed"
-		
-	emake || die "make failed"
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		econf --localstatedir=/var/lib || die "doc configure failed"
-		emake || die "doc make failed"
-	fi		
-}
-
-src_install() {
-	einstall pkgdatadir=${D}/usr/share/gnucash || die "install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
-	dodoc docs/README*
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		make DESTDIR=${D} \
-			scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
-			install || die "doc install failed"
-		rm -rf ${D}/var/lib/scrollkeeper
-	fi
-}	
-
-pkg_postinst() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
-
-pkg_postrm() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
diff --git a/app-office/gnucash/gnucash-1.8.2.ebuild b/app-office/gnucash/gnucash-1.8.2.ebuild
index 25ad0b16c82e..8516feb03ac5 100644
--- a/app-office/gnucash/gnucash-1.8.2.ebuild
+++ b/app-office/gnucash/gnucash-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.2.ebuild,v 1.1 2003/03/21 17:26:25 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.2.ebuild,v 1.2 2003/06/10 13:22:35 liquidx Exp $
 
 # FIXME - ebuild needs a good look at
 
@@ -18,7 +18,7 @@ IUSE="nls postgres"
 RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	 >=dev-libs/libxml-1.8.3
 	 >=gnome-extra/gtkhtml-0.14.0-r1
-	 >=gnome-extra/gal-0.13-r1
+	 <gnome-extra/gal-1.99
 	 >=gnome-extra/guppi-0.35.5-r2
 	 >=gnome-base/gnome-print-0.21
 	 postgres? ( dev-db/postgresql )"
diff --git a/app-office/gnucash/gnucash-1.8.3-r1.ebuild b/app-office/gnucash/gnucash-1.8.3-r1.ebuild
deleted file mode 100644
index 203a89d8110a..000000000000
--- a/app-office/gnucash/gnucash-1.8.3-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.3-r1.ebuild,v 1.1 2003/05/18 09:31:57 liquidx Exp $
-
-inherit flag-o-matic libtool
-
-# won't configure with this
-filter-flags -fomit-frame-pointer
-
-DOC_VER="1.8.1"
-IUSE="nls postgres ofx hbci doc"
-
-DESCRIPTION="A personal finance manager"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.gz )"
-HOMEPAGE="http://www.gnucash.org/"
-
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-util/guile-1.6
-	>=dev-libs/slib-2.3.8
-	>=media-libs/libpng-1.0.9
-	>=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/xpm-3.4
-	>=gnome-base/gnome-print-0.21
-	media-libs/gdk-pixbuf
-	>=gnome-extra/gtkhtml-0.14.0
-	=gnome-extra/gal-0*
-	>=dev-libs/libxml-1.8.3		
-	>=dev-libs/g-wrap-1.3.3
-	>=gnome-extra/guppi-0.35.5-r2
-	>=dev-libs/popt-1.5
-
-	=sys-libs/db-1*
-	hbci? ( >=net-libs/openhbci-0.9.6 )
-	ofx? ( >=dev-libs/libofx-0.6.4 )
-	postgres? ( dev-db/postgresql )"
-	
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-libs/slib-2.3.8
-	>=dev-lang/swig-1.3_alpha4
-	<gnome-base/libglade-2
-	gnome-base/libghttp
-	nls? ( sys-devel/gettext )
-	doc? ( >=app-text/scrollkeeper-0.3.1
-		app-text/docbook-xsl-stylesheets )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-qif-file.patch
-}
-
-src_compile() {
-	elibtoolize
-	local myconf=""
-
-	# allow warnings to go unheeded
-	myconf="--enable-compile-warnings=no --disable-error-on-warning"
-
-	use postgres && myconf="${myconf} --enable-sql"
-
-	econf \
-		`use_enable nls` \
-		`use_enable ofx` \
-		`use_enable hbci` \
-		${myconf} || die "configure failed"
-		
-	emake || die "make failed"
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		econf --localstatedir=/var/lib || die "doc configure failed"
-		emake || die "doc make failed"
-	fi		
-}
-
-src_install() {
-	einstall pkgdatadir=${D}/usr/share/gnucash || die "install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
-	dodoc docs/README*
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		make DESTDIR=${D} \
-			scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
-			install || die "doc install failed"
-		rm -rf ${D}/var/lib/scrollkeeper
-	fi
-}	
-
-pkg_postinst() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
-
-pkg_postrm() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
diff --git a/app-office/gnucash/gnucash-1.8.3.ebuild b/app-office/gnucash/gnucash-1.8.3.ebuild
deleted file mode 100644
index 388c82f854cd..000000000000
--- a/app-office/gnucash/gnucash-1.8.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.3.ebuild,v 1.2 2003/05/16 17:36:12 foser Exp $
-
-inherit flag-o-matic libtool
-
-# won't configure with this
-filter-flags -fomit-frame-pointer
-
-DOC_VER="1.8.1"
-IUSE="nls postgres ofx hbci doc"
-
-DESCRIPTION="A personal finance manager"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( mirror://sourceforge/${PN}/${PN}-docs-${DOC_VER}.tar.gz )"
-HOMEPAGE="http://www.gnucash.org/"
-
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
-	>=dev-libs/popt-1.5
-	>=dev-util/guile-1.6
-	>=dev-libs/slib-2.3.8
-	>=media-libs/libpng-1.0.9
-	>=media-libs/jpeg-6b
-	>=sys-libs/zlib-1.1.4
-	>=media-libs/xpm-3.4
-	>=gnome-base/gnome-print-0.21
-	media-libs/gdk-pixbuf
-	>=gnome-extra/gtkhtml-0.14.0
-	=gnome-extra/gal-0*
-	>=dev-libs/libxml-1.8.3		
-	>=dev-libs/g-wrap-1.3.3
-	>=gnome-extra/guppi-0.35.5-r2
-	
-
-	=sys-libs/db-1*
-	hbci? ( >=net-libs/openhbci-0.9.6 )
-	ofx? ( >=dev-libs/libofx-0.6.4 )
-	postgres? ( dev-db/postgresql )"
-	
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	>=dev-libs/slib-2.3.8
-	>=dev-lang/swig-1.3_alpha4
-	<gnome-base/libglade-2
-	gnome-base/libghttp
-	nls? ( sys-devel/gettext )
-	doc? ( >=app-text/scrollkeeper-0.3.1
-		app-text/docbook-xsl-stylesheets )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_compile() {
-	elibtoolize
-	local myconf=""
-
-	# allow warnings to go unheeded
-	myconf="--enable-compile-warnings=no --disable-error-on-warning"
-
-	use postgres && myconf="${myconf} --enable-sql"
-
-	econf \
-		`use_enable nls` \
-		`use_enable ofx` \
-		`use_enable hbci` \
-		${myconf} || die "configure failed"
-		
-	emake || die "make failed"
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		econf --localstatedir=/var/lib || die "doc configure failed"
-		emake || die "doc make failed"
-	fi		
-}
-
-src_install() {
-	einstall pkgdatadir=${D}/usr/share/gnucash || die "install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING NEWS README* TODO
-	dodoc docs/README*
-	
-	if [ -n "`use doc`" ]; then
-		cd ${WORKDIR}/${PN}-docs-${DOC_VER}
-		make DESTDIR=${D} \
-			scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper \
-			install || die "doc install failed"
-		rm -rf ${D}/var/lib/scrollkeeper
-	fi
-}	
-
-pkg_postinst() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
-
-pkg_postrm() {
-	if [ -x ${ROOT}/usr/bin/scrollkeeper-update ]; then
-		echo ">>> Updating Scrollkeeper"
-		scrollkeeper-update -q -p ${ROOT}/var/lib/scrollkeeper
-	fi
-}
diff --git a/app-office/gnucash/gnucash-1.8.4.ebuild b/app-office/gnucash/gnucash-1.8.4.ebuild
index 4e1b49d15e92..16b7553561fd 100644
--- a/app-office/gnucash/gnucash-1.8.4.ebuild
+++ b/app-office/gnucash/gnucash-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.4.ebuild,v 1.1 2003/05/27 16:16:17 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.8.4.ebuild,v 1.2 2003/06/10 13:22:35 liquidx Exp $
 
 inherit flag-o-matic libtool
 
@@ -29,7 +29,7 @@ RDEPEND=">=gnome-base/gnome-libs-1.4.1.2-r1
 	>=gnome-base/gnome-print-0.21
 	media-libs/gdk-pixbuf
 	>=gnome-extra/gtkhtml-0.14.0
-	=gnome-extra/gal-0*
+	<gnome-extra/gal-1.99
 	>=dev-libs/libxml-1.8.3		
 	>=dev-libs/g-wrap-1.3.3
 	>=gnome-extra/guppi-0.35.5-r2
diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 6987ce528be5..7a17cfc864c4 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.34 2003/06/08 19:31:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.35 2003/06/10 13:29:53 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnumeric-1.0.12.ebuild,
+  gnumeric-1.0.13-r1.ebuild, gnumeric-1.0.13.ebuild, gnumeric-1.0.8.ebuild:
+  fixed gal deps
 
 *gnumeric-1.1.19 (08 Jun 2003)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index a6d61ca70b16..3c92bd4bd233 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,15 +1,15 @@
-MD5 da2272cb811052a2fdc88257e6b4f22d gnumeric-1.0.13.ebuild 3259
-MD5 6d0a21df6af6225fa76ea7fa99964649 gnumeric-1.1.17.ebuild 1463
+MD5 54b547462089369b48826d78029defb5 ChangeLog 5576
+MD5 3a9c7fd8a57733a8e5524207dfda02f9 gnumeric-1.0.12.ebuild 3252
+MD5 8e90cf1f0ab461b14bc3bbf0b9c9b2f5 gnumeric-1.0.8.ebuild 3309
+MD5 29f8e190ced7d35bc0a2bed853340303 gnumeric-1.0.13.ebuild 3260
 MD5 696b43a04c141eaea3543661cbaf70b7 gnumeric-1.1.19.ebuild 1429
-MD5 686883719d8d6d5ba6fbaead6ba8f4bb gnumeric-1.0.12.ebuild 3253
-MD5 66d767b132f083141d58f32c75dc8fa9 ChangeLog 5407
-MD5 e98f3966b2cdec5bd009d11a5b9e9634 gnumeric-1.0.8.ebuild 3310
-MD5 d71307b5e8115b0e25ea9cfc3a22b929 gnumeric-1.0.13-r1.ebuild 3058
+MD5 6d0a21df6af6225fa76ea7fa99964649 gnumeric-1.1.17.ebuild 1463
+MD5 26ec98faaabbbe2d083bde75849b720e gnumeric-1.0.13-r1.ebuild 3059
 MD5 d649b85924af69de4941cf0c624b16f3 files/digest-gnumeric-1.0.12 69
+MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
+MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
 MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13 69
-MD5 abc0fd9b785966aa41a2aff5a41f6c8a files/digest-gnumeric-1.1.17 70
 MD5 629a3f22adb6cf4415d44093d3653e8f files/digest-gnumeric-1.1.19 70
 MD5 8a88ece514714721699de5346a0f4e1e files/gnumeric-1.0.8-docbuild.patch 728
-MD5 a88fe4d27bf9a2579f4f3db0ca6f355f files/digest-gnumeric-1.0.8 69
+MD5 abc0fd9b785966aa41a2aff5a41f6c8a files/digest-gnumeric-1.1.17 70
 MD5 7843727e1fcde50a4a2283ba34da3c1d files/digest-gnumeric-1.0.13-r1 69
-MD5 b4f77780f0a0a1a29df8c8b184b2c110 files/gnumeric-1.1.16-scrollkeeper.patch 493
diff --git a/app-office/gnumeric/gnumeric-1.0.12.ebuild b/app-office/gnumeric/gnumeric-1.0.12.ebuild
index 4996430f6f8f..cecf0ce8805f 100644
--- a/app-office/gnumeric/gnumeric-1.0.12.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.12.ebuild,v 1.8 2003/04/22 15:32:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.12.ebuild,v 1.9 2003/06/10 13:29:53 liquidx Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -22,7 +22,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/ORBit-0.5.12-r1
 	=gnome-base/libglade-0*
 	>=gnome-base/gnome-print-0.31
-	>=gnome-extra/gal-0.18
+	<gnome-extra/gal-1.99
 	>=dev-libs/libole2-0.2.4
 	>=media-gfx/eog-0.6
 	>=dev-libs/libxml-1.8.14
diff --git a/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild b/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
index 919d7825ae53..59f96924403d 100644
--- a/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild,v 1.1 2003/06/08 19:31:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13-r1.ebuild,v 1.2 2003/06/10 13:29:53 liquidx Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -21,7 +21,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/ORBit-0.5.12-r1
 	=gnome-base/libglade-0*
 	>=gnome-base/gnome-print-0.31
-	>=gnome-extra/gal-0.18
+	<gnome-extra/gal-1.99
 	>=dev-libs/libole2-0.2.4
 	>=media-gfx/eog-0.6
 	>=dev-libs/libxml-1.8.14
diff --git a/app-office/gnumeric/gnumeric-1.0.13.ebuild b/app-office/gnumeric/gnumeric-1.0.13.ebuild
index 1b0bd0a619ef..ad95c9e1e858 100644
--- a/app-office/gnumeric/gnumeric-1.0.13.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.13.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.3 2003/06/08 19:31:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.13.ebuild,v 1.4 2003/06/10 13:29:53 liquidx Exp $
 
 inherit virtualx libtool gnome.org
 
@@ -21,7 +21,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/ORBit-0.5.12-r1
 	=gnome-base/libglade-0*
 	>=gnome-base/gnome-print-0.31
-	>=gnome-extra/gal-0.18
+	<gnome-extra/gal-1.99
 	>=dev-libs/libole2-0.2.4
 	>=media-gfx/eog-0.6
 	>=dev-libs/libxml-1.8.14
diff --git a/app-office/gnumeric/gnumeric-1.0.8.ebuild b/app-office/gnumeric/gnumeric-1.0.8.ebuild
index 4fa0b7f78eb5..f1b218a8bec6 100644
--- a/app-office/gnumeric/gnumeric-1.0.8.ebuild
+++ b/app-office/gnumeric/gnumeric-1.0.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.8.ebuild,v 1.11 2003/03/16 13:45:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.0.8.ebuild,v 1.12 2003/06/10 13:29:53 liquidx Exp $
 
 IUSE="nls libgda gb evo python bonobo guile perl"
 
@@ -25,7 +25,7 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	( >=gnome-base/libglade-0.17
 	  <gnome-base/libglade-0.99 )
 	>=gnome-base/gnome-print-0.31
-	>=gnome-extra/gal-0.18
+	<gnome-extra/gal-1.99
 	>=dev-libs/libole2-0.2.4
 	>=media-gfx/eog-0.6
 	=dev-libs/libxml-1.8*
diff --git a/app-office/mrproject/ChangeLog b/app-office/mrproject/ChangeLog
index 16d31fecb3ed..9ee48681c0f0 100644
--- a/app-office/mrproject/ChangeLog
+++ b/app-office/mrproject/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/mrproject
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/ChangeLog,v 1.13 2003/02/24 21:01:25 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/ChangeLog,v 1.14 2003/06/10 13:33:10 liquidx Exp $
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> mrproject-0.5.1-r1.ebuild:
+  fixed gal deps
 
 *mrproject-0.9.1 (24 feb 2003)
 
diff --git a/app-office/mrproject/Manifest b/app-office/mrproject/Manifest
index ea1649816620..61cd615f1925 100644
--- a/app-office/mrproject/Manifest
+++ b/app-office/mrproject/Manifest
@@ -1,5 +1,5 @@
-MD5 da4e2e6d9587206ca7a54702509fcb1e ChangeLog 2412
-MD5 c21800c60a9897c4fd46b1b762e011b5 mrproject-0.5.1-r1.ebuild 1315
+MD5 fa172949871219e96cc2bf3ff83484bf ChangeLog 2507
+MD5 1a609da017b5b2cad96ad4095f6baa36 mrproject-0.5.1-r1.ebuild 1313
 MD5 263d4341b7f51ac93362f35d68bfda04 mrproject-0.6.ebuild 1093
 MD5 b6a4adbf3a6adc76264e0eb68ad96844 mrproject-0.7.ebuild 1096
 MD5 61c3b1d2caaaaeb47198b7338b028cb3 mrproject-0.8.ebuild 1101
diff --git a/app-office/mrproject/mrproject-0.5.1-r1.ebuild b/app-office/mrproject/mrproject-0.5.1-r1.ebuild
index c299be0eb8d5..375d1fa6e9d4 100644
--- a/app-office/mrproject/mrproject-0.5.1-r1.ebuild
+++ b/app-office/mrproject/mrproject-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.1-r1.ebuild,v 1.4 2003/02/13 09:18:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.5.1-r1.ebuild,v 1.5 2003/06/10 13:33:10 liquidx Exp $
 
 IUSE="nls"
 
@@ -14,7 +14,7 @@ KEYWORDS="x86"
 
 RDEPEND=">=media-libs/gdk-pixbuf-0.18
 	>=gnome-base/ORBit-0.5.16
-	>=gnome-extra/gal-0.19.2
+	<gnome-extra/gal-1.99
 	>=gnome-base/bonobo-1.0.19
 	( >=gnome-base/libglade-0.17-r1
 	 <gnome-base/libglade-2.0.0 )