Fixes #2111.

7 files changed, 37 insertions, 10 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index fc284b0c19af..0cd685136b7f 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.8 2002/04/25 14:37:23 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.9 2002/04/29 00:10:22 karltk Exp $
+
+*abiword-1.0.0-r1 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-1.0.0-r1.ebuild files/digest-abiword-1.0.0-r1:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-1.0.0.ebuild files/digest-abiword-1.0.0
+
+*abiword-0.99.5-r1 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-0.99.5-r1.ebuild files/digest-abiword-0.99.5-r1:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-0.99.5.ebuild files/digest-abiword-0.99.5
+
+*abiword-0.99.3-r2 (29 Apr 2002)
+
+  29 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> abiword-0.99.3-r2.ebuild files/digest-abiword-0.99.3-r2:
+
+  Bonobo is only required if the gnome USE flag is set.
+
+  Removed abiword-0.99.3-r1.ebuild files/digest-abiword-0.99.3-r1
 
 *abiword-1.0.0 (25 Apr 2002)
 
diff --git a/app-office/abiword/abiword-0.99.3-r1.ebuild b/app-office/abiword/abiword-0.99.3-r2.ebuild
index 209a75e09a96..4f62b14ba32e 100644
--- a/app-office/abiword/abiword-0.99.3-r1.ebuild
+++ b/app-office/abiword/abiword-0.99.3-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.99.3-r1.ebuild,v 1.3 2002/04/14 05:04:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.99.3-r2.ebuild,v 1.1 2002/04/29 00:10:22 karltk Exp $
 
 S=${WORKDIR}/${P}/abi
 DESCRIPTION="Text processor"
@@ -11,14 +11,15 @@ SLOT="0"
 DEPEND="virtual/x11
 	media-libs/libpng
 	>=dev-libs/libunicode-0.4-r1
-	>=gnome-base/bonobo-1.0.9-r1
 	>=x11-libs/gtk+-1.2.10-r4
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	perl?  ( >=sys-devel/perl-5.6 )
 	xml2?  ( >=dev-libs/libxml2-2.4.10 )
 	spell? ( >=app-text/pspell-ispell-0.12-r1 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		>=gnome-extra/gal-0.13-r1 )"
+		>=gnome-extra/gal-0.13-r1
+		>=gnome-base/bonobo-1.0.9-r1
+		)"
 
 
 fix_perl_env() {
diff --git a/app-office/abiword/abiword-0.99.5.ebuild b/app-office/abiword/abiword-0.99.5-r1.ebuild
index 0bdc015906fe..9b0bee9208bd 100644
--- a/app-office/abiword/abiword-0.99.5.ebuild
+++ b/app-office/abiword/abiword-0.99.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.99.5.ebuild,v 1.1 2002/04/15 02:53:43 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.99.5-r1.ebuild,v 1.1 2002/04/29 00:10:22 karltk Exp $
 
 S=${WORKDIR}/${P}/abi
 DESCRIPTION="Text processor"
@@ -11,14 +11,15 @@ SLOT="0"
 DEPEND="virtual/x11
 	media-libs/libpng
 	>=dev-libs/libunicode-0.4-r1
-	>=gnome-base/bonobo-1.0.9-r1
 	>=x11-libs/gtk+-1.2.10-r4
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	perl?  ( >=sys-devel/perl-5.6 )
 	xml2?  ( >=dev-libs/libxml2-2.4.10 )
 	spell? ( >=app-text/pspell-ispell-0.12-r1 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		>=gnome-extra/gal-0.13-r1 )"
+		>=gnome-extra/gal-0.13-r1
+		>=gnome-base/bonobo-1.0.9-r1
+		)"
 
 
 fix_perl_env() {
diff --git a/app-office/abiword/abiword-1.0.0.ebuild b/app-office/abiword/abiword-1.0.0-r1.ebuild
index fde7d297fa17..3cce996d105f 100644
--- a/app-office/abiword/abiword-1.0.0.ebuild
+++ b/app-office/abiword/abiword-1.0.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.0.ebuild,v 1.1 2002/04/25 14:37:24 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.0-r1.ebuild,v 1.1 2002/04/29 00:10:22 karltk Exp $
 
 S=${WORKDIR}/${P}/abi
 DESCRIPTION="Text processor"
@@ -11,14 +11,15 @@ SLOT="0"
 DEPEND="virtual/x11
 	media-libs/libpng
 	>=dev-libs/libunicode-0.4-r1
-	>=gnome-base/bonobo-1.0.9-r1
 	>=x11-libs/gtk+-1.2.10-r4
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	perl?  ( >=sys-devel/perl-5.6 )
 	xml2?  ( >=dev-libs/libxml2-2.4.10 )
 	spell? ( >=app-text/pspell-ispell-0.12-r1 )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
-		>=gnome-extra/gal-0.13-r1 )"
+		>=gnome-extra/gal-0.13-r1 
+		>=gnome-base/bonobo-1.0.9-r1
+		)"
 
 
 fix_perl_env() {
diff --git a/app-office/abiword/files/digest-abiword-0.99.3-r1 b/app-office/abiword/files/digest-abiword-0.99.3-r2
index a95c13d33659..a95c13d33659 100644
--- a/app-office/abiword/files/digest-abiword-0.99.3-r1
+++ b/app-office/abiword/files/digest-abiword-0.99.3-r2
diff --git a/app-office/abiword/files/digest-abiword-0.99.5 b/app-office/abiword/files/digest-abiword-0.99.5-r1
index d9b2b32bd401..d9b2b32bd401 100644
--- a/app-office/abiword/files/digest-abiword-0.99.5
+++ b/app-office/abiword/files/digest-abiword-0.99.5-r1
diff --git a/app-office/abiword/files/digest-abiword-1.0.0 b/app-office/abiword/files/digest-abiword-1.0.0-r1
index b3c678995805..b3c678995805 100644
--- a/app-office/abiword/files/digest-abiword-1.0.0
+++ b/app-office/abiword/files/digest-abiword-1.0.0-r1