From 87b8f4171caf5881a1611d9022e91fcc09997630 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 10 Feb 2007 20:52:11 +0000 Subject: [PATCH] minor stylistic changes, quoting, and fix dependencies (bug #140036) Package-Manager: portage-2.1.2-r9 --- app-office/abiword-plugins/ChangeLog | 6 +++++- .../abiword-plugins/abiword-plugins-2.4.5.ebuild | 11 +++++++---- .../abiword-plugins/abiword-plugins-2.4.6.ebuild | 9 ++++++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog index 0da04157c980..ee6e477025e1 100644 --- a/app-office/abiword-plugins/ChangeLog +++ b/app-office/abiword-plugins/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/abiword-plugins # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.25 2007/02/02 22:11:37 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.26 2007/02/10 20:52:11 compnerd Exp $ + + 10 Feb 2007; Saleem Abdulrasool + abiword-plugins-2.4.5.ebuild, abiword-plugins-2.4.6.ebuild: + Minor stylistic changes, quoting, and fix the depends for ots (bug #140036) 02 Feb 2007; Saleem Abdulrasool -files/abiword-plugins-2.4.1-goffice.patch, diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild index dbe258f067b2..c157b6bbc7b2 100644 --- a/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild +++ b/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.5.ebuild,v 1.8 2006/10/15 01:55:49 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.5.ebuild,v 1.9 2007/02/10 20:52:11 compnerd Exp $ inherit eutils @@ -11,8 +11,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" -IUSE="bzip2 debug gnome grammar jpeg libgda math pdf readline svg thesaurus wmf wordperfect" -S=${WORKDIR}/abiword-${PV}/${PN} +IUSE="bzip2 debug gnome grammar jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect" # libgsf dependency used by some document format importers RDEPEND="=app-office/abiword-${PV}* @@ -31,6 +30,7 @@ RDEPEND="=app-office/abiword-${PV}* >=gnome-extra/libgda-1.2 >=gnome-extra/libgnomedb-1.2 ) math? ( >=x11-libs/gtkmathview-0.7.5 ) + !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.4.1 ) ) ) ) pdf? ( >=app-text/poppler-0.5.0-r1 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2 ) @@ -41,6 +41,8 @@ RDEPEND="=app-office/abiword-${PV}* DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9" +S="${WORKDIR}/abiword-${PV}/${PN}" + src_unpack() { unpack ${A} cd ${S} @@ -57,6 +59,7 @@ src_compile() { $(use_with jpeg) \ $(use_with libgda gda) \ $(use_with math abimathview) \ + $(use_with ots) \ $(use_with pdf) \ $(use_with readline abicommand) $(use_with svg librsvg) \ 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 6ff4cff44b38..5c4e5e253872 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.1 2007/01/15 02:17:17 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.4.6.ebuild,v 1.2 2007/02/10 20:52:11 compnerd Exp $ inherit eutils @@ -11,8 +11,7 @@ SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="bzip2 debug gnome grammar jpeg libgda math pdf readline svg thesaurus wmf wordperfect" -S=${WORKDIR}/abiword-${PV}/${PN} +IUSE="bzip2 debug gnome grammar jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect" # libgsf dependency used by some document format importers RDEPEND="=app-office/abiword-${PV}* @@ -31,6 +30,7 @@ RDEPEND="=app-office/abiword-${PV}* >=gnome-extra/libgda-1.2 >=gnome-extra/libgnomedb-1.2 ) math? ( >=x11-libs/gtkmathview-0.7.5 ) + !ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.4.1 ) ) ) ) pdf? ( >=app-text/poppler-0.5.0-r1 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2 ) @@ -41,6 +41,8 @@ RDEPEND="=app-office/abiword-${PV}* DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.9" +S="${WORKDIR}/abiword-${PV}/${PN}" + src_unpack() { unpack ${A} cd ${S} @@ -57,6 +59,7 @@ src_compile() { $(use_with jpeg) \ $(use_with libgda gda) \ $(use_with math abimathview) \ + $(use_with ots) \ $(use_with pdf) \ $(use_with readline abicommand) $(use_with svg librsvg) \ -- 2.26.2