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

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 22 insertions, 53 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/Manifest b/app-office/gnucash/Manifest
index 0cfe9b442699..43981986e035 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,8 +1,8 @@
 DIST gnucash-2.2.7.tar.lzma 4929852 RMD160 a660bd657992abba9f03a2398460fce475f5b170 SHA1 cae106092a3e8072a4d6239b95dcd616cf96f717 SHA256 ea6bc5ecd220cd2c9fb96fdbff80bf3aba057ce9dd42818dd5a2a0630b8d2384
 DIST gnucash-2.2.8.tar.lzma 4989450 RMD160 d3c2cf32c719debee55690db603329788644cc26 SHA1 804feb9e17f976186cfdb4e829064d60923571f8 SHA256 a106dc2ceac8867a81f0cc27345901c9c43c482fb57f86c1aaa2fd94e9d1c74e
 DIST gnucash-2.2.9.tar.lzma 5210184 RMD160 2e16625b59762a52cea09cfa8139138ee21c6fb2 SHA1 b7debe12fcb2770f5ec4524ec56c57adbdad19d2 SHA256 07b02908d614da6d9d83db07bca6054ed662be58c4de7c541d8c5b8263256c17
-EBUILD gnucash-2.2.7.ebuild 2523 RMD160 c772e75a2e4615b7450a7aa58386125557a6fea2 SHA1 c5234c19ab209cd76f51f60ad9662e50f605818b SHA256 336dc9456ea7f2a931626e7d12219a28e079b6d2ee4753bbf2c8b8a5178515f1
-EBUILD gnucash-2.2.8.ebuild 2676 RMD160 82461f4cdfbd52f1b2d96cab80ba9d4ee31967a2 SHA1 7fa6fd93c27a5223ce5350e10cee03b0419899e9 SHA256 59b86ba855b9ed01ebf2f7c851f8eafd448ed13ba5fce26a0e81ca80a9b0fb90
-EBUILD gnucash-2.2.9.ebuild 2336 RMD160 95359a5b1a4fac923db105cc6759eacc1d8832e5 SHA1 e1c7dc69af9486c045ce630ba8d1bf805d01f5dd SHA256 672487d98c0fa09a4da62367bb81f905da5269c87833e153ec0d7f9eae91090c
-MISC ChangeLog 26861 RMD160 d3fb61a7dcb12deb466228925902c63e98990788 SHA1 f56978d5c6eb8b77a0df3364f3fa3630479755b1 SHA256 608cd6d78f8da589af624a576ad978faf3d95709a3d1e30673721536ec40b220
+EBUILD gnucash-2.2.7.ebuild 2030 RMD160 d2a7c001d8e84f3d6d302f0f4e7f5b60823781fe SHA1 309d61fd52f6cfbf3e0ee3d7dd428131afb2868c SHA256 e944c5821555fa2c1a492df2cc93c9d6bbaef2ba34d5b8d65f30cb863fff2d76
+EBUILD gnucash-2.2.8.ebuild 2034 RMD160 b8f6a33e95bbc349737f24707c4d704c2f22a154 SHA1 051c032230aa3969f3062d894f96aaef3a7b52d7 SHA256 c03396fb70777421807eadd3e6d5c3bd7ac54f9441107bda85de6501045abc8e
+EBUILD gnucash-2.2.9.ebuild 2131 RMD160 5ec2c35d76d574c366345b24b0c4ef80eb9860f0 SHA1 d4010d6bab5e1387dbf43836689699285ea33124 SHA256 482e37d12542a4e3e1c1932dac08e456bf3cf94147ce2df0f1f314878fc0e8ac
+MISC ChangeLog 27084 RMD160 af40ce5e997a90b00b2caa79752624dab96550a0 SHA1 564c840ee40900c4e539d481696dd1c1dfdfa6d8 SHA256 8422241276c638b0acaaf01d1296dc5d64aed435d5bb49fe0a954d0032ae17d6
 MISC metadata.xml 501 RMD160 0608e775e9516bf846268a4d146b40351fd804a0 SHA1 8225165b398f7c868a219a6ebdb327876c6521e8 SHA256 4b87e843fd908496e5a136d5671d5a0c12276fd18b7e13e39d247088af3669c2
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)