new dev version, mark 1.0.6-r1 x86

4 files changed, 103 insertions, 5 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index fb6057d29b44..80bd22a8756f 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,10 +1,10 @@
-MD5 45ef3c97f810939b519b426c06cb5309 abiword-1.0.6-r1.ebuild 1932
+MD5 565c24a2eb0e150761bbff8c39748d3c abiword-1.0.6-r1.ebuild 1931
 MD5 1abe03d14ed3a4064bb061324361cab9 abiword-1.0.2-r1.ebuild 4687
 MD5 c5ae3337735d638b699db192edaf03b0 abiword-1.0.6.ebuild 2017
-MD5 a92b32ea6737e348c4864f017ca342b4 abiword-1.99.1.ebuild 2460
+MD5 1ac8b02dd63859b53ddf415ebbbcd0bf abiword-1.99.1.ebuild 2478
 MD5 5d335866619430ebf4d97f86ec2c347f abiword-1.0.3.ebuild 4643
 MD5 5ec109d12993e45ccd1e4d607076d2e8 abiword-1.9.1.ebuild 2410
-MD5 54c1b07e95afe0284b4b028ff881a706 ChangeLog 6357
+MD5 f71eae39be63ab4dd92f5ff12f9a70f4 ChangeLog 6575
 MD5 24e5e79582e10e3a1bde1472b096c790 abiword-1.0.5.ebuild 2012
 MD5 d9c89710f2f6df8316f4506ee7d9f542 files/digest-abiword-1.99.1 68
 MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
diff --git a/app-office/abiword/abiword-1.0.6-r1.ebuild b/app-office/abiword/abiword-1.0.6-r1.ebuild
index 5a46419fcec3..527220041a84 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.
 # 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.1 2003/06/08 00:40:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.0.6-r1.ebuild,v 1.2 2003/06/18 15:59:43 foser Exp $
 
 inherit flag-o-matic
 
@@ -13,7 +13,7 @@ DESCRIPTION="Word processor"
 SRC_URI="mirror://sourceforge/abiword/${P}.tar.gz"
 HOMEPAGE="http://www.abisource.com"
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 LICENSE="GPL-2"
 SLOT="1"
 
diff --git a/app-office/abiword/abiword-1.99.1.ebuild b/app-office/abiword/abiword-1.99.1.ebuild
new file mode 100644
index 000000000000..9819649db350
--- /dev/null
+++ b/app-office/abiword/abiword-1.99.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.99.1.ebuild,v 1.1 2003/06/18 15:59:43 foser Exp $
+
+inherit eutils debug
+
+IUSE="spell jpeg xml2 gnome"
+
+S=${WORKDIR}/${P}/abi
+DESCRIPTION="Fully featured yet light and fast cross platform word processor."
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.abisource.com"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+LICENSE="GPL-2"
+SLOT="2"
+
+DEPEND="virtual/x11
+	virtual/xft
+	>=media-libs/fontconfig-2.1
+	media-libs/libpng
+	>=dev-libs/libunicode-0.4-r1
+	>=dev-libs/libole2-0.2.4-r1
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=app-text/wv-0.7.6
+	>=dev-libs/fribidi-0.10.4
+	jpeg?  ( >=media-libs/jpeg-6b-r2 )
+	( xml2? >=dev-libs/libxml2-2.4.10 : dev-libs/expat )
+	spell? ( >=app-text/aspell-0.50.3 )
+	gnome? ( >=gnome-base/libgnomeui-2.2 
+		>=gnome-base/libgnomeprintui-2.2.1 
+		>=gnome-extra/gal-1.99 )"
+
+#	perl?  ( >=dev-lang/perl-5.6 )
+# perl seems broken
+
+# FIXME : do 'real' use switching, add gucharmap support
+# switches do not work by the looks of it
+
+src_unpack() {
+	unpack ${A}
+
+	# Patch to make the wv.h tests work 
+	# 
+	# wv wants libole2 which in it's turn wants glib 1.2
+	# glib.h includes glibconfig.h which is in a non-included path
+	# and makes the tests fail, this patch adds those paths to configure.
+	# Compiling without specifying the path anywhere goes fine.
+	#
+	# April 1st 2003 <foser@gentoo.org>
+	cd ${S}
+#	epatch ${FILESDIR}/${PN}-1.1.4-wv_configure_fooling.patch
+}
+
+src_compile() {
+
+	./autogen.sh
+
+	local myconf
+
+	use gnome \
+		&& myconf="${myconf} --enable-gnome" \
+		|| myconf="${myconf} --disable-gnome" 
+		
+	econf ${myconf} --with-sys-wv || die  
+
+	emake all-recursive || die
+}
+
+src_install() {  
+	dodir /usr/{bin,lib}
+	
+	einstall PERLDEST=${D} || die
+	
+	dosed "s:${D}::g" /usr/bin/AbiWord-2.0
+	
+	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
+
+	# Install icon and .desktop for menu entry
+	use gnome && ( \
+		insinto /usr/share/pixmaps
+		newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
+		insinto /usr/share/applications/
+		doins ${FILESDIR}/AbiWord2.desktop
+		# Not installing oaf files, not overly stable.
+	)
+}
+
+pkg_postinst() {
+	einfo "For stability, install the latest 1.0.x release."
+}
+
diff --git a/app-office/abiword/files/digest-abiword-1.99.1 b/app-office/abiword/files/digest-abiword-1.99.1
new file mode 100644
index 000000000000..2c619263594a
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-1.99.1
@@ -0,0 +1 @@
+MD5 e96b50aea36ebf935d001b436b2bc582 abiword-1.99.1.tar.gz 18099889