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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

5 files changed, 49 insertions, 97 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/Manifest b/app-office/abiword/Manifest
index 9ad93344c78c..a607e78bfd1a 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,12 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bbc4f SHA1 4eb037972e1115b01c04e2d4e6474973d787d8a7 SHA256 16b50d4aa4822aba7577f804bd98fc35c30561e5aa354f2c2ca9cd0c8819941f
 AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c39b6964ef1e24652c026c344513facd94c88226 SHA256 28db978a944016d43862a221af8ef9dbc69e239b3abde14ede33ca21485ed8c5
 DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
-DIST abiword-2.6.0.tar.gz 9210157 RMD160 f5edb58c381aa8edbda6bcf3467a4e11adf0a5a2 SHA1 30544c84227332c02e8641d85ae47a47b14442b8 SHA256 35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
-DIST abiword-2.6.2.tar.gz 9265719 RMD160 27b4a9e12e27046a0a48b2cd469f334247e0aae1 SHA1 b7179ac4c14b476a2abc407aaf534f7b4b7786d7 SHA256 10659aee656d25894f4721ef1b5a7e6dc0b892f17dc2c3c5a56b55e422075b2a
 DIST abiword-2.6.3.tar.gz 9265456 RMD160 5ce1983138d7373522a865e82d4e1e9001c65212 SHA1 91e6dd8e0cb9c82dec35d3d3d9089f22c9ab5bcc SHA256 e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
+DIST abiword-2.6.4.tar.gz 9277200 RMD160 d6949e6ee0e55f1ecfd0512252bcf5f46fbef02d SHA1 2629ad6cd98fd6a263d41dfe4f9bcf80d95c3873 SHA256 4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
 EBUILD abiword-2.4.6.ebuild 2380 RMD160 feaf7f308bb827b064b1f52b80b1fd5b922e792a SHA1 bea9b315d196e5466148a7aa602f1ab60c26de13 SHA256 6cb9d682c824aa3db81e55c26d7fb012f79105afd0f706168e4681a4acc7eb05
-EBUILD abiword-2.6.0.ebuild 2359 RMD160 3310ca5880d790ba7db949b5c3453560f517e68e SHA1 21718d685d9a6e65b663d2a9711f1af54ce6fcce SHA256 e5ef34ca1a8c9e793ad42e6f38787eb5732576e5dd4fefc661daf4227cea4641
-EBUILD abiword-2.6.2.ebuild 2340 RMD160 1bcfc3e7ed3d12be4d3eb39ead8f4eaa5bb13eb4 SHA1 c3d59f8e48ee225d5b0e6754e57b06fda3372647 SHA256 c8afd890fc106a8a791e47ded10e2f358190d2bd2756a68f9e6e366bd1ae8c19
-EBUILD abiword-2.6.3.ebuild 2468 RMD160 6aec3d7fe152ce4c536d6fcd2dfd66d2ab199545 SHA1 2c5fe75998a2a4bc564f153a0367860b16e96680 SHA256 344bbb7fb0a8e740b35e97ced6d7ebfd56c55e896cc4acb8795eac526ef7dbc2
-MISC ChangeLog 26010 RMD160 83d5a2b6e0af4ee2372f4a628652d4703ccc02c3 SHA1 e506b06e4952ed2fddacfa9c353875a93391a1ca SHA256 c6e208355ae6833c3943cfc72d96172ea4fad72d10a2499a23c6e00c51664a0c
+EBUILD abiword-2.6.3.ebuild 2641 RMD160 6e27ad1b7098e170cea438c26bb483bb93ad9d2c SHA1 d2c7eb6a861e7ad7744a2c2bab42c60f2f428f80 SHA256 85ef7a7e6d91732aae244fcc2d65e5614ae4bb8e840b806c3e5d0f1d9337249f
+EBUILD abiword-2.6.4.ebuild 2649 RMD160 a284d794888c0bd4ab79041731ec3d701ac6dc8a SHA1 ca31ff4b11b401f5002ca509299c989b56d48751 SHA256 06afbd610d2b6a2aec06c6e19851ce1e83a14e2d3ab25b406a45d0e865e50b88
+MISC ChangeLog 26248 RMD160 7df5886df7a88333618bdc05bd0887defa730eab SHA1 7d3bdd1732f5978ec2aa73c7ff970d3540989269 SHA256 75b4f13c33bd6e6196e07b4a5edb97064a10ca4f18a26da2b92265b8b9c8ccb8
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiQ3vsACgkQ1fmVwcYIWAY1RACfahHdW53lVfDJZEnQnjtLEyYi
+7b4An0K5RR8m8qsvBs4dAQ6hIXDstGCb
+=2q7x
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiQ3zcACgkQ1fmVwcYIWAbZ0wCgprr00LipNgBRBWWhPSYCFGpW
+1ZYAmgIAbPgjd2bUkD1ugmTWVSOuR11Q
+=g0v1
+-----END PGP SIGNATURE-----
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