New version and gcc-3.4 fix

4 files changed, 133 insertions, 1 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index a3f5622cd956..6f9d30e02498 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.77 2004/05/11 17:28:14 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.78 2004/05/24 16:58:50 lu_zero Exp $
+
+*abiword-2.0.7 (24 May 2004)
+
+  24 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/abiword-2.0.7-gcc-3.4.patch, +abiword-2.0.7.ebuild:
+  New version and gcc-3.4 fix
 
   11 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> abiword-2.0.6.ebuild:
   Stable on hppa
diff --git a/app-office/abiword/abiword-2.0.7.ebuild b/app-office/abiword/abiword-2.0.7.ebuild
new file mode 100644
index 000000000000..f11fa82954ce
--- /dev/null
+++ b/app-office/abiword/abiword-2.0.7.ebuild
@@ -0,0 +1,113 @@
+# 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.7.ebuild,v 1.1 2004/05/24 16:58:50 lu_zero Exp $
+
+inherit eutils
+
+IUSE="spell jpeg xml2 gnome doc"
+
+S_P=${S}/${PN}-plugins
+S_D=${S}/${PN}-docs
+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.bz2"
+
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 hppa"
+LICENSE="GPL-2"
+SLOT="2"
+
+RDEPEND="virtual/x11
+	virtual/xft
+	>=media-libs/fontconfig-2.1
+	media-libs/libpng
+	>=x11-libs/gtk+-2.2
+	>=gnome-base/libglade-2
+	>=app-text/wv-1
+	>=dev-libs/fribidi-0.10.4
+	jpeg?  ( >=media-libs/jpeg-6b-r2 )
+	xml2? ( >=dev-libs/libxml2-2.4.10 )
+	!xml2? ( dev-libs/expat )
+	spell? ( >=app-text/enchant-1 )
+	gnome? ( >=gnome-base/libgnomeui-2.2
+		>=gnome-base/libgnomeprint-2.2.1
+		>=gnome-base/libgnomeprintui-2.2.1
+		>=gnome-base/libbonobo-2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc-3.4.patch
+}
+
+src_compile() {
+
+	# 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
+
+	econf \
+		`use_enable gnome` \
+		`use_with xml2 libxml2` \
+		`use_enable spell enchant` \
+		--disable-debug \
+		--enable-bidi \
+		--enable-threads \
+		--without-ImageMagick \
+		--disable-scripting \
+		--disable-gucharmap \
+		--with-sys-wv || die
+
+	emake all-recursive || die
+
+	# Build plugins
+
+	cd ${S_P}
+
+	econf \
+		--disable-debug \
+		--enable-all \
+		--with-abiword=${S} \
+		--without-ImageMagick || die
+
+	emake || die
+
+}
+
+src_install() {
+
+	dodir /usr/{bin,lib}
+
+	einstall PERLDEST=${D} || die
+
+	dosed "s:Exec=abiword:Exec=abiword-2.0:" /usr/share/applications/abiword.desktop
+
+	rm -f ${D}/usr/bin/abiword-2.0
+	rm -f ${D}/usr/bin/abiword
+	dosym AbiWord-2.0 /usr/bin/abiword-2.0
+
+	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
+
+	# install plugins
+
+	cd ${S_P}
+
+	make DESTDIR=${D} install || die
+
+	# install documentation
+
+	cd ${WORKDIR}/${P}/abiword-docs
+	sed -e 's:prefix = /usr/local:prefix = /usr:g' Makefile > Makefile.new
+	mv Makefile.new Makefile
+	make DESTDIR=${D} || die
+
+}
+
+USE_DESTDIR="1"
diff --git a/app-office/abiword/files/abiword-2.0.7-gcc-3.4.patch b/app-office/abiword/files/abiword-2.0.7-gcc-3.4.patch
new file mode 100644
index 000000000000..9a6d2f80082d
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.0.7-gcc-3.4.patch
@@ -0,0 +1,12 @@
+diff -ruN abiword-2.0.7.orig/abi/src/text/fmt/xp/fl_DocLayout.h abiword-2.0.7/abi/src/text/fmt/xp/fl_DocLayout.h
+--- abiword-2.0.7.orig/abi/src/text/fmt/xp/fl_DocLayout.h	2004-05-24 18:08:52.250531368 +0200
++++ abiword-2.0.7/abi/src/text/fmt/xp/fl_DocLayout.h	2004-05-24 18:13:09.379441832 +0200
+@@ -249,7 +249,7 @@
+ 	void		__dump(FILE * fp) const;
+ #endif
+ 	
+-protected:
++//protected:
+ 	static void			_backgroundCheck(UT_Worker * pTimer);
+ 	void				_toggleAutoSpell(bool bSpell);
+ 	void				_toggleAutoSmartQuotes(bool bSQ);
diff --git a/app-office/abiword/files/digest-abiword-2.0.7 b/app-office/abiword/files/digest-abiword-2.0.7
new file mode 100644
index 000000000000..946953fddd79
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.0.7
@@ -0,0 +1 @@
+MD5 bb1de0c969f1b93280ff7e661efb1025 abiword-2.0.7.tar.bz2 22012687