dev version bump with some fixes

8 files changed, 27 insertions, 201 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index f1bb78c7d76b..61ebfa2cef6d 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,16 +1,11 @@
 MD5 144371398dbe030e96f2e320cf8470c2 abiword-1.0.6-r1.ebuild 1930
 MD5 1abe03d14ed3a4064bb061324361cab9 abiword-1.0.2-r1.ebuild 4687
-MD5 3b84d70d93e5ce1d6172306a35d2543e abiword-1.99.2.ebuild 2121
-MD5 8aa9c5046bcc9988348d823132756af4 abiword-1.99.4-r2.ebuild 2604
-MD5 1ac8b02dd63859b53ddf415ebbbcd0bf abiword-1.99.1.ebuild 2478
-MD5 dacb7745197037daf810b2b7b1d39acb abiword-1.99.4-r1.ebuild 2436
-MD5 787703cb3985235b4dae53140a7c52b3 ChangeLog 7514
+MD5 fb253d2410ebab0b96d9939aac12c071 abiword-1.99.4-r2.ebuild 2619
+MD5 a751bb0173a7d1ea8cd6f429000551f1 ChangeLog 7690
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 725be60608c2f5340e9d1b746654a47d abiword-1.99.3.ebuild 2150
-MD5 d9c89710f2f6df8316f4506ee7d9f542 files/digest-abiword-1.99.1 68
-MD5 f080426cc26d779158e955db2b3a57af files/digest-abiword-1.99.2 143
+MD5 d57b12387f05b71dd4e52f258a6e6e91 files/abiword-1.99.4-ots_buildfix.patch 416
 MD5 e25e0ea2de22ec54cf1acec686b99e9f files/digest-abiword-1.99.3 144
-MD5 9568c6ef14fe052d3d9f42747bda1aa2 files/digest-abiword-1.99.4-r1 144
 MD5 9568c6ef14fe052d3d9f42747bda1aa2 files/digest-abiword-1.99.4-r2 144
 MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
 MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
diff --git a/app-office/abiword/abiword-1.99.1.ebuild b/app-office/abiword/abiword-1.99.1.ebuild
deleted file mode 100644
index 9819649db350..000000000000
--- a/app-office/abiword/abiword-1.99.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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/abiword-1.99.2.ebuild b/app-office/abiword/abiword-1.99.2.ebuild
deleted file mode 100644
index 99f3875e1264..000000000000
--- a/app-office/abiword/abiword-1.99.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.2.ebuild,v 1.1 2003/07/27 18:17:43 foser Exp $
-
-inherit eutils debug
-
-IUSE="spell jpeg xml2 gnome"
-
-S=${WORKDIR}/${P}/abi
-S_P=${WORKDIR}/${PN}-plugins-${PV}
-
-DESCRIPTION="Fully featured yet light and fast cross platform word processor"
-HOMEPAGE="http://www.abisource.com"
-
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${PN}-plugins-${PV}.tar.gz"
-
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-LICENSE="GPL-2"
-SLOT="2"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=media-libs/fontconfig-2.1
-	media-libs/libpng
-	>=dev-libs/libunicode-0.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 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-#	>=dev-libs/libole2-0.2.4-r1
-#	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_compile() {
-
-	./autogen.sh
-
-	econf `use_enable gnome` --with-sys-wv || die  
-
-	emake all-recursive || die
-
-	# Build plugins
-
-	cd ${S_P}
-
-	./nextgen.sh
-	econf --enable-all --with-abiword=${S} || die
-	emake || 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
-
-	# install plugins
-
-	cd ${S_P}
-
-	make DESTDIR=${D} install || die
-
-	# Install icon and .desktop for menu entry
-	insinto /usr/share/pixmaps
-	newins ${WORKDIR}/${P}/abidistfiles/icons/abiword_48.png AbiWord.png
-	insinto /usr/share/applications/
-	doins ${FILESDIR}/AbiWord2.desktop
-
-	dodoc COPYING *.TXT docs/build/BUILD.TXT abi/user/wp/readme.txt
-
-}
diff --git a/app-office/abiword/abiword-1.99.4-r1.ebuild b/app-office/abiword/abiword-1.99.4-r2.ebuild
index 7ed631e3af5f..29e7c10c8485 100644
--- a/app-office/abiword/abiword-1.99.4-r1.ebuild
+++ b/app-office/abiword/abiword-1.99.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.4-r1.ebuild,v 1.1 2003/08/15 19:06:49 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-1.99.4-r2.ebuild,v 1.1 2003/08/18 22:56:00 foser Exp $
 
 inherit eutils debug
 
@@ -45,6 +45,17 @@ DEPEND="${RDEPEND}
 # 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 ots plugin build 
+	# patch by mg <markglibert@hotpop.com> in #26824
+	cd ${S_P}
+	epatch ${FILESDIR}/${P}-ots_buildfix.patch
+
+}	
+
 src_compile() {
 	./autogen.sh
 
@@ -58,6 +69,7 @@ src_compile() {
 		`use_with xml2 libxml2` \
 		`use_enable spell enchant` \
 		--enable-bidi \
+		--without-ImageMagick \
 		--with-sys-wv || die  
 
 	emake all-recursive || die
diff --git a/app-office/abiword/files/abiword-1.99.4-ots_buildfix.patch b/app-office/abiword/files/abiword-1.99.4-ots_buildfix.patch
new file mode 100644
index 000000000000..7ff60b13298f
--- /dev/null
+++ b/app-office/abiword/files/abiword-1.99.4-ots_buildfix.patch
@@ -0,0 +1,11 @@
+--- tools/ots/xp/AbiOts.cpp	2003-08-17 17:09:34.000000000 -0400
++++ tools/ots/xp/AbiOts.cpp	2003-08-17 17:09:10.000000000 -0400
+@@ -123,7 +123,7 @@
+   }
+ 
+   ots_parse_stream(reinterpret_cast<const unsigned char *>(txt.utf8_str()), txt.byteLength(), article);
+-  ots_remove_dict_words(article);
++  // ots_remove_dict_words(article);
+   ots_grade_doc (article);
+   ots_highlight_doc (article, getSummaryPercent());
+ 
diff --git a/app-office/abiword/files/digest-abiword-1.99.1 b/app-office/abiword/files/digest-abiword-1.99.1
deleted file mode 100644
index 2c619263594a..000000000000
--- a/app-office/abiword/files/digest-abiword-1.99.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e96b50aea36ebf935d001b436b2bc582 abiword-1.99.1.tar.gz 18099889
diff --git a/app-office/abiword/files/digest-abiword-1.99.2 b/app-office/abiword/files/digest-abiword-1.99.2
deleted file mode 100644
index 99e4775b5364..000000000000
--- a/app-office/abiword/files/digest-abiword-1.99.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6319519f6f8b3eb70b0370bf694350d4 abiword-1.99.2.tar.gz 17197250
-MD5 bc1bcbc16baa1c7026d0b7c0fa3b629b abiword-plugins-1.99.2.tar.gz 1516553
diff --git a/app-office/abiword/files/digest-abiword-1.99.4-r1 b/app-office/abiword/files/digest-abiword-1.99.4-r2
index 53084ebf4b38..53084ebf4b38 100644
--- a/app-office/abiword/files/digest-abiword-1.99.4-r1
+++ b/app-office/abiword/files/digest-abiword-1.99.4-r2