Added the gnome-vfs fix again because it might still break with some specific setups.

6 files changed, 34 insertions, 22 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index c75787f10c4b..bbe010f14112 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.70 2004/04/11 19:35:13 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.71 2004/04/18 01:43:06 khai Exp $
+
+*abiword-2.0.6 (17 Apr 2004)
+
+  17 Apr 2004; <khai@gentoo.org> abiword-2.0.5.ebuild, abiword-2.0.6.ebuild:
+  Added the gnome-vfs fix again because it might still break with some specific
+  setups.
 
   11 Apr 2004; <khai@gentoo.org> :
   Bug fix release, should deprecate the amd64 patch.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 25f818c115a4..08ed46f0e1ca 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,15 +1,15 @@
 MD5 7921df3134ed60f1eb9c3d1c920bde16 abiword-1.0.6-r1.ebuild 1927
 MD5 f8ed2f89b5cd1abf83ecd4a6f5344821 abiword-2.0.1.ebuild 2179
 MD5 232c5a4ec65a706f4b1436df697891df abiword-2.0.3-r1.ebuild 2541
-MD5 cf9dcca5745cda8078a0386993cc0d8a abiword-2.0.5.ebuild 2542
-MD5 ef14059ce0b1c9a3a8cf93c5b0b7390b abiword-2.0.6.ebuild 2129
+MD5 b0ea473c41f2e65a43a5a71aa4ae8e7b abiword-2.0.5.ebuild 2541
+MD5 90e12dca51eea422d063ca1569eeac23 abiword-2.0.6.ebuild 2130
 MD5 abfb2e2e507d908d06169c5a8d4378d5 abiword-2.0.2.ebuild 2266
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 f81310e970b36c9a87ec3eb6f193a930 ChangeLog 10603
 MD5 ddf70a53b4fc5671c7ed5cb4acb4a6e8 files/digest-abiword-2.0.3-r1 68
 MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
 MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
-MD5 21b957a82d91b6a8d57c7cfa4779a094 files/digest-abiword-2.0.6 67
+MD5 98793f926bc55d7e2398a9990d36fe18 files/digest-abiword-2.0.6 68
 MD5 28dcae4a10f58c12a4a73346a7ab1ed0 files/digest-abiword-2.0.1 142
 MD5 20b01c6c3348c63e1b088cf107398e0c files/digest-abiword-2.0.2 68
 MD5 de17339aaab5c0b950381a7f36cf4c58 files/digest-abiword-2.0.5 68
diff --git a/app-office/abiword/abiword-1.0.6-r1.ebuild b/app-office/abiword/abiword-1.0.6-r1.ebuild
index 38c7d5f762aa..108937b1b4a9 100644
--- a/app-office/abiword/abiword-1.0.6-r1.ebuild
+++ b/app-office/abiword/abiword-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.6-r1.ebuild,v 1.4 2003/09/06 22:21:01 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.6-r1.ebuild,v 1.5 2004/04/18 01:43:06 khai Exp $
 
 inherit flag-o-matic
 
diff --git a/app-office/abiword/abiword-2.0.5.ebuild b/app-office/abiword/abiword-2.0.5.ebuild
index 653b785f2b2e..67374f5ea712 100644
--- a/app-office/abiword/abiword-2.0.5.ebuild
+++ b/app-office/abiword/abiword-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.5.ebuild,v 1.2 2004/03/25 08:21:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.5.ebuild,v 1.3 2004/04/18 01:43:06 khai Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="x86 ~sparc ~alpha ~ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="2"
 
diff --git a/app-office/abiword/abiword-2.0.6.ebuild b/app-office/abiword/abiword-2.0.6.ebuild
index 811588a3423e..e7b682fd45c9 100644
--- a/app-office/abiword/abiword-2.0.6.ebuild
+++ b/app-office/abiword/abiword-2.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.6.ebuild,v 1.1 2004/04/11 18:07:51 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.6.ebuild,v 1.2 2004/04/18 01:43:06 khai Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ S=${WORKDIR}/${P}/abi
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
 HOMEPAGE="http://www.abisource.com"
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 LICENSE="GPL-2"
@@ -41,17 +41,23 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-		econf \
-		`use_enable gnome` \
-		`use_with xml2 libxml2` \
-		`use_enable spell enchant` \
-		`use_enable debug` \
-		--enable-bidi \
-		--enable-threads \
-		--without-ImageMagick \
-		--disable-scripting \
-		--disable-gucharmap \
-		--with-sys-wv || die
+	econf \
+	`use_enable gnome` \
+	`use_with xml2 libxml2` \
+	`use_enable spell enchant` \
+	`use_enable debug` \
+	--enable-bidi \
+	--enable-threads \
+	--without-ImageMagick \
+	--disable-scripting \
+	--disable-gucharmap \
+	--with-sys-wv || die
+
+	# this is a hack since I don't want to go hack in the gnome-vfs headerfiles.
+	# The issue is about gnome-vfs containing "long long" which makes gcc 3.3.1 balk
+	cp configure configure.old
+	cat configure.old |sed s:-pedantic::g >configure
+	rm -f configure.old
 
 	emake all-recursive || die
 
diff --git a/app-office/abiword/files/digest-abiword-2.0.6 b/app-office/abiword/files/digest-abiword-2.0.6
index 259d7e2e539e..9981d80f8c35 100644
--- a/app-office/abiword/files/digest-abiword-2.0.6
+++ b/app-office/abiword/files/digest-abiword-2.0.6
@@ -1 +1 @@
-MD5 6bfd9bb3d11ce7558e9235a427f9883e abiword-2.0.6.tar.gz 25914104
+MD5 80379d6a61ec0faad0665e9b83f47e62 abiword-2.0.6.tar.bz2 21994261