Use single built_with_use check for scheme; bug #168041

Package-Manager: portage-2.1.2-r10

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index b09dd73b82af1bfdc1498f92e61a4681d277d17a..392b15c6bb00da27bbf4c0cb1930e7fe23111e87 100644 (file)
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/gnucash
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.122 2007/02/20 21:24:34 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.123 2007/02/22 22:37:44 dang Exp $
+
+  22 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> gnucash-2.0.5.ebuild:
+  Use single built_with_use check for scheme; bug #168041
 
 *gnucash-2.0.5 (20 Feb 2007)
 

diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index 8159c00481196adcc1ffc894f42a3a0c32c74a2c..93157d1592e48babd2d8e52de500c9fb270bb4e5 100644 (file)
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST gnucash-2.0.1.tar.gz 10157876 RMD160 580482709ef338c84f6d7b47f919c5b63ef61440 SHA1 7834c5e6a887e62f58ad5a6ff6142916f5a13b68 SHA256 4c52d0949fa010c1e51576f493903418db9675bbb884fe5d038617079108965e
 DIST gnucash-2.0.2.tar.bz2 7283507 RMD160 3a18e1c1ad3a15be666daf37eb91a7e9730860a5 SHA1 dc7b8687e937f3eb2fa69dbcf0606937aa3e8a80 SHA256 4c24bc0bdf4f6898c06a313dfbdb0b035c217ad9fefbd5fa641a7a88f02cde42
 DIST gnucash-2.0.4.tar.bz2 7355992 RMD160 8a0ef12f5e670585f1a674eebc65c3a3c4668a78 SHA1 afa10712d00b6a90aef0dc7fbb116ff30ded91cb SHA256 6c3515743f1e08e32cd0aae101feba39aea072a5c2e5a0cc8338f7df78b5ace2
@@ -20,14 +23,14 @@ EBUILD gnucash-2.0.4.ebuild 3074 RMD160 b36e9bc3b499ff6c801426b73453f132dafa1e4a
 MD5 eb65f0677fb3bd25f97e454d72bc807c gnucash-2.0.4.ebuild 3074
 RMD160 b36e9bc3b499ff6c801426b73453f132dafa1e4a gnucash-2.0.4.ebuild 3074
 SHA256 68c5e52780aa3d7f1fd6787136007c50cccafc8facb899e324e053e4c681255a gnucash-2.0.4.ebuild 3074
-EBUILD gnucash-2.0.5.ebuild 3364 RMD160 03826a87d5b23c4d6df5cfb7634b8d8104591d1c SHA1 414b2fefc390c3292f94cf552f6f2dbd0ba37fee SHA256 8dd521bb98f3bbd8a0099d8ed74aeab262531d723954c95d416babad41ad6136
-MD5 19c64f9bd68c0ce7e897d8ad370ef331 gnucash-2.0.5.ebuild 3364
-RMD160 03826a87d5b23c4d6df5cfb7634b8d8104591d1c gnucash-2.0.5.ebuild 3364
-SHA256 8dd521bb98f3bbd8a0099d8ed74aeab262531d723954c95d416babad41ad6136 gnucash-2.0.5.ebuild 3364
-MISC ChangeLog 19000 RMD160 19b4d9520ee09bc2879402768d571d4402d0df15 SHA1 fe114239799e8c77abba1b9527b70a7d65b7455a SHA256 6806a67c9fe43c67bfba41f7c6d7fa757bdfcfc937ac3e439867c8e5b23af706
-MD5 b5d9cb13a77a59b2f9c57cec66b6d199 ChangeLog 19000
-RMD160 19b4d9520ee09bc2879402768d571d4402d0df15 ChangeLog 19000
-SHA256 6806a67c9fe43c67bfba41f7c6d7fa757bdfcfc937ac3e439867c8e5b23af706 ChangeLog 19000
+EBUILD gnucash-2.0.5.ebuild 3230 RMD160 c3bbfe9fcb722313a3128b60749fe678260cd43c SHA1 0aebc460d00c90d560db303c4500b5c5eaf87f7d SHA256 e07c96dcd81cf72ddcb37d27afcc794f3f42d98541ca59b7154f23870f566797
+MD5 3ec048812f64e9a01637c371264a1580 gnucash-2.0.5.ebuild 3230
+RMD160 c3bbfe9fcb722313a3128b60749fe678260cd43c gnucash-2.0.5.ebuild 3230
+SHA256 e07c96dcd81cf72ddcb37d27afcc794f3f42d98541ca59b7154f23870f566797 gnucash-2.0.5.ebuild 3230
+MISC ChangeLog 19133 RMD160 e166c1bcb8095b868dd43bc8b97cf39c698c1498 SHA1 0c1d139943c2a0a64f761f63444995116aa70f14 SHA256 d7037f568a3d7d52da5c17a5d9430d87ba578c9b1c8d68afdb32e171add551e8
+MD5 a1ad7f24f45f3b8639095d081376445b ChangeLog 19133
+RMD160 e166c1bcb8095b868dd43bc8b97cf39c698c1498 ChangeLog 19133
+SHA256 d7037f568a3d7d52da5c17a5d9430d87ba578c9b1c8d68afdb32e171add551e8 ChangeLog 19133
 MISC metadata.xml 259 RMD160 ed12c8563569c0e9f00a7122116ce5770fe97094 SHA1 37d33c924314aee7466dd8c70f06d871a9ca48a2 SHA256 8809ada312cc9e36cd5394df53106996495d83b82759c10360f4b86936cb148c
 MD5 7a7f2ee070fc06a3289520b81a77a43a metadata.xml 259
 RMD160 ed12c8563569c0e9f00a7122116ce5770fe97094 metadata.xml 259
@@ -47,3 +50,10 @@ SHA256 7173b438f208eb862e6404d9d77d5ba8af4b90a1eeda9957917b39138debc59f files/di
 MD5 82eac60e54c00dad4751a45e7577ff5c files/digest-gnucash-2.0.5 509
 RMD160 3118f42007a7aa1ce9ef827d426c4d369f8863f8 files/digest-gnucash-2.0.5 509
 SHA256 ebe268d3c8346d57cc6ec50e148ba02d6ebd34f98fe9208ecd972cc79c9c01f6 files/digest-gnucash-2.0.5 509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF3hroomPajV0RnrERAhlLAJ45eXfhN4PlwPt5GbiMaeC3/RTpwQCfSH0S
+tq6Pz2SNYyHv3DF5NMoUjR4=
+=zyu1
+-----END PGP SIGNATURE-----

diff --git a/app-office/gnucash/gnucash-2.0.5.ebuild b/app-office/gnucash/gnucash-2.0.5.ebuild
index 060fefa7cd596eac362eb9bc56155d8e2ea4f5eb..d45acf27d85a101b87ece8e440c75bee539d33d1 100644 (file)
--- a/app-office/gnucash/gnucash-2.0.5.ebuild
+++ b/app-office/gnucash/gnucash-2.0.5.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/gnucash/gnucash-2.0.5.ebuild,v 1.1 2007/02/20 21:24:34 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.0.5.ebuild,v 1.2 2007/02/22 22:37:44 dang Exp $
 
 inherit eutils gnome2
 
@@ -54,9 +54,9 @@ DEPEND="${RDEPEND}
 pkg_setup() {
        built_with_use gnome-extra/libgsf gnome || die "gnome-extra/libgsf must be built with gnome"
        built_with_use x11-libs/goffice gnome || die "x11-libs/goffice must be built with gnome"
-       built_with_use dev-scheme/guile regex || die "dev-scheme/guile must be built with regex"
-       built_with_use dev-scheme/guile deprecated || die "dev-scheme/guile must be built with deprecated"
-       built_with_use dev-scheme/guile discouraged || die "dev-scheme/guile must be built with discouraged"
+       if !built_with_use dev-scheme/guile regex depricated discouraged; then
+               die "dev-scheme/guile must be built with USE=\"regex depricated discouraged\""
+       fi
 }
 
 src_compile() {