New revision; added some USE flags and cleaned the ebuild.

(Portage version: 2.0.53_rc7)

4 files changed, 80 insertions, 53 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index acda9ff05be2..3cef11c2272d 100644
--- a/app-office/abiword-plugins/ChangeLog
+++ b/app-office/abiword-plugins/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/abiword-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.5 2005/10/31 19:54:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.6 2005/10/31 21:41:07 leonardop Exp $
+
+*abiword-plugins-2.4.1-r2 (31 Oct 2005)
+
+  31 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +abiword-plugins-2.4.1-r2.ebuild:
+  Added 'bzip2', 'debug', 'pdf', 'readline' and 'wmf' USE flags. Added
+  libgsf dependency to enable some document filters by default. Removed
+  duplicated aiksaurus dependency. Added fribidi dependency. Fixed libgda
+  dependencies. Updated other dependencies version numbers. Don't install
+  COPYING. Misc.  clean-ups.
 
   31 Oct 2005; Brent Baude <ranger@gentoo.org>
   abiword-plugins-2.4.1-r1.ebuild:
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..f90c14f16b5c
--- /dev/null
+++ b/app-office/abiword-plugins/abiword-plugins-2.4.1-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 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.1-r2.ebuild,v 1.1 2005/10/31 21:41:07 leonardop Exp $
+
+DESCRIPTION="Set of plugins for abiword"
+HOMEPAGE="http://www.abisource.com/"
+SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
+IUSE="bzip2 debug gnome grammar jpeg libgda math pdf readline svg thesaurus wmf wordperfect"
+S=${WORKDIR}/abiword-${PV}/${PN}
+
+# libgsf dependency used by some document format importers
+RDEPEND="=app-office/abiword-${PV}
+	virtual/xft
+	>=media-libs/fontconfig-1
+	>=dev-libs/fribidi-0.10.4
+	>=dev-libs/glib-2
+	>=x11-libs/gtk+-2
+	>=gnome-base/libglade-2
+	>=gnome-extra/libgsf-1.12.1
+	bzip2? ( app-arch/bzip2 )
+	gnome? ( >=x11-libs/goffice-0.0.4 )
+	grammar? ( >=dev-libs/link-grammar-4.1.1 )
+	jpeg?  ( >=media-libs/jpeg-6b-r2 )
+	libgda? (
+		>=gnome-extra/libgda-1.2
+		>=gnome-extra/libgnomedb-1.2 )
+	math? ( >=x11-libs/gtkmathview-0.7.5 )
+	pdf? ( >=app-text/poppler-0.1.2 )
+	readline? ( sys-libs/readline )
+	thesaurus? ( >=app-text/aiksaurus-1.2 )
+	wordperfect? ( >=app-text/libwpd-0.8 )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	svg? ( >=gnome-base/librsvg-2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9"
+
+
+src_compile() {
+	local myconf="--enable-all \
+		--with-abiword=${WORKDIR}/abiword-${PV}/abi \
+		$(use_enable debug) \
+		$(use_with bzip2 bz2abw) \
+		$(use_with gnome abigochart) \
+		$(use_with grammar abigrammar) \
+		$(use_with jpeg) \
+		$(use_with libgda gda) \
+		$(use_with math abimathview) \
+		$(use_with pdf) \
+		$(use_with readline abicommand)
+		$(use_with svg librsvg) \
+		$(use_with thesaurus aiksaurus) \
+		$(use_with wmf) \
+		$(use_with wordperfect) \
+		--without-psion"
+
+	econf $myconf || die "./configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/app-office/abiword-plugins/abiword-plugins-2.4.1.ebuild b/app-office/abiword-plugins/abiword-plugins-2.4.1.ebuild
deleted file mode 100644
index 1345d969691b..000000000000
--- a/app-office/abiword-plugins/abiword-plugins-2.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 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.1.ebuild,v 1.2 2005/10/30 14:57:05 lu_zero Exp $
-
-DESCRIPTION="Set of plugins for abiword"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/abiword-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="gnome grammar jpeg math svg libgda"
-S=${WORKDIR}/abiword-${PV}/${PN}
-
-RDEPEND="=app-office/abiword-${PV}
-		>=app-text/aiksaurus-1.2
-		virtual/xft
-		>=media-libs/fontconfig-2.1
-		>=dev-libs/glib-2
-		>=x11-libs/gtk+-2
-		>=gnome-base/libglade-2
-		grammar? ( >=dev-libs/link-grammar-4.1.3 )
-		math? ( >=x11-libs/gtkmathview-0.7.5 )
-		gnome? ( >=x11-libs/goffice-0.1.0 )
-		libgda? ( >=gnome-extra/libgda-1.2 )
-		jpeg?  ( >=media-libs/jpeg-6b-r2 )
-		svg? ( >=gnome-base/librsvg-2.9.5 )
-		!<app-office/abiword-2.4"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_compile() {
-
-	econf \
-		--enable-all \
-		--with-abiword=${WORKDIR}/abiword-${PV}/abi \
-		`use_with grammar abigrammar` \
-		`use_with math abimathview` \
-		`use_with gnome abigochart` \
-		`use_with svg librsvg` \
-		`use_with jpeg` \
-		`use_with libgda gda` \
-		--without-ImageMagick || die "configure failed"
-
-		emake || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README
-}
diff --git a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.1 b/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.1-r2
index 5a69f901f132..5a69f901f132 100644
--- a/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.1
+++ b/app-office/abiword-plugins/files/digest-abiword-plugins-2.4.1-r2