move jabber use_enable back to general myconf, bug #221823.

(Portage version: 2.1.5)

4 files changed, 15 insertions, 100 deletions

diff --git a/app-office/abiword-plugins/ChangeLog b/app-office/abiword-plugins/ChangeLog
index 3f64fa99375a..89a47d676fcc 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.43 2008/05/04 19:21:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/ChangeLog,v 1.44 2008/05/18 14:02:34 eva Exp $
+
+  18 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -abiword-plugins-2.6.0.ebuild, abiword-plugins-2.6.2.ebuild,
+  abiword-plugins-2.6.3.ebuild:
+  move jabber use_enable back to general myconf, bug #221823.
 
 *abiword-plugins-2.6.3 (04 May 2008)
 
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild
deleted file mode 100644
index e0899d751025..000000000000
--- a/app-office/abiword-plugins/abiword-plugins-2.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.3 2008/04/05 17:08:11 eva Exp $
-
-EAPI="1"
-
-inherit eutils
-
-DESCRIPTION="Set of plugins for abiword"
-HOMEPAGE="http://www.abisource.com/"
-SRC_URI="http://www.abisource.com/downloads/abiword/${PV}/source/${P}.tar.gz
-	http://www.abisource.com/downloads/abiword/${PV}/source/${P//-plugins/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
-	>=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.14.4
-	bzip2? ( app-arch/bzip2 )
-	cxx? ( >=dev-libs/boost-1.33.1 )
-	gnome? ( >=x11-libs/goffice-0.4:0.4 )
-	grammar? ( >=dev-libs/link-grammar-4.2.2 )
-	!alpha? ( !ia64? ( jabber? (
-		>=dev-libs/libxml2-2.4
-		>=net-libs/loudmouth-1.0.1 ) ) )
-	jpeg?  ( >=media-libs/jpeg-6b-r2 )
-	libgda? (
-		=gnome-extra/libgda-1*
-		=gnome-extra/libgnomedb-1* )
-	math? ( >=x11-libs/gtkmathview-0.7.5 )
-	!ia64? ( !ppc64? ( !sparc? ( ots? ( >=app-text/ots-0.5 ) ) ) )
-	pdf? ( >=app-text/poppler-0.5.0-r1 )
-	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"
-
-pkg_setup() {
-	if use gnome && ! built_with_use x11-libs/goffice gnome; then
-		eerror "abiword-plugin requires x11-libs/goffice to be compiled"
-		eerror "with USE=\"gnome\""
-		die "gnome support missing in x11-libs/goffice"
-	fi
-}
-
-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 gnome abigoffice) \
-		$(use_with grammar abigrammar) \
-		$(use_with jabber abicollab) \
-		$(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) \
-		$(use_with thesaurus aiksaurus) \
-		$(use_with wmf) \
-		$(use_with wordperfect libwpg) \
-		--disable-abiscan \
-		--without-psion"
-
-	econf $myconf || die "./configure failed"
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.2.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.2.ebuild
index 3ab7a8459bce..9f55d9122e00 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.2.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2008/04/10 23:27:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.2.ebuild,v 1.2 2008/05/18 14:02:34 eva Exp $
 
 EAPI="1"
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cxx debug gnome grammar jabber jpeg libgda math ots pdf readline svg thesaurus wmf wordperfect"
 
-# FIXME: add asio support
+# FIXME: add asio support (better wait on boost 1.35)
 # add abiscan when we get gnome-scan
 
 RDEPEND="=app-office/abiword-${PV}*
@@ -55,6 +55,11 @@ pkg_setup() {
 		eerror "with USE=\"gnome\""
 		die "gnome support missing in x11-libs/goffice"
 	fi
+
+	if use jabber && ! use cxx; then
+		eerror "AbiCollab needs dev-libs/boost to be build"
+		die "Add USE=\"cxx\" to build AbiCollab plugin"
+	fi
 }
 
 src_compile() {
diff --git a/app-office/abiword-plugins/abiword-plugins-2.6.3.ebuild b/app-office/abiword-plugins/abiword-plugins-2.6.3.ebuild
index b2c60e049828..28cfe932d0da 100644
--- a/app-office/abiword-plugins/abiword-plugins-2.6.3.ebuild
+++ b/app-office/abiword-plugins/abiword-plugins-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2008/05/04 19:21:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword-plugins/abiword-plugins-2.6.3.ebuild,v 1.2 2008/05/18 14:02:34 eva Exp $
 
 EAPI="1"
 
@@ -70,6 +70,7 @@ src_compile() {
 		$(use_enable debug) \
 		$(use_with gnome abigoffice) \
 		$(use_with grammar abigrammar) \
+		$(use_with jabber abicollab) \
 		$(use_with jpeg) \
 		$(use_with libgda gda) \
 		$(use_with math abimathview) \
@@ -83,10 +84,6 @@ src_compile() {
 		--disable-abiscan \
 		--without-psion"
 
-	if use cxx; then
-		myconf="${myconf} $(use_with jabber abicollab)"
-	fi
-
 	econf $myconf || die "./configure failed"
 
 	emake || die "Compilation failed"