Bump to 2.6.5.

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

3 files changed, 108 insertions, 5 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 540fc2e704ea..f8d895aa5251 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.205 2008/09/20 20:20:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.206 2008/12/14 18:42:30 eva Exp $
+
+*abiword-2.6.5 (14 Dec 2008)
+
+  14 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org> +abiword-2.6.5.ebuild:
+  Bump to 2.6.5.
 
   20 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> -abiword-2.6.3.ebuild:
   remove old revision.
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 9048e10f5fff..de5b10e68299 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -5,14 +5,16 @@ AUX 11_history_fullpath.dpatch 1905 RMD160 17c9ceecbe54c9e83605fe74d1b52ee42b5bb
 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
 EBUILD abiword-2.4.6.ebuild 2380 RMD160 feaf7f308bb827b064b1f52b80b1fd5b922e792a SHA1 bea9b315d196e5466148a7aa602f1ab60c26de13 SHA256 6cb9d682c824aa3db81e55c26d7fb012f79105afd0f706168e4681a4acc7eb05
 EBUILD abiword-2.6.4.ebuild 2644 RMD160 a37f85ad6efdb24f4ecf98d715400b24b7080535 SHA1 158051d5f02f57eaffa530383a3cb6a3b70a508a SHA256 2a9e04d6602f0462e98736956cb44bd628d46b6d12323c702a0a9f1ffe4f1cb3
-MISC ChangeLog 27271 RMD160 7c113accc4fdc8e94cca83f892d530604610d432 SHA1 75b0dff1e2e3e97fe37b78e2dcfa562472ee4413 SHA256 4a4900f9cac2bfb3950c4ba7a2360bdc6f26717dfcf452f651945534f7d2a4d3
+EBUILD abiword-2.6.5.ebuild 2659 RMD160 36633937ed44a8a7de3ae676c511802a9a179eef SHA1 b5d01fd743a760356f2b33fe1af58151dcc83ed9 SHA256 719ebc5a3f600ef2c3db2d444990029f1350391e39d8744c603b4df42359f434
+MISC ChangeLog 27396 RMD160 8ea10444caa7462bf2055edaeba1a1463fde94d6 SHA1 fb99f3ea529a8cb707ebc16294889a938956a56b SHA256 1f9fbd0a11397147645e629681a809b7177d7dd4ae7ec0e769af1f84e5d6ee8b
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjVWywACgkQ1fmVwcYIWAZexACeIiKreVbpyBd+cQrSC5EIQLPe
-LpEAoJDi0hcBeNTOd5fJazj7ZKJpKt3l
-=QUfX
+iEYEARECAAYFAklFU5wACgkQ1fmVwcYIWAa1LACfcajnbBIvBRFplOV2lrSmQTuZ
+nZ8AoO9pWVXxdfcz/BNmrzZ854e9cBwl
+=U9r3
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/abiword-2.6.5.ebuild b/app-office/abiword/abiword-2.6.5.ebuild
new file mode 100644
index 000000000000..eadea031a98e
--- /dev/null
+++ b/app-office/abiword/abiword-2.6.5.ebuild
@@ -0,0 +1,96 @@
+# 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.5.ebuild,v 1.1 2008/12/14 18:42:30 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() {
+	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"
+}