new release, mark 2.2.8-r1 x86

(Portage version: 2.0.51.22-r2)

5 files changed, 119 insertions, 8 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 9ccef1f90450..5e6d589c2bf6 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # 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.118 2005/07/14 16:34:03 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.119 2005/08/01 16:09:24 foser Exp $
+
+*abiword-2.2.9 (01 Aug 2005)
+
+  01 Aug 2005; Marinus Schraal <foser@gentoo.org> abiword-2.2.9.ebuild :
+  Rather fresh release
 
   14 Jul 2005; Guy Martin <gmsoft@gentoo.org> abiword-2.2.7-r1.ebuild:
   Stable on hppa.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index beb6d580317b..32b6b4565f58 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,10 +1,12 @@
-MD5 3ef90008b311875b3576f384f27dacd9 ChangeLog 15903
 MD5 c8736c4b16b0d76461f3fca45ef6d40e abiword-2.2.5-r1.ebuild 2365
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 104b0fc7f156da8e5b73eb8f9acec45c abiword-2.2.7-r1.ebuild 2459
 MD5 932e87b520251029455f73abc90b9b47 abiword-2.2.8-r1.ebuild 2549
+MD5 104b0fc7f156da8e5b73eb8f9acec45c abiword-2.2.7-r1.ebuild 2459
+MD5 3ef90008b311875b3576f384f27dacd9 ChangeLog 15903
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 932e87b520251029455f73abc90b9b47 abiword-2.2.9.ebuild 2549
 MD5 465c848797c2f2fa0a916a76d733c379 files/2.2.8-gcc4.patch 506
 MD5 cb31301bf61f64e0751b3ae0c382ca41 files/abiword-security-fix.patch 456
-MD5 18acb96f28cede2da43044aaa82a6f94 files/digest-abiword-2.2.7-r1 68
+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.8-r1.ebuild b/app-office/abiword/abiword-2.2.8-r1.ebuild
index 67bb032bf559..f875bced1393 100644
--- a/app-office/abiword/abiword-2.2.8-r1.ebuild
+++ b/app-office/abiword/abiword-2.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.8-r1.ebuild,v 1.1 2005/07/03 20:28:37 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.2.8-r1.ebuild,v 1.2 2005/08/01 16:09:24 foser Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.abisource.com"
 
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/source/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
+KEYWORDS="x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
 LICENSE="GPL-2"
 SLOT="2"
 
@@ -48,7 +48,7 @@ src_compile() {
 	rm -f configure.old
 
 	# Fix compilation on GCC4; upstream patch
-	epatch ${FILESDIR}/${PV}-gcc4.patch
+	epatch ${FILESDIR}/2.2.8-gcc4.patch
 
 	# fix for security, see #96991
 	epatch ${FILESDIR}/${PN}-security-fix.patch
diff --git a/app-office/abiword/abiword-2.2.9.ebuild b/app-office/abiword/abiword-2.2.9.ebuild
new file mode 100644
index 000000000000..153bf6b99b4f
--- /dev/null
+++ b/app-office/abiword/abiword-2.2.9.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.9.ebuild,v 1.1 2005/08/01 16:09:24 foser 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="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa ~ppc64 ~ia64"
+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.9 b/app-office/abiword/files/digest-abiword-2.2.9
new file mode 100644
index 000000000000..bda63712bbac
--- /dev/null
+++ b/app-office/abiword/files/digest-abiword-2.2.9
@@ -0,0 +1 @@
+MD5 17fe5169f03643dd59c83af7cf1c448a abiword-2.2.9.tar.bz2 23933509