new version 'n cleanup

6 files changed, 24 insertions, 154 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 23872e5669a9..7f456eb725ba 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,15 +1,9 @@
-MD5 1778c2ae26bbc8237a4992e136e8852a abiword-2.0.0.ebuild 2408
+MD5 fa3af6f4c6c67786158ddfd1124305d0 abiword-2.0.0.ebuild 2232
 MD5 7921df3134ed60f1eb9c3d1c920bde16 abiword-1.0.6-r1.ebuild 1927
-MD5 efe294da846749e0a80bc255248dd9df abiword-1.99.5.ebuild 2486
 MD5 94c4e4f908ee6c3ed3a54366836f573c abiword-1.0.2-r1.ebuild 4681
-MD5 8c8e873b5ca7e5cdb704fcb9644f3ea2 abiword-1.99.4-r2.ebuild 2609
-MD5 2df4362ea783cfbece7ec6ea3af63977 abiword-1.99.6.ebuild 2425
-MD5 ffd8733d502dffebd615d762ac87a5a1 ChangeLog 7881
+MD5 657011df65890806c023b1bcfbfc0b68 ChangeLog 8133
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d57b12387f05b71dd4e52f258a6e6e91 files/abiword-1.99.4-ots_buildfix.patch 416
-MD5 475c8ca576317154869d2a10bbc4bf14 files/digest-abiword-1.99.5 144
-MD5 5ea890733c472eb41a3feca102219deb files/digest-abiword-1.99.6 143
-MD5 9568c6ef14fe052d3d9f42747bda1aa2 files/digest-abiword-1.99.4-r2 144
 MD5 4ab387fa04b0102a395a4b654f0714df files/abiword-1.1.4-wv_configure_fooling.patch 1575
 MD5 0f7641e2439a791f9b80d1da5f4d2699 files/digest-abiword-2.0.0 142
 MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
diff --git a/app-office/abiword/abiword-1.99.4-r2.ebuild b/app-office/abiword/abiword-1.99.4-r2.ebuild
deleted file mode 100644
index 4a511e97c716..000000000000
--- a/app-office/abiword/abiword-1.99.4-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.99.4-r2.ebuild,v 1.3 2003/09/08 07:23:08 msterret 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
-	mirror://sourceforge/${PN}/${PN}-plugins-${PV}.tar.bz2"
-
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
-LICENSE="GPL-2"
-SLOT="2"
-
-RDEPEND="virtual/x11
-	virtual/xft
-	>=media-libs/fontconfig-2.1
-	>=dev-libs/libunicode-0.4-r1
-	media-libs/libpng
-	>=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/enchant-0.1 )
-	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_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
-
-	# 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` \
-		--enable-bidi \
-		--without-ImageMagick \
-		--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
-
-	dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
-
-	# 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
-
-}
diff --git a/app-office/abiword/abiword-1.99.5.ebuild b/app-office/abiword/abiword-2.0.0.ebuild
index 531681b7a3bc..ec24604a9005 100644
--- a/app-office/abiword/abiword-1.99.5.ebuild
+++ b/app-office/abiword/abiword-2.0.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.5.ebuild,v 1.4 2003/09/08 07:23:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.0.ebuild,v 1.1 2003/09/13 14:04:04 foser Exp $
 
-inherit eutils debug
+inherit eutils
 
 IUSE="spell jpeg xml2 gnome"
 
 S=${WORKDIR}/${P}/abi
-# REMIND : usually -${PV} needs to be added
 S_P=${WORKDIR}/${PN}-plugins
 
 DESCRIPTION="Fully featured yet light and fast cross platform word processor"
@@ -31,9 +30,9 @@ RDEPEND="virtual/x11
 	>=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/enchant-0.1 )
-	gnome? ( >=gnome-base/libgnomeui-2.2
-		>=gnome-base/libgnomeprintui-2.2.1
+	spell? ( >=app-text/enchant-1 )
+	gnome? ( >=gnome-base/libgnomeui-2.2 
+		>=gnome-base/libgnomeprintui-2.2.1 
 		>=gnome-extra/gal-1.99 )"
 
 DEPEND="${RDEPEND}
@@ -44,22 +43,15 @@ DEPEND="${RDEPEND}
 #	perl?  ( >=dev-lang/perl-5.6 )
 # perl seems broken
 
-src_unpack() {
-
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-cast_fix.patch
-
-}
-
 src_compile() {
+
 	./autogen.sh
 
 	# 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
+	cat configure.old |sed s:-pedantic::g >configure	
+	rm -f configure.old 
 
 	econf \
 		`use_enable gnome` \
@@ -68,7 +60,7 @@ src_compile() {
 		--enable-bidi \
 		--without-ImageMagick \
 		--disable-scripting \
-		--with-sys-wv || die
+		--with-sys-wv || die  
 
 	emake all-recursive || die
 
@@ -77,18 +69,22 @@ src_compile() {
 	cd ${S_P}
 
 	./nextgen.sh
-	econf --enable-all --with-abiword=${S} || die
+	econf \
+		--enable-all \
+		--with-abiword=${S} \
+		--without-ImageMagick || die
 	emake || die
 
 }
 
-src_install() {
-	dodir /usr/{bin,lib}
+src_install() {  
 
+	dodir /usr/{bin,lib}
+	
 	einstall PERLDEST=${D} || die
-
-	dosed "s:${D}::g" /usr/bin/AbiWord-2.0
-
+	
+	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
@@ -101,10 +97,4 @@ src_install() {
 
 	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
-
 }
diff --git a/app-office/abiword/files/digest-abiword-1.99.4-r2 b/app-office/abiword/files/digest-abiword-1.99.4-r2
deleted file mode 100644
index 53084ebf4b38..000000000000
--- a/app-office/abiword/files/digest-abiword-1.99.4-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 09bba533b32b81a35aaf27de6e7f4210 abiword-1.99.4.tar.bz2 14366672
-MD5 8025d63d0b56ba42b18a33ffa5fe0f80 abiword-plugins-1.99.4.tar.bz2 925717
diff --git a/app-office/abiword/files/digest-abiword-1.99.5 b/app-office/abiword/files/digest-abiword-1.99.5
deleted file mode 100644
index 740a1a42c24c..000000000000
--- a/app-office/abiword/files/digest-abiword-1.99.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4b6fac4f358c0e83ffdd190260d9b6c4 abiword-1.99.5.tar.bz2 20331738
-MD5 c755a123187a60d4f9a1c17efae8e616 abiword-plugins-1.99.5.tar.bz2 671062
diff --git a/app-office/abiword/files/digest-abiword-2.0.0 b/app-office/abiword/files/digest-abiword-2.0.0
new file mode 100644
index 000000000000..ed307a1a6196
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.0.0
@@ -0,0 +1,2 @@
+MD5 bc3b4020966dd72e0846e8b64fcb295d abiword-2.0.0.tar.bz2 20514250
+MD5 6e65725080d91cf81f6c8c057854aec4 abiword-plugins-2.0.0.tar.bz2 917812