Major version bump, bug #272097. Drop usage of a couple of old libraries. Clean up old revisions.

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

6 files changed, 183 insertions, 194 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index eb3a00a9f419..2bd3461c3e9e 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.214 2010/03/31 18:47:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.215 2010/04/19 23:16:35 eva Exp $
+
+*abiword-2.8.4 (19 Apr 2010)
+
+  19 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org> abiword-2.6.4.ebuild,
+  -abiword-2.6.5.ebuild, -abiword-2.6.6.ebuild, +abiword-2.8.4.ebuild,
+  metadata.xml:
+  Major version bump, bug #272097. Drop usage of a couple of old libraries.
+  Clean up old revisions.
 
   31 Mar 2010; Raúl Porcel <armin76@gentoo.org> abiword-2.6.8.ebuild:
   alpha/ia64/sparc stable wrt #283031
diff --git a/app-office/abiword/abiword-2.6.4.ebuild b/app-office/abiword/abiword-2.6.4.ebuild
index e36003d1a892..2bab86f3c32d 100644
--- a/app-office/abiword/abiword-2.6.4.ebuild
+++ b/app-office/abiword/abiword-2.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.4.ebuild,v 1.10 2009/01/04 22:51:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.4.ebuild,v 1.11 2010/04/19 23:16:35 eva Exp $
 
 EAPI="1"
 
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="hppa"
 IUSE="debug gnome spell xml"
 
 # FIXME: gsf could probably be conditional
diff --git a/app-office/abiword/abiword-2.6.5.ebuild b/app-office/abiword/abiword-2.6.5.ebuild
deleted file mode 100644
index 8f3c4e0590a2..000000000000
--- a/app-office/abiword/abiword-2.6.5.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.5.ebuild,v 1.2 2009/01/04 22:51:26 ulm 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"
-}
diff --git a/app-office/abiword/abiword-2.6.6.ebuild b/app-office/abiword/abiword-2.6.6.ebuild
deleted file mode 100644
index ef1e3c062e4d..000000000000
--- a/app-office/abiword/abiword-2.6.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.6.ebuild,v 1.1 2009/02/20 00:16:07 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"
-}
diff --git a/app-office/abiword/abiword-2.8.4.ebuild b/app-office/abiword/abiword-2.8.4.ebuild
new file mode 100644
index 000000000000..3fd8678ade67
--- /dev/null
+++ b/app-office/abiword/abiword-2.8.4.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.8.4.ebuild,v 1.1 2010/04/19 23:16:35 eva Exp $
+
+EAPI="3"
+
+inherit alternatives 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="~amd64 ~x86"
+IUSE="collab cups gnome grammar latex libgda math ots openxml plugins readline spell wordperfect wmf thesaurus" # svg
+
+# libgsf raised to make sure it provides gio backend (ebuild)
+# not enabling telepathy backend for collab, it depends on libempathy-gtk which
+# has be removed from empathy-2.30 already
+RDEPEND="
+	>=app-text/wv-1.2
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2.16
+	>=gnome-base/librsvg-2.16
+	>=gnome-extra/libgsf-1.14.15
+	>=media-libs/libpng-1.2
+	media-libs/jpeg:0
+	>=x11-libs/cairo-1.8[X]
+	>=x11-libs/gtk+-2.14[cups?]
+	gnome? (
+		>=gnome-extra/gucharmap-2
+		>=x11-libs/goffice-0.8:0.8 )
+	plugins? (
+		collab? (
+			dev-cpp/asio
+			>=dev-libs/boost-1.33.1
+			>=dev-libs/libxml2-2.4
+			>=net-libs/loudmouth-1
+			net-libs/libsoup:2.4
+			net-libs/gnutls )
+		grammar? ( >=dev-libs/link-grammar-4.2.1 )
+		latex? ( dev-libs/libxslt )
+		libgda? (
+			=gnome-extra/libgda-1*
+			=gnome-extra/libgnomedb-1* )
+		math? ( >=x11-libs/gtkmathview-0.7.5 )
+		openxml? ( dev-libs/boost )
+		ots? ( >=app-text/ots-0.5 )
+		readline? ( sys-libs/readline )
+		thesaurus? ( >=app-text/aiksaurus-1.2[gtk] )
+		wordperfect? (
+			>=app-text/libwpd-0.8
+			>=media-libs/libwpg-0.1 )
+		wmf? ( >=media-libs/libwmf-0.2.8 )
+	)
+	spell? ( >=app-text/enchant-1.2 )
+	!<app-office/abiword-plugins-2.8"
+#		svg? ( >=gnome-base/librsvg-2 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+pkg_setup() {
+	# do not enable gnome-vfs
+	G2CONF="${G2CONF}
+		--enable-shave
+		--disable-static
+		--disable-maintainer-mode
+		--disable-default-plugins
+		--disable-builtin-plugins
+		--disable-collab-backend-telepathy
+		--enable-clipart
+		--enable-statusbar
+		--enable-templates
+		--with-gio
+		--without-gnomevfs
+		$(use_with gnome goffice)
+		$(use_enable cups print)
+		$(use_enable collab collab-backend-xmpp)
+		$(use_enable collab collab-backend-tcp)
+		$(use_enable collab collab-backend-service)
+		$(use_enable spell)"
+}
+
+src_configure() {
+	local plugins=""
+
+	if use plugins; then
+		# Plugins depending on libgsf
+		plugins="t602 docbook clarisworks wml kword hancom openwriter pdf
+			loadbindings mswrite garble pdb applix opendocument sdw xslfo"
+
+		# Plugins not depending on anything
+		plugins="${plugins} gimp bmp freetranslation iscii s5 babelfish opml eml
+			wikipedia gdict passepartout google presentation urldict hrtext mif"
+
+		# inter7eps: eps.h
+		# libtidy: gsf + tidy.h
+		# paint: windows only ?
+		use collab && plugins="${plugins} collab"
+		use gnome && plugins="${plugins} goffice"
+		use latex && plugins="${plugins} latex"
+		use libgda && plugins="${plugins} gda"
+		use math && plugins="${plugins} mathview"
+		use openxml && plugins="${plugins} openxml"
+		use ots && plugins="${plugins} ots"
+		# psion: >=psiconv-0.9.4
+		use readline && plugins="${plugins} command"
+		# plugin doesn't build
+		#use svg && plugins="${plugins} rsvg"
+		use thesaurus && plugins="${plugins} aiksaurus"
+		use wmf && plugins="${plugins} wmf"
+		# wordperfect: >=wpd-0.8 >=wps-0.1
+		use wordperfect && plugins="${plugins} wpg"
+	fi
+
+	gnome2_src_configure --enable-plugins="$(echo ${plugins})"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# install icon to pixmaps (bug #220097)
+	sed 's:icondir= $(datadir)/icons:icondir = $(datadir)/pixmaps:' \
+		-i Makefile.am Makefile.in || die "sed 1 failed"
+	# readme.txt will be installed using dodoc
+	sed '/readme\.txt\|abw/d' \
+		-i user/wp/Makefile.am user/wp/Makefile.in || die "sed 2 failed"
+}
+
+src_install() {
+	gnome2_src_install
+
+	sed "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" \
+		-i "${D}"/usr/share/applications/abiword.desktop || die "sed 3 failed"
+
+	mv "${D}/usr/bin/abiword" "${D}/usr/bin/AbiWord-${MY_MAJORV}"
+	dosym AbiWord-${MY_MAJORV} /usr/bin/abiword-${MY_MAJORV}
+
+	dodoc AUTHORS user/wp/readme.txt || die "dodoc failed"
+
+	# Not needed
+	find "${D}" -name "*.la" -delete || die "failed *.la removal"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	alternatives_auto_makesym "/usr/bin/abiword" "/usr/bin/abiword-[0-9].[0-9]"
+}
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index 669f23da60ac..bec3486e00e2 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -2,4 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome-office</herd>
+<use>
+  <flag name='collab'>Enable collaborative editing plugin</flag>
+  <flag name='grammar'>Enable grammar checking via
+    <pkg>dev-libs/link-grammar</pkg></flag>
+  <flag name='math'>Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
+  <flag name='openxml'>Enable OpenXML support</flag>
+  <flag name='ots'>Enable Text Summarizer plugin</flag>
+  <flag name='plugins'>Enable plugins build</flag>
+  <flag name='thesaurus'>Enable thesaurus support</flag>
+  <flag name='wordperfect'>Enable wordperfect file support via
+    <pkg>app-text/libwpd</pkg></flag>
+</use>
 </pkgmetadata>