bump to 2.6.0

Package-Manager: portage-2.1.4.4

3 files changed, 108 insertions, 3 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index bc48690517a5..d11cf565d28b 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.186 2007/09/08 11:30:22 eva Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.187 2008/04/03 21:20:38 eva Exp $
+
+*abiword-2.6.0 (03 Apr 2008)
+
+  03 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org> +abiword-2.6.0.ebuild:
+  bump to 2.6.0
 
   08 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
   -files/16_fcfini_crash.dpatch, -abiword-2.4.5.ebuild,
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index dbd592013166..3ac9968f2e0a 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,6 +1,18 @@
+-----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
 EBUILD abiword-2.4.6.ebuild 2380 RMD160 feaf7f308bb827b064b1f52b80b1fd5b922e792a SHA1 bea9b315d196e5466148a7aa602f1ab60c26de13 SHA256 6cb9d682c824aa3db81e55c26d7fb012f79105afd0f706168e4681a4acc7eb05
-MISC ChangeLog 24929 RMD160 36046e33e5f34e5320409175ee37019cdc7623f4 SHA1 3aba44cb1ae0f744eb8917f81f22898b9ca185fc SHA256 c8b63ccfe7ea186d3cc1ae788d9727a91283941cfdd948b7ea4bd40a312355b4
+EBUILD abiword-2.6.0.ebuild 2382 RMD160 6be5d56c909a93d370b512dfe3501e7e16a86fa7 SHA1 f51384957b8301da69a199d6ca73b9ebf676eb85 SHA256 84efafe81704da0f4764582c022a83fa74866ac87d820d1965b4ab7a98f27fc0
+MISC ChangeLog 25053 RMD160 524eac82c8682e3c2c1b282d6ca82c598e14ea6a SHA1 aff34855aec5360e5b802b6ee2d5b388b95df2a3 SHA256 9b05b262500f4c6041575837230d9ea286a03c2ce7d8dc699dfda27f3b57bd21
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf1SjQACgkQ1fmVwcYIWAZqFACgpaV1DTKcljiXajuP34DF1x2W
+2EMAoOxrbbNZLiQIXk/unnFxbqRwz0St
+=+H2d
+-----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.6.0.ebuild b/app-office/abiword/abiword-2.6.0.ebuild
new file mode 100644
index 000000000000..cc1743ab1f7c
--- /dev/null
+++ b/app-office/abiword/abiword-2.6.0.ebuild
@@ -0,0 +1,88 @@
+# 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.1 2008/04/03 21:20:38 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
+	>=x11-libs/libXft-2.0
+	>=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"
+}