Bump to 2.6.8. Bug fixes.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

2 files changed, 101 insertions, 1 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 5c499b6eac5b..c45efb6733c4 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.208 2009/02/20 00:16:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.209 2009/03/15 01:00:27 eva Exp $
+
+*abiword-2.6.8 (15 Mar 2009)
+
+  15 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org> +abiword-2.6.8.ebuild:
+  Bump to 2.6.8. Bug fixes.
 
 *abiword-2.6.6 (20 Feb 2009)
 
diff --git a/app-office/abiword/abiword-2.6.8.ebuild b/app-office/abiword/abiword-2.6.8.ebuild
new file mode 100644
index 000000000000..764e49bb55fc
--- /dev/null
+++ b/app-office/abiword/abiword-2.6.8.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.8.ebuild,v 1.1 2009/03/15 01:00:27 eva Exp $
+
+EAPI="1"
+
+inherit alternatives eutils gnome2 versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gnome spell xml"
+
+# FIXME: gsf could probably be conditional
+
+RDEPEND="dev-libs/popt
+	sys-libs/zlib
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2.6
+	x11-libs/libXft
+	>=x11-libs/pango-1.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2
+	>=x11-libs/goffice-0.4:0.4
+	>=media-libs/libpng-1.2
+	>=media-libs/fontconfig-2.1
+	>=media-libs/freetype-2.1
+	>=app-text/wv-1.2
+	>=dev-libs/fribidi-0.10.4
+	xml? ( >=dev-libs/libxml2-2.4.10 )
+	!xml? ( dev-libs/expat )
+	spell? ( >=app-text/enchant-1.2 )
+	gnome?	(
+		>=gnome-base/libbonobo-2
+		>=gnome-base/libgnomeui-2.2
+		>=gnome-extra/gucharmap-1.4
+		>=gnome-base/gnome-vfs-2.2 )
+	>=gnome-extra/libgsf-1.12.0"
+
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.9"
+
+# FIXME: --enable-libabiword fails to compile
+
+pkg_setup() {
+	if ! built_with_use --missing true x11-libs/pango X; then
+		eerror "You must rebuild x11-libs/pango with USE='X'"
+		die "You must rebuild x11-libs/pango with USE='X'"
+	fi
+
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable debug symbols)
+		$(use_enable gnome gnomeui)
+		$(use_enable gnome gucharmap)
+		$(use_enable gnome gnomevfs)
+		$(use_enable spell spellcheck)
+		$(use_with xml libxml2)
+		$(use_with !xml expat)
+		--enable-libabiword
+		--enable-printing"
+}
+
+src_install() {
+	# Install icon to pixmaps, bug #220097
+	sed 's:icondir = $(datadir)/icons:icondir = $(datadir)/pixmaps:'	\
+		-i GNUmakefile || die "sed 1 failed"
+
+	gnome2_src_install
+
+	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
+		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 2 failed"
+
+	mv "${D}/usr/bin/abiword" "${D}/usr/bin/AbiWord-${MY_MAJORV}"
+	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
+
+	dodoc *.TXT user/wp/readme.txt
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+
+	elog "As of version 2.4, all abiword plugins have been moved"
+	elog "into a seperate app-office/abiword-plugins package"
+	elog "You can install them by running emerge abiword-plugins"
+}