bump to 2.6.3. Fix crashes. Fix bug #220097, bug #218272 and bug #220187.

Package-Manager: portage-2.1.5_rc6

3 files changed, 103 insertions, 5 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index f24f4c7527ad..44a6cddf7170 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # 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.189 2008/04/10 23:17:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.190 2008/05/04 19:19:13 eva Exp $
+
+*abiword-2.6.3 (04 May 2008)
+
+  04 May 2008; Gilles Dartiguelongue <eva@gentoo.org> +abiword-2.6.3.ebuild:
+  bump to 2.6.3. Fix crashes. Fix bug #220097, bug #218272 and bug #220187.
 
   10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
   bump to 2.6.2. Bug fixes.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index fbae9941230a..16ac17aec485 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -6,15 +6,17 @@ AUX freebsd_fix.patch 550 RMD160 aa37f1f1737c1723840b72a1e48724575dd196a6 SHA1 c
 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
 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
-MISC ChangeLog 25280 RMD160 52a4f8fe4187fc6ea875c46444bcc5c9df524b69 SHA1 073ebed7564caf374b0b4aebbc0fd4c025320208 SHA256 eb5854611ebcb09d34f99958bb907336527cad48a726543a5cf50d3ceebfc527
+EBUILD abiword-2.6.3.ebuild 2476 RMD160 a65fbc0db886d2f287764c16432def7942388cf5 SHA1 bf48abb85f2be875684c7917a0473603b7cf1ce3 SHA256 0533511d999e72ee0b26b549c2672d873f161bb666ca85c3cfeb4cbc2bbe62bd
+MISC ChangeLog 25464 RMD160 0e3ae3dd05cb339437fb72f8d455de3179940305 SHA1 37303e2bcaf9b39249969a3debc65cb9e590c539 SHA256 c916b83fcf6a65cfe5eb83b49aa8994bb2d1ac71c44a93ac6b480b05dfd643cb
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf+oAwACgkQ1fmVwcYIWAYgzwCgmsQwOAgxeP2w8caJ0LDv6HtM
-JpQAoKjEYdhy+WTGDNU+vkm71MV3RGjV
-=vilZ
+iEYEARECAAYFAkgeKF0ACgkQ1fmVwcYIWAZAggCg0pNj/JwzwApfLEgwCiNcpdT+
+J+8AnjnqRCEP5rZSepEIB1v2pzr3Hw3u
+=MIM7
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.6.3.ebuild b/app-office/abiword/abiword-2.6.3.ebuild
new file mode 100644
index 000000000000..d6b8c8f917ee
--- /dev/null
+++ b/app-office/abiword/abiword-2.6.3.ebuild
@@ -0,0 +1,91 @@
+# 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.1 2008/05/04 19:19:13 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="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: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"
+}
+
+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
+
+	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"
+}