Use slotted goffice, bug #216329. Fix openxml plugin build issues, bug #216245. Fix ots dep for 2.4.6, bug #210253.

Package-Manager: portage-2.1.5_rc1

4 files changed, 24 insertions, 14 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index b9f61e469422..22ba149527e6 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.40 2008/04/03 22:49:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.41 2008/04/05 17:08:11 eva Exp $
+
+  05 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  abiword-plugins-2.4.6.ebuild, abiword-plugins-2.6.0.ebuild:
+  use slotted goffice, bug #216329. Fix openxml plugin build issues,
+  bug #216245. Fix ots dep for 2.4.6, bug #210253.
 
   03 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
   abiword-plugins-2.6.0.ebuild:
diff --git a/app-office/abiword-plugins/Manifest b/app-office/abiword-plugins/Manifest
index 2a2e29bf7108..d7f5be4e05e0 100644
--- a/app-office/abiword-plugins/Manifest
+++ b/app-office/abiword-plugins/Manifest
@@ -6,14 +6,14 @@ 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.0.tar.gz 9210157 RMD160 f5edb58c381aa8edbda6bcf3467a4e11adf0a5a2 SHA1 30544c84227332c02e8641d85ae47a47b14442b8 SHA256 35b1ced07bed8706a81c2c26c42bf95bdf7a4a9c1fba98935cc5ecb5c674f0bb
 DIST abiword-plugins-2.6.0.tar.gz 1758231 RMD160 794d114948392bcb09c64676851836617f7017ea SHA1 f2c8525d7c52d9e0f74b5f01fc92e8eb2af902c4 SHA256 329521398105348ff466b90e1a7567574bd690639b048b6356ddc353d864b785
-EBUILD abiword-plugins-2.4.6.ebuild 2377 RMD160 fe7cf2431b7305921802610c5c92ef541ad5bb71 SHA1 0537c2ff9bcb5787198478066f81c09a2d920fc3 SHA256 61f212a13d5bda8022379241e71213d1366adb488b2a39bb396ebcae818ca4e0
-EBUILD abiword-plugins-2.6.0.ebuild 2593 RMD160 c1f8164dbe32cfe7929baea2098b44ef6991d756 SHA1 188f54fa6f99a455a15bdd4958fbc77fa2406a00 SHA256 6b47c10bb93287bef34cda44dadb4669e2364d5e959a51af10a9e8c7268924cd
-MISC ChangeLog 6435 RMD160 42e9a453cc97e1e4390b4a76549f54694072468c SHA1 226f8709ae9204bb412bdbc481afd17df92ec2ff SHA256 daa84f4f726127e356da6a0b7b93d48442fecfc1d81ee791dbc165315b2d78a8
+EBUILD abiword-plugins-2.4.6.ebuild 2372 RMD160 880170fc4538396c3f58f866718015057fea013d SHA1 435245728044f97312df220666b1d31e230e8f4f SHA256 3ee3c58a7465e9e2a73e183763036b87ff73ee3536fadcc1c8587d2c88ebc201
+EBUILD abiword-plugins-2.6.0.ebuild 2701 RMD160 ef4481a173492615b76036852f3fd329addcaf38 SHA1 568625b2b549d215c30152a6d943d9d23aeae239 SHA256 b3e4c160f0893628fd3e677fb4ab3db336e4b2a152993dac941def1cb46d2b20
+MISC ChangeLog 6672 RMD160 836b1a82a625db07c354f3052494922bb196be7c SHA1 034584c9338d06899534f938bbe97b35da0aadef SHA256 b6816e280a711e48fe75ad3bcc77b9c45dc9e1c90a6521ecdc12faf47a9ebc66
 MISC metadata.xml 265 RMD160 25b43a07bfbd36b5b76e0b4314f5354e9080477c SHA1 2720979184f2982bd2101fc139017b65e8459e07 SHA256 b4102696ac42fe77dffe48904ec44b4bf382cec64e6ac5aa801ca5123500a634
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf1XxsACgkQ1fmVwcYIWAbITwCffWLJdZApiXB7MG7SkMk1atYO
-3IAAoMPAKYecoaOS8s2KQ3SAh6dfO9lG
-=yiad
+iEYEARECAAYFAkf3sgoACgkQ1fmVwcYIWAae2gCfYNszf3/Gb4qWJLOGRdWuXIh2
+ilUAnRZubcKsIguX7Yuo1BCGhENjq+/n
+=VSXI
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
index 9fb8e283dc48..47596047dbcf 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.13 2007/10/19 14:46:52 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.14 2008/04/05 17:08:11 eva Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ RDEPEND="=app-office/abiword-${PV}*
 		=gnome-extra/libgda-1*
 		=gnome-extra/libgnomedb-1* )
 	math? ( >=x11-libs/gtkmathview-0.7.5 )
-	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.4.1 ) ) ) )
+	!ia64? ( !ppc64? ( !sparc? ( ots? ( =app-text/ots-0.4* ) ) ) )
 	pdf? ( >=app-text/poppler-0.5.0-r1 )
 	readline? ( sys-libs/readline )
 	thesaurus? ( >=app-text/aiksaurus-1.2 )
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild
index dc209457d70d..e0899d751025 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.0.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-plugins/abiword-plugins-2.6.0.ebuild,v 1.2 2008/04/03 22:49:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild,v 1.3 2008/04/05 17:08:11 eva Exp $
+
+EAPI="1"
 
 inherit eutils
 
@@ -15,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bzip2 cxx debug gnome grammar jabber jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect"
 
 # FIXME: add asio support
+# add abiscan when we get gnome-scan
 
 RDEPEND="=app-office/abiword-${PV}*
 	virtual/xft
@@ -23,10 +26,10 @@ RDEPEND="=app-office/abiword-${PV}*
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
 	>=gnome-base/libglade-2
-	>=gnome-extra/libgsf-1.12.1
+	>=gnome-extra/libgsf-1.14.4
 	bzip2? ( app-arch/bzip2 )
 	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4 )
+	gnome? ( >=x11-libs/goffice-0.4:0.4 )
 	grammar? ( >=dev-libs/link-grammar-4.2.2 )
 	!alpha? ( !ia64? ( jabber? (
 		>=dev-libs/libxml2-2.4
@@ -58,9 +61,10 @@ pkg_setup() {
 src_compile() {
 	local myconf="--enable-all \
 		--with-abiword="${WORKDIR}/abiword-${PV}" \
+		$(use_with bzip2 bz2abw) \
 		$(use_with cxx boost) \
+		$(use_with cxx OpenXML) \
 		$(use_enable debug) \
-		$(use_with bzip2 bz2abw) \
 		$(use_with gnome abigoffice) \
 		$(use_with grammar abigrammar) \
 		$(use_with jabber abicollab) \
@@ -73,7 +77,8 @@ src_compile() {
 		$(use_with svg librsvg) \
 		$(use_with thesaurus aiksaurus) \
 		$(use_with wmf) \
-		$(use_with wordperfect) \
+		$(use_with wordperfect libwpg) \
+		--disable-abiscan \
 		--without-psion"
 
 	econf $myconf || die "./configure failed"