disable building of wmf plugin

12 files changed, 4 insertions, 614 deletions

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index ea44b33290ae..c5e40062fa7e 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,26 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c04096a880ef9bc0262426e9b202ef30 abiword-2.0.10.ebuild 2404
-MD5 a417c54d33547fd080f66550dc768119 abiword-2.0.6.ebuild 2368
+MD5 3b08fe85560d954948bbf27e32289dd3 abiword-2.0.10.ebuild 2435
+MD5 4ddd53188a68a7bd59d364a11611d416 abiword-2.2.2.ebuild 2264
 MD5 3a36610af11a6d9b1ed89ee2c28a7548 ChangeLog 13236
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4ddd53188a68a7bd59d364a11611d416 abiword-2.2.2.ebuild 2264
-MD5 846062a82edba675815a99a9176405d1 abiword-2.0.11.ebuild 2416
-MD5 0f588abcbda4340456d010bed3fd994f abiword-2.0.7.ebuild 2440
-MD5 31616e14907aefda2489036cc3d1db3d files/AbiWord.desktop 901
-MD5 98793f926bc55d7e2398a9990d36fe18 files/digest-abiword-2.0.6 68
 MD5 4b3719f3158acf5c443b4739886272f4 files/digest-abiword-2.0.10 69
-MD5 1ebcd22c6249c06e631c13491113d8ef files/AbiWord2.desktop 166
 MD5 3b6aacecf03d65d9c41833afe9d29687 files/digest-abiword-2.2.2 68
-MD5 662c468ce505280c4a15a351ebbd485e files/digest-abiword-2.0.7 68
-MD5 cd037c182094f6ba10b7dd9e15035efd files/abiword-2.0.3-amd64.patch 8632
-MD5 cdcb56eb42723dfe535c458c4e062400 files/digest-abiword-2.0.11 69
-MD5 388c51460cfdcd7f6fd5b144d61f245a files/abiword-2.0.7-gcc-3.4.patch 525
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBxrniugEuf3OQ0akRAg3sAJ92QbOJBMoGc/Ry/Bmpel5F8Ycv7QCcC2fm
-DsQ7/B2sZYYIcthOya2qSWE=
-=Hq8Y
------END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.0.10.ebuild b/app-office/abiword/abiword-2.0.10.ebuild
index b3006bf0e6fe..65ea5fd0569f 100644
--- a/app-office/abiword/abiword-2.0.10.ebuild
+++ b/app-office/abiword/abiword-2.0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.10.ebuild,v 1.7 2004/12/20 11:39:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.10.ebuild,v 1.8 2004/12/21 14:02:31 foser Exp $
 
 inherit eutils
 
@@ -70,6 +70,7 @@ src_compile() {
 		--disable-debug \
 		--enable-all \
 		--with-abiword=${S} \
+		--without-wmf --disable-wmf \
 		--without-ImageMagick || die
 
 	emake || die
diff --git a/app-office/abiword/abiword-2.0.11.ebuild b/app-office/abiword/abiword-2.0.11.ebuild
deleted file mode 100644
index 148d7b30d51e..000000000000
--- a/app-office/abiword/abiword-2.0.11.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.11.ebuild,v 1.2 2004/09/08 03:12:00 tgall Exp $
-
-inherit eutils
-
-IUSE="gnome jpeg spell xml2"
-
-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 ~ppc64"
-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_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
-	make DESTDIR=${D} install || 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/abiword-2.0.6.ebuild b/app-office/abiword/abiword-2.0.6.ebuild
deleted file mode 100644
index 18c23b2aaeb8..000000000000
--- a/app-office/abiword/abiword-2.0.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.0.6.ebuild,v 1.13 2004/07/11 00:56:57 kloeri Exp $
-
-inherit eutils
-
-IUSE="gnome jpeg spell xml2"
-
-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_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/abiword-2.0.7.ebuild b/app-office/abiword/abiword-2.0.7.ebuild
deleted file mode 100644
index 092455af6534..000000000000
--- a/app-office/abiword/abiword-2.0.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.8 2004/09/19 08:29:19 lu_zero Exp $
-
-inherit eutils
-
-IUSE="gnome jpeg spell xml2"
-
-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.desktop b/app-office/abiword/files/AbiWord.desktop
deleted file mode 100644
index 12fb092ecd9a..000000000000
--- a/app-office/abiword/files/AbiWord.desktop
+++ /dev/null
@@ -1,54 +0,0 @@
-[Desktop Entry]
-Name=AbiWord
-Name[ca]=AbiWord
-Name[cs]=AbiWord
-Name[da]=AbiWord
-Name[de]=AbiWord
-Name[el]=AbiWord
-Name[es]=AbiWord
-Name[et]=AbiWord
-Name[fi]=AbiWord
-Name[fr]=AbiWord
-Name[ga]=AbiWord
-Name[gl]=AbiWord
-Name[hr]=AbiWord
-Name[hu]=AbiWord
-Name[it]=AbiWord
-Name[ja]=AbiWord
-Name[nl]=AbiWord
-Name[nn]=AbiWord
-Name[no]=AbiWord
-Name[pl]=AbiWord
-Name[pt_BR]=AbiWord
-Name[ru]=AbiWord
-Name[sk]=AbiWord
-Name[sv]=AbiWord
-Name[tr]=AbiWord
-Name[uk]=AbiWord
-Name[zh_CN.GB2312]=AbiWord
-Name[zh_TW.Big5]=AbiWord
-Comment=Word Processing for Everyone
-Comment[da]=
-Comment[de]=
-Comment[es]=
-Comment[et]=
-Comment[fr]=
-Comment[gl]=
-Comment[hu]=
-Comment[ja]=
-Comment[nl]=
-Comment[nn]=
-Comment[no]=
-Comment[pl]=
-Comment[pt]=
-Comment[pt_BR]=
-Comment[ru]=
-Comment[sk]=
-Comment[sv]=
-Comment[tr]=
-Comment[zh_CN.GB2312]=
-Exec=AbiWord
-Icon=AbiWord.png
-Terminal=0
-Type=Application
-Categories=GNOME;Application;Office;
diff --git a/app-office/abiword/files/AbiWord2.desktop b/app-office/abiword/files/AbiWord2.desktop
deleted file mode 100644
index e39c76238d33..000000000000
--- a/app-office/abiword/files/AbiWord2.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=AbiWord 2
-Comment=Word Processor
-Exec=AbiWord-2.0
-Icon=AbiWord.png
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/app-office/abiword/files/abiword-2.0.3-amd64.patch b/app-office/abiword/files/abiword-2.0.3-amd64.patch
deleted file mode 100644
index a977b7013256..000000000000
--- a/app-office/abiword/files/abiword-2.0.3-amd64.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-diff -ur abiword-2.0.3/abi/src/af/xap/unix/xap_UnixFont.cpp abiword-2.0.3-amd64/abi/src/af/xap/unix/xap_UnixFont.cpp
---- abiword-2.0.3/abi/src/af/xap/unix/xap_UnixFont.cpp	2003-08-22 16:52:07.000000000 -0400
-+++ abiword-2.0.3-amd64/abi/src/af/xap/unix/xap_UnixFont.cpp	2004-03-02 11:15:19.138416528 -0500
-@@ -400,10 +400,10 @@
- 	size_t idx = 0;
- 	for (size_t i = 0; i < coverage.size(); i += 2)
- 	  {
--		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i]));
-+		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i]));
- 		  UT_UCSChar c2 =
- 			  static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) +
--			  static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1]));
-+			  static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(coverage[i + 1]));
- 		  for (UT_UCSChar c = c1; c < c2; ++c)
- 		    {
- 			    FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
-diff -ur abiword-2.0.3/abi/src/af/xap/xp/xap_Draw_Symbol.cpp abiword-2.0.3-amd64/abi/src/af/xap/xp/xap_Draw_Symbol.cpp
---- abiword-2.0.3/abi/src/af/xap/xp/xap_Draw_Symbol.cpp	2003-05-07 13:40:40.000000000 -0400
-+++ abiword-2.0.3-amd64/abi/src/af/xap/xp/xap_Draw_Symbol.cpp	2004-03-02 11:15:15.767928920 -0500
-@@ -153,7 +153,7 @@
- 	
- 	for (i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]));
-+		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
- 		size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
- 
- 		for (UT_UCSChar j = base; j < base + nb_chars; ++j)
-@@ -194,11 +194,11 @@
- 	UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy));
- 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
-+		count += reinterpret_cast<unsigned long>(m_vCharSet[i + 1]);
- 		if (count > index)
- 		{
--			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
--			return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]));
-+			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
-+			return static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
- 		}
- 	}
- 
-@@ -227,8 +227,8 @@
- 
- 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
- 	{
--		UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]);
--		UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
-+		UT_uint32 base = reinterpret_cast<unsigned long>(m_vCharSet[i]);
-+		UT_uint32 size = reinterpret_cast<unsigned long>(m_vCharSet[i + 1]);
- 		
- 		if (base + size > c)
- 		{
-diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_Table.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_Table.cpp
---- abiword-2.0.3/abi/src/wp/impexp/xp/ie_Table.cpp	2003-08-24 21:45:11.000000000 -0400
-+++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_Table.cpp	2004-03-02 11:15:25.290481272 -0500
-@@ -1028,7 +1028,7 @@
- 			UT_sint32 j = 0;
- 			for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++)
- 			{
--				UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j));
-+				UT_sint32 prevX = reinterpret_cast<signed long>(m_vecCellX.getNthItem(j));
- 				UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX));
- 				bool bLast = ((j-1) == szCurRow);
- 				bMatch =  doCellXMatch(prevX,curX,bLast);
-@@ -1179,7 +1179,7 @@
- 		sColWidth.clear();
- 		for(i=0; i< static_cast<UT_sint32>(m_vecCellX.getItemCount()); i++)
- 		{
--			UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
-+			UT_sint32 iCellx = reinterpret_cast<signed long>(m_vecCellX.getNthItem(i));
- 			xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev));
- 			UT_sint32 iDiffCellx = iCellx - iPrev;
- 			double dCellx = static_cast<double>(iDiffCellx)/1440.0 -dColSpace;
-@@ -1377,7 +1377,7 @@
- 	UT_sint32 iSub = 0;
- 	for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++)
- 	{
--		UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
-+		UT_sint32 icellx = reinterpret_cast<signed long>(m_vecCellX.getNthItem(i));
- 		if(icellx == -1)
- 		{
- 			iSub++;
-diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_exp_HTML.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_exp_HTML.cpp
---- abiword-2.0.3/abi/src/wp/impexp/xp/ie_exp_HTML.cpp	2004-01-12 03:31:23.000000000 -0500
-+++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_exp_HTML.cpp	2004-03-02 11:15:21.021130312 -0500
-@@ -777,7 +777,7 @@
- 	void * vptr = 0;
- 	m_tagStack.pop (&vptr);
- 
--	if (reinterpret_cast<UT_uint32>(vptr) == tagID) return;
-+	if (reinterpret_cast<unsigned long>(vptr) == tagID) return;
- 
- 	UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n"));
- }
-@@ -821,7 +821,7 @@
- UT_uint32 s_HTML_Listener::tagTop ()
- {
- 	void * vptr = 0;
--	if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr);
-+	if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<unsigned long>(vptr);
- 	return 0;
- }
- 
-@@ -1899,7 +1899,7 @@
- {
- 	void * vptr = 0;
- 	m_utsListType.viewTop (&vptr);
--	return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
-+	return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr));
- }
- 
- void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName)
-@@ -1938,7 +1938,7 @@
- 
- 	void * vptr = 0;
- 	m_utsListType.pop (&vptr);
--	UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
-+	UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr));
- 
- 	UT_uint32 tagID;
- 
-diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_imp_RTF.cpp
---- abiword-2.0.3/abi/src/wp/impexp/xp/ie_imp_RTF.cpp	2003-12-26 20:05:47.000000000 -0500
-+++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_imp_RTF.cpp	2004-03-02 11:15:22.517902768 -0500
-@@ -1211,9 +1211,9 @@
- 		m_iOverrideLevel = other.m_iOverrideLevel;
- 		if(m_tabTypes.getItemCount() > 0)
- 		{
--			UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
-+			UT_uint32 dum = reinterpret_cast<unsigned long>(m_tabTypes.getNthItem(0));
- 			m_curTabType = static_cast<eTabType>(dum);
--			dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
-+			dum = reinterpret_cast<unsigned long>(m_tabLeader.getNthItem(0));
- 			m_curTabLeader = static_cast<eTabLeader>(dum);
- 		}
- 		else
-@@ -2458,7 +2458,7 @@
- {
- 	if (colNum < m_colourTable.getItemCount())
- 	{
--		return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
-+		return reinterpret_cast<unsigned long>(m_colourTable.getNthItem(colNum));
- 	}
- 	else
- 	{
-@@ -2470,7 +2470,7 @@
- {
- 	if (colNum < m_colourTable.getItemCount())
- 	{
--		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
-+		return reinterpret_cast<signed long>(m_colourTable.getNthItem(colNum));
- 	}
- 	else
- 	{
-@@ -6327,11 +6327,11 @@
- 			if (i > 0)
- 				propBuffer += ",";
- 
--			UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
-+			UT_sint32 tabTwips = reinterpret_cast<signed long>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
- 			double tabIn = tabTwips/(20.0*72.);
--			UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
-+			UT_uint32 idum = reinterpret_cast<unsigned long>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
- 			eTabType tabType = static_cast<eTabType>(idum);
--			idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
-+			idum = reinterpret_cast<unsigned long>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
- 			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
- 			char  cType = ' ';
- 			switch(tabType)
-@@ -9808,9 +9808,9 @@
- 		if (i > 0)
- 			strcat(propBuffer, ",");
- 
--		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
-+		UT_sint32 tabTwips = reinterpret_cast<signed long>(pParas->m_tabStops.getNthItem(i));
- 		double tabIn = tabTwips/(20.0*72.);
--		UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i));
-+		UT_uint32 idum = reinterpret_cast<unsigned long>(pParas->m_tabTypes.getNthItem(i));
- 		eTabType tabType = static_cast<eTabType>(idum);
- 		idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
- 		eTabLeader tabLeader = static_cast<eTabLeader>(idum);
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
deleted file mode 100644
index 9a6d2f80082d..000000000000
--- a/app-office/abiword/files/abiword-2.0.7-gcc-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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.11 b/app-office/abiword/files/digest-abiword-2.0.11
deleted file mode 100644
index 9937f3c3dffc..000000000000
--- a/app-office/abiword/files/digest-abiword-2.0.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b0618ad60d4273ae0daf80451ede4f3 abiword-2.0.11.tar.bz2 22200079
diff --git a/app-office/abiword/files/digest-abiword-2.0.6 b/app-office/abiword/files/digest-abiword-2.0.6
deleted file mode 100644
index 9981d80f8c35..000000000000
--- a/app-office/abiword/files/digest-abiword-2.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 80379d6a61ec0faad0665e9b83f47e62 abiword-2.0.6.tar.bz2 21994261
diff --git a/app-office/abiword/files/digest-abiword-2.0.7 b/app-office/abiword/files/digest-abiword-2.0.7
deleted file mode 100644
index 946953fddd79..000000000000
--- a/app-office/abiword/files/digest-abiword-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb1de0c969f1b93280ff7e661efb1025 abiword-2.0.7.tar.bz2 22012687