cleanup libgtkhtml/gal deps

13 files changed, 25 insertions, 364 deletions

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