Abiword 2.4: add gcc4 build

* Also mark psiconv as gcc4 compatible

app-office/abiword/abiword-2.4.recipe

@@ -8,19 +8,32 @@ lets you store documents online, allows easy document sharing with your \
 friends, and performs format conversions on the fly.
 "
 HOMEPAGE="http://www.abiword.org"
-REVISION="1"
+REVISION="2"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1998-2014 the AbiSource community"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86"
 
-SRC_URI="git+https://github.com/HaikuArchives/AbiWord.git#ceefaa5f21b68921719adfce1ca775936f8edf4c"
+SRC_URI="git+https://github.com/HaikuArchives/AbiWord.git#12071fa238640022e7160415ce0a960ebd7591db"
 
 PROVIDES="
 	abiword = $portVersion
+	app:AbiWord
+"
+
+REQUIRES="
+	lib:libfribidi
+	lib:libexpat
+	lib:libiconv
+	lib:libpng
+	lib:libpopt
+	lib:libpsiconv
+	lib:libxml2
+	lib:libz
+	lib:libstdc++
 "
 
 BUILD_REQUIRES="
-	devel:fribidi
+	devel:libfribidi
 	devel:libexpat
 	devel:libiconv
 	devel:libpng
@@ -34,6 +47,7 @@ BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	cmd:make
+	cmd:ld
 "
 
 BUILD()
@@ -41,7 +55,8 @@ BUILD()
 	chmod +x abi/configure
 	chmod +x wv/configure
 	cd abi/src
-	make $jobArgs
+	# AbiWord doesn't build with multiple jobs specified
+	make
 }
 
 INSTALL()

app-text/psiconv/psiconv-0.9.8.recipe

@@ -17,7 +17,7 @@ HOMEPAGE="http://software.frodo.looijaard.name/psiconv/"
 REVISION="1"
 LICENSE="GNU GPL v2"
 COPYRIGHT="1999-2005  Frodo Looijaard"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86"
 
 SRC_URI="${HOMEPAGE}files/psiconv-$portVersion.tar.gz"
 CHECKSUM_SHA256="1eee15b29ddcbfd2d15e0a0d26f59e28bac281c870b77418fa369dceed796806"