diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2008-04-05 17:08:11 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2008-04-05 17:08:11 +0000 |
| commit | 7ec7f752cdbbc53c212871d841ad0d787c41aa5b (patch) | |
| tree | 960f818123d1de6b21af1e38b3a0ec7d8075ac58 /app-office/abiword-plugins | |
| parent | Avoid parallel make as per bug #216101 in alpha4, and add a live SVN ebuild a... (diff) | |
| download | gentoo-2-7ec7f752cdbbc53c212871d841ad0d787c41aa5b.tar.gz gentoo-2-7ec7f752cdbbc53c212871d841ad0d787c41aa5b.tar.bz2 gentoo-2-7ec7f752cdbbc53c212871d841ad0d787c41aa5b.zip | |
Use slotted goffice, bug #216329. Fix openxml plugin build issues, bug #216245. Fix ots dep for 2.4.6, bug #210253.
(Portage version: 2.1.5_rc1)
Diffstat (limited to 'app-office/abiword-plugins')
| -rw-r--r-- | app-office/abiword-plugins/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild | 4 | ||||
| -rw-r--r-- | app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild | 15 |
3 files changed, 18 insertions, 8 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/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" |