Bump to 2.6.6. Bug fixes.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 122 insertions, 7 deletions

diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index bfaaf0b8a976..21d1731845df 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -6,17 +6,20 @@ AUX poppler_abi_change.patch 766 RMD160 982e40c24d73111356501ec8687011f4f489c2c7
 DIST abiword-2.4.6.tar.bz2 24994889 RMD160 ca56800d811b3aca0af6b2fb6cd70cbea29ab792 SHA1 3011d221d09336f09f4bb0732add3405961a8623 SHA256 1ca509814d1ce939c98f2776f95351a2a6ea216d12c20be30d40eefd13f43020
 DIST abiword-2.6.4.tar.gz 9277200 RMD160 d6949e6ee0e55f1ecfd0512252bcf5f46fbef02d SHA1 2629ad6cd98fd6a263d41dfe4f9bcf80d95c3873 SHA256 4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
 DIST abiword-2.6.5.tar.gz 9514729 RMD160 406c1dd6a84bfcf8111d39b23e0a4d3361eda87e SHA1 f848e82bcda6b0ece5ce206b516a475af9aa5fa7 SHA256 70efe1a30675eecddf04be21e812c6fabf8a9dcead8667684ecfe26a8048d75a
+DIST abiword-2.6.6.tar.gz 9534259 RMD160 18a74d66381cd3fab216d3f3969b612519654825 SHA1 9751b7f01beee9f048ab20e52a600a757085363b SHA256 fd95a7154fc95ab0ffe6eb611fa973bcef2ca8d70a334ea27d5ba0c60735f1b1
 DIST abiword-plugins-2.6.4.tar.gz 1777721 RMD160 f7a15493b642c6c6727f8c71761f5a3ee9d39d57 SHA1 b372cf53cd67c9be801ce04d8889e7a02ceef69a SHA256 ec561e865387fa0a108ac135fc39ef0aa18e0dddd99f1f92749f67b029ba30eb
 DIST abiword-plugins-2.6.5.tar.gz 1930003 RMD160 c8b7e2325c27b0eabc1f0ed8b9a63f36840ec2fb SHA1 2572bdfe0d19390ff839310102cef75802ba7fa8 SHA256 5e3013ed14eac12efcd81ce4180ef81f85413e4f98f86866e7c9b6d06d006cba
+DIST abiword-plugins-2.6.6.tar.gz 1970233 RMD160 18150b40186263f62a98b47486161730ff04d7f0 SHA1 e7282802f5d3fcb804542e7092bad6576943a623 SHA256 282b9641fd934a0b77310d594ef8606e9d4f3e52837e14164a8d64348a2c1d17
 EBUILD abiword-plugins-2.4.6.ebuild 2376 RMD160 8174c009a8446eb5e0d5e600590399ef45fadb59 SHA1 607a64c5faffde4dfdebafd07133020bb82418d5 SHA256 2f64f5e424fefc83edc3f18ef3e7cff32a7906e2653acb4fb9f0844074b2dc93
 EBUILD abiword-plugins-2.6.4.ebuild 2806 RMD160 0d2bc2699ba836be9e4fb0f0c992fb49f6f26c4c SHA1 44414a613b0fc27ca3c0e977872ccfa7568d2510 SHA256 ffbbe102d2dfe92a0c6c4f03dd58a9916990ff06d342236c4e7267be9031d257
 EBUILD abiword-plugins-2.6.5.ebuild 2788 RMD160 5df00abd188abc3e96c6028ba1876f84b20a2e25 SHA1 5938f338e888c6126f758202dc79f48e0d3a44ca SHA256 fa8134a397544d45ed5152c24827f275fde0155149717a2329b9c5c798ad212e
-MISC ChangeLog 9295 RMD160 e31a19e249bd077f2242fbf6547c4e20684d0a7b SHA1 8ae503c856b688bfdfa4b76f89d6c8cfb11f0437 SHA256 834c687a1185b55fbcb7383bb8f1a374c5639b0d205ae8a74a09b6942fb463e3
+EBUILD abiword-plugins-2.6.6.ebuild 2788 RMD160 43b0f7942a691b84c19f363b6c6bcd735356525a SHA1 d607a127db337e52147c516f33d649d12fa25f03 SHA256 6063e3da4b74db16c5187c021d205e0a9cc389c3f7b5d0f8f97cd75c3eb052bd
+MISC ChangeLog 9458 RMD160 9734a6d4980643564ffdc33188d59d615a034836 SHA1 9e5546e52530bc993afd7fba4b1e64a0758b5ab3 SHA256 9ca27ddd3fe828a0e8cbe8d828cfc140facad354e80599bdb635269199150980
 MISC metadata.xml 667 RMD160 5ddb96b51ca4f4490c86f6377ffd1bae83c796e7 SHA1 14e83da66c08985504d15e55fa6fccfa98955825 SHA256 42ae42a31fd0e94c3e46f42d75f9fce15d30f0a5f1e426de393d0194ff3d4b03
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklhPlgACgkQOeoy/oIi7uyfBgCeIdb79fqVS0rLYMHRA8hFEyir
-d5YAn1jruanCwMq0Ph2mnQTTZ742CxbS
-=fh7n
+iEYEARECAAYFAkmd904ACgkQ1fmVwcYIWAZ+WACgr0mWOiUS24eTvEGWn0g2WFwh
+d18An1utEDlAxi/uMajAalKKJrTu1IDx
+=dM0v
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 120f16c8e38d..5c499b6eac5b 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.207 2009/01/04 22:51:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.208 2009/02/20 00:16:07 eva Exp $
+
+*abiword-2.6.6 (20 Feb 2009)
+
+  20 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org> +abiword-2.6.6.ebuild:
+  Bump to 2.6.6. Bug fixes.
 
   04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> abiword-2.4.6.ebuild,
   abiword-2.6.4.ebuild, abiword-2.6.5.ebuild:
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 7b823618fb5e..2453e3d3ce5b 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,10 +1,22 @@
+-----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.4.tar.gz 9277200 RMD160 d6949e6ee0e55f1ecfd0512252bcf5f46fbef02d SHA1 2629ad6cd98fd6a263d41dfe4f9bcf80d95c3873 SHA256 4d2d7a6b69b00ffe603a136a9df7ecda9f43448c7bc723503e76eaec9ab8e9fe
 DIST abiword-2.6.5.tar.gz 9514729 RMD160 406c1dd6a84bfcf8111d39b23e0a4d3361eda87e SHA1 f848e82bcda6b0ece5ce206b516a475af9aa5fa7 SHA256 70efe1a30675eecddf04be21e812c6fabf8a9dcead8667684ecfe26a8048d75a
+DIST abiword-2.6.6.tar.gz 9534259 RMD160 18a74d66381cd3fab216d3f3969b612519654825 SHA1 9751b7f01beee9f048ab20e52a600a757085363b SHA256 fd95a7154fc95ab0ffe6eb611fa973bcef2ca8d70a334ea27d5ba0c60735f1b1
 EBUILD abiword-2.4.6.ebuild 2382 RMD160 4cb2bc0901592c1671c5f08cae44ab9ddcfcbba4 SHA1 c7749937e9f438ff953189a1608f20a332378a97 SHA256 bb0d3318554fa4719d1f83caa07888f7d5bbddb4ed36e430060af57eda868aaa
 EBUILD abiword-2.6.4.ebuild 2624 RMD160 c4c3ce568ee9ac9c3a2782fd3b1b3c893285effe SHA1 3668300a2ebcd040429b5a889701eabfda97fdb9 SHA256 d540ae07688676616a887fce4fd9e6b08c5804c88d71b7be029f4004edf87688
 EBUILD abiword-2.6.5.ebuild 2641 RMD160 5887f5d9c12eb270909d7c747ec2f3b46f98d529 SHA1 b902447a4fe31cabb1d8e76eea7543d1bf0c6d2d SHA256 04a2fd1c9d7e687a524b3b7533ae8fb190840c302e26f2df45b1f1ef40ea2465
-MISC ChangeLog 27622 RMD160 dbd5982e51234705cc2d02cab1a8e190b138d941 SHA1 3722458ae30c340a77ce0beaef7a1cb05e8b113c SHA256 fd2901731e568d370ff85f5c44dcf234e8e89e8cadb83a370941c91dcd2a542a
+EBUILD abiword-2.6.6.ebuild 2641 RMD160 9ae0e47290e70c4e7c93810c02eac970db92c4f8 SHA1 2f91ab038446b4ff343d0850abb6791329f575fc SHA256 e97394eda573079c71bafcf8859052c04e9df0785677c817cf9378ac9698de23
+MISC ChangeLog 27758 RMD160 bf3c03a48706abe55d88be122eb5407ce167d4a1 SHA1 7a0aa33fa6290765a6c99e2b9f006630232cf253 SHA256 a0e1b364a0218b6c9626e04c38da29110dcf297166bf261e4733e8f407512d21
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmd9k4ACgkQ1fmVwcYIWAZTiACfRbRiJ4iuTgInj17T9Pp1fjVn
+QIYAn3eda1erC8jJqsuYL28didG9U0Ul
+=7KzB
+-----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.6.6.ebuild b/app-office/abiword/abiword-2.6.6.ebuild
new file mode 100644
index 000000000000..ef1e3c062e4d
--- /dev/null
+++ b/app-office/abiword/abiword-2.6.6.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.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"
+}