new version, fix for #109157

Package-Manager: portage-2.0.51.22-r3

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index de226e9c2b8b5c93fd3c0a75d36861cb7e548f69..76f6e77b76cb3d22b217cab3a4a2c16d734453b4 100644 (file)
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.135 2005/10/02 11:27:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.136 2005/10/18 15:16:51 allanonjl Exp $
+
+*abiword-2.2.11 (18 Oct 2005)
+
+  18 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +abiword-2.2.11.ebuild:
+  new version, fix for #109157
 
   02 Oct 2005; Aron Griffis <agriffis@gentoo.org> abiword-2.2.10.ebuild:
   Mark 2.2.10 stable on ia64

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 1e587d8829191fe3eee1b886ce55bd05ab70e266..5471adf92dc34de62569ece85ac41baa44c45237 100644 (file)
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,14 +1,16 @@
-MD5 aeb219db77df24fb0917fc9ce671ea47 abiword-2.2.10.ebuild 2333
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 5db53061d577c9753dc28f85ccd5ace6 ChangeLog 17733
 MD5 c8736c4b16b0d76461f3fca45ef6d40e abiword-2.2.5-r1.ebuild 2365
+MD5 aeb219db77df24fb0917fc9ce671ea47 abiword-2.2.10.ebuild 2333
+MD5 9e4591bf64ea466fd2fa7e545c67842f abiword-2.2.8-r1.ebuild 2540
 MD5 104b0fc7f156da8e5b73eb8f9acec45c abiword-2.2.7-r1.ebuild 2459
+MD5 66861ad3d144436296fbecba78a5cdb5 abiword-2.2.11.ebuild 2341
+MD5 0bd85c32d15f36d82688c58fa061803f ChangeLog 17879
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5684d03afc9900f6b6cdbea3a5df24ef abiword-2.2.9.ebuild 2337
-MD5 9e4591bf64ea466fd2fa7e545c67842f abiword-2.2.8-r1.ebuild 2540
-MD5 05bd382bc17a222b7d38e46dd90350c0 files/digest-abiword-2.2.5-r1 68
-MD5 ed594302c92a3587c8057f0d36a8e90a files/digest-abiword-2.2.9 68
-MD5 8b023d31957e4d3d1684959d96564364 files/digest-abiword-2.2.10 69
 MD5 465c848797c2f2fa0a916a76d733c379 files/2.2.8-gcc4.patch 506
-MD5 18acb96f28cede2da43044aaa82a6f94 files/digest-abiword-2.2.7-r1 68
+MD5 8b023d31957e4d3d1684959d96564364 files/digest-abiword-2.2.10 69
+MD5 a8522f74aea43b8fe31b8075165da843 files/digest-abiword-2.2.11 69
 MD5 cb31301bf61f64e0751b3ae0c382ca41 files/abiword-security-fix.patch 456
+MD5 ed594302c92a3587c8057f0d36a8e90a files/digest-abiword-2.2.9 68
+MD5 05bd382bc17a222b7d38e46dd90350c0 files/digest-abiword-2.2.5-r1 68
+MD5 18acb96f28cede2da43044aaa82a6f94 files/digest-abiword-2.2.7-r1 68
 MD5 73661645f9c415ca25f9da7c17fd2628 files/digest-abiword-2.2.8-r1 68

diff --git a/app-office/abiword/abiword-2.2.11.ebuild b/app-office/abiword/abiword-2.2.11.ebuild
new file mode 100644 (file)
index 0000000..4e63edb
--- /dev/null
+++ b/app-office/abiword/abiword-2.2.11.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.11.ebuild,v 1.1 2005/10/18 15:16:51 allanonjl Exp $
+
+inherit eutils fdo-mime alternatives
+
+IUSE="gnome jpeg spell xml2 debug"
+
+S_P=${S}/${PN}-plugins
+S=${WORKDIR}/${P}/abi
+
+DESCRIPTION="Fully featured yet light and fast cross platform word processor"
+HOMEPAGE="http://www.abisource.com"
+
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+LICENSE="GPL-2"
+SLOT="2"
+
+RDEPEND="virtual/x11
+       virtual/xft
+       >=media-libs/fontconfig-2.1
+       media-libs/libpng
+       >=x11-libs/gtk+-2.4
+       >=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.1 )
+       gnome? ( >=gnome-base/libgnomeui-2.2
+               >=gnome-base/libgnomeprint-2.2.1
+               >=gnome-base/libgnomeprintui-2.2.1
+               >=gnome-extra/gucharmap-1.4 )"
+
+DEPEND="${RDEPEND}
+       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_enable gnome gucharmap` \
+               `use_with xml2 libxml2` \
+               `use_enable spell enchant` \
+               `use_enable debug` \
+               --enable-threads \
+               --without-ImageMagick \
+               --disable-scripting \
+               --with-sys-wv || die
+
+       emake all-recursive || die
+
+       # Build plugins
+
+       cd ${S_P}
+
+       econf \
+               `use_enable debug` \
+               --enable-all \
+               --with-abiword=${S} \
+               --without-ImageMagick || die
+
+       emake || die
+
+}
+
+src_install() {
+
+       dodir /usr/{bin,lib}
+
+       make DESTDIR=${D} install || die
+
+       dosed "s:Exec=abiword:Exec=abiword-2.2:" /usr/share/applications/abiword.desktop
+
+       rm -f ${D}/usr/bin/abiword-2.2
+       rm -f ${D}/usr/bin/abiword
+       dosym AbiWord-2.2 /usr/bin/abiword-2.2
+
+       dodoc COPYING *.TXT docs/build/BUILD.TXT user/wp/readme.txt
+
+       # install plugins
+       cd ${S_P}
+
+       make DESTDIR=${D} install || die
+
+}
+
+pkg_postinst() {
+
+       fdo-mime_desktop_database_update
+
+       alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+
+}

diff --git a/app-office/abiword/files/digest-abiword-2.2.11 b/app-office/abiword/files/digest-abiword-2.2.11
new file mode 100644 (file)
index 0000000..4214496
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.2.11
@@ -0,0 +1 @@
+MD5 bbeb471f1232560327757b2574b4fb3b abiword-2.2.11.tar.bz2 23952057