EAPI2-ify. Since x11-libs/goffice is also EAPI2, we can stop checking the USE flags of libgsf.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

4 files changed, 18 insertions, 49 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index aadf16df338c..4b9bf2f55b7c 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.182 2009/03/26 18:15:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.183 2009/04/11 20:51:50 loki_val Exp $
+
+  11 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> gnucash-2.2.7.ebuild,
+  gnucash-2.2.8.ebuild, gnucash-2.2.9.ebuild:
+  EAPI2-ify. Since x11-libs/goffice is also EAPI2, we can stop checking the
+  USE flags of libgsf.
 
   26 Mar 2009; Brent Baude <ranger@gentoo.org> gnucash-2.2.9.ebuild:
   stable ppc, bug 262586
diff --git a/app-office/gnucash/gnucash-2.2.7.ebuild b/app-office/gnucash/gnucash-2.2.7.ebuild
index 74274925075d..265e70822e32 100644
--- a/app-office/gnucash/gnucash-2.2.7.ebuild
+++ b/app-office/gnucash/gnucash-2.2.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.7.ebuild,v 1.4 2008/11/30 10:49:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.7.ebuild,v 1.5 2009/04/11 20:51:50 loki_val Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ IUSE="+doc ofx hbci chipcard debug quotes"
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
 
 RDEPEND=">=dev-libs/glib-2.6.3
-	>=dev-scheme/guile-1.8.3
+	>=dev-scheme/guile-1.8.3[deprecated,regex]
 	>=dev-scheme/slib-3.1.4
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/popt-1.5
@@ -31,9 +31,9 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	>=gnome-extra/gtkhtml-3.14
 	>=dev-libs/libxml2-2.5.10
 	>=gnome-base/gconf-2
-	>=x11-libs/goffice-0.6
+	>=x11-libs/goffice-0.6[gnome]
 	ofx? ( >=dev-libs/libofx-0.7.0 )
-	hbci? ( net-libs/aqbanking
+	hbci? ( net-libs/aqbanking[qt3]
 		chipcard? ( sys-libs/libchipcard )
 	)
 	quotes? ( dev-perl/DateManip
@@ -57,19 +57,6 @@ DOCS="doc/README.OFX doc/README.HBCI"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-	local diemessage=""
-	local flags="deprecated regex"
-	if ! built_with_use --missing true dev-scheme/guile ${flags} ; then
-		diemessage="dev-scheme/guile must be built with \"${flags}\" use flags. "
-	fi
-	if ! built_with_use gnome-extra/libgsf gnome ; then
-		diemessage="${diemessage}gnome-extra/libgsf must be built with gnome use flag. "
-	fi
-	if ! built_with_use x11-libs/goffice gnome ; then
-		diemessage="${diemessage}x11-libs/goffice must be built with gnome use flag. "
-	fi
-	[ -n "${diemessage}" ] && die ${diemessage}
-
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable ofx)
diff --git a/app-office/gnucash/gnucash-2.2.8.ebuild b/app-office/gnucash/gnucash-2.2.8.ebuild
index 967960c6b252..4e51c9454e76 100644
--- a/app-office/gnucash/gnucash-2.2.8.ebuild
+++ b/app-office/gnucash/gnucash-2.2.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.8.ebuild,v 1.2 2009/01/30 18:26:59 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.8.ebuild,v 1.3 2009/04/11 20:51:50 loki_val Exp $
 
-EAPI=1
+EAPI=2
 
 inherit eutils gnome2
 
@@ -21,7 +21,7 @@ IUSE="+doc ofx hbci chipcard debug quotes"
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.in)
 
 RDEPEND=">=dev-libs/glib-2.6.3
-	>=dev-scheme/guile-1.8.3
+	>=dev-scheme/guile-1.8.3[deprecated,regex]
 	>=dev-scheme/slib-3.1.4
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/popt-1.5
@@ -31,9 +31,9 @@ RDEPEND=">=dev-libs/glib-2.6.3
 	>=gnome-extra/gtkhtml-3.14
 	>=dev-libs/libxml2-2.5.10
 	>=gnome-base/gconf-2
-	>=x11-libs/goffice-0.6
+	>=x11-libs/goffice-0.6[gnome]
 	ofx? ( >=dev-libs/libofx-0.7.0 )
-	hbci? ( net-libs/aqbanking
+	hbci? ( net-libs/aqbanking[qt3]
 		chipcard? ( sys-libs/libchipcard )
 	)
 	quotes? ( dev-perl/DateManip
@@ -57,23 +57,6 @@ DOCS="doc/README.OFX doc/README.HBCI"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-	local diemessage=""
-	local flags="deprecated regex"
-	if use hbci && \
-		! built_with_use net-libs/aqbanking qt3 ; then
-		diemessage="net-libs/aqbanking must be built with qt3 use flag. "
-	fi
-	if ! built_with_use --missing true dev-scheme/guile ${flags} ; then
-		diemessage="${diemessage}dev-scheme/guile must be built with \"${flags}\" use flags. "
-	fi
-	if ! built_with_use gnome-extra/libgsf gnome ; then
-		diemessage="${diemessage}gnome-extra/libgsf must be built with gnome use flag. "
-	fi
-	if ! built_with_use x11-libs/goffice gnome ; then
-		diemessage="${diemessage}x11-libs/goffice must be built with gnome use flag. "
-	fi
-	[ -n "${diemessage}" ] && die ${diemessage}
-
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable ofx)
diff --git a/app-office/gnucash/gnucash-2.2.9.ebuild b/app-office/gnucash/gnucash-2.2.9.ebuild
index eb08b8b2cc59..809a17ff28d4 100644
--- a/app-office/gnucash/gnucash-2.2.9.ebuild
+++ b/app-office/gnucash/gnucash-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.3 2009/03/26 18:15:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.2.9.ebuild,v 1.4 2009/04/11 20:51:50 loki_val Exp $
 
 EAPI=2
 
@@ -57,12 +57,6 @@ DOCS="doc/README.OFX doc/README.HBCI"
 MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_setup() {
-	local diemessage=""
-	if ! built_with_use gnome-extra/libgsf gnome ; then
-		diemessage="${diemessage}gnome-extra/libgsf must be built with gnome use flag. "
-	fi
-	[ -n "${diemessage}" ] && die ${diemessage}
-
 	G2CONF="${G2CONF}
 		$(use_enable debug)
 		$(use_enable ofx)