bump to 2.6.4. Cleanup old revisions and fix bug #228019.

(Portage version: 2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 25 insertions, 91 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index ee9146cbe4b7..8179e3507a39 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.195 2008/06/17 01:32:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.196 2008/07/30 21:36:45 eva Exp $
+
+*abiword-2.6.4 (30 Jul 2008)
+
+  30 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> -abiword-2.6.0.ebuild,
+  -abiword-2.6.2.ebuild, abiword-2.6.3.ebuild, +abiword-2.6.4.ebuild:
+  bump to 2.6.4. Cleanup old revisions and fix bug #228019.
 
   17 Jun 2008; Jeroen Roovers <jer@gentoo.org> abiword-2.6.3.ebuild:
   Stable for HPPA (bug #225395).
diff --git a/app-office/abiword/abiword-2.6.0.ebuild b/app-office/abiword/abiword-2.6.0.ebuild
deleted file mode 100644
index 9222b4fe1364..000000000000
--- a/app-office/abiword/abiword-2.6.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.0.ebuild,v 1.3 2008/04/04 23:55:19 eva Exp $
-
-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 we conditional
-
-RDEPEND="virtual/xft
-	dev-libs/popt
-	sys-libs/zlib
-	>=dev-libs/glib-2
-	>=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=x11-libs/goffice-0.4
-	>=media-libs/libpng-1.2
-	>=media-libs/fontconfig-2.1
-	>=media-libs/freetype-2.1
-	>=x11-libs/pango-1.2
-	>=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() {
-	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)
-		--disable-libabiword
-		--enable-printing
-		--enable-threads
-		--disable-scripting
-		--enable-symbols"
-}
-
-src_install() {
-	gnome2_src_install
-
-	sed -i "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" "${D}"/usr/share/applications/abiword.desktop
-
-	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.3.ebuild b/app-office/abiword/abiword-2.6.3.ebuild
index fea80abc46da..f242907ce3ef 100644
--- a/app-office/abiword/abiword-2.6.3.ebuild
+++ b/app-office/abiword/abiword-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.3.ebuild,v 1.6 2008/06/17 01:32:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.3.ebuild,v 1.7 2008/07/30 21:36:45 eva Exp $
 
 EAPI="1"
 
@@ -51,6 +51,11 @@ DEPEND="${RDEPEND}
 # 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)
diff --git a/app-office/abiword/abiword-2.6.2.ebuild b/app-office/abiword/abiword-2.6.4.ebuild
index e88f67bc53ca..333f65cabe1a 100644
--- a/app-office/abiword/abiword-2.6.2.ebuild
+++ b/app-office/abiword/abiword-2.6.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.2.ebuild,v 1.1 2008/04/10 23:17:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.4.ebuild,v 1.1 2008/07/30 21:36:45 eva Exp $
+
+EAPI="1"
 
 inherit alternatives eutils gnome2 versionator
 
@@ -26,7 +28,7 @@ RDEPEND="virtual/xft
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
-	>=x11-libs/goffice-0.4
+	>=x11-libs/goffice-0.4:0.4
 	>=media-libs/libpng-1.2
 	>=media-libs/fontconfig-2.1
 	>=media-libs/freetype-2.1
@@ -49,6 +51,11 @@ DEPEND="${RDEPEND}
 # 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)
@@ -65,6 +72,9 @@ pkg_setup() {
 }
 
 src_install() {
+	# Install icon to pixmaps, bug #220097
+	sed -i 's:icondir = $(datadir)/icons:icondir = $(datadir)/pixmaps:'	GNUmakefile
+
 	gnome2_src_install
 
 	sed -i "s:Exec=abiword:Exec=abiword-${MY_MAJORV}:" "${D}"/usr/share/applications/abiword.desktop