From: Marijn Schouten Date: Wed, 28 Mar 2007 11:05:57 +0000 (+0000) Subject: fix guile use flag checks and slib dep X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f41b33a79403b331824be5888841b37308d8ebf1;p=gentoo.git fix guile use flag checks and slib dep Package-Manager: portage-2.1.2.2 --- diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog index fa39111d843a..b934ed619bcf 100644 --- 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.127 2007/03/27 13:14:25 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.128 2007/03/28 11:05:57 hkbst Exp $ + + 28 Mar 2007; Marijn Schouten gnucash-2.0.5.ebuild: + fix guile use flag checks and slib dep 27 Mar 2007; Seemant Kulleen gnucash-2.0.5.ebuild: make this agnostic as to the versions of guile involved, so that gnucash can diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest index 1c43edb772a9..9160eb5ad012 100644 --- a/app-office/gnucash/Manifest +++ b/app-office/gnucash/Manifest @@ -11,14 +11,14 @@ EBUILD gnucash-2.0.4-r1.ebuild 3371 RMD160 b87fd0c90f228e9ebcae31e119a100d65bfe4 MD5 3443a8f128c685f72e223ee32cb08d67 gnucash-2.0.4-r1.ebuild 3371 RMD160 b87fd0c90f228e9ebcae31e119a100d65bfe4a34 gnucash-2.0.4-r1.ebuild 3371 SHA256 9f305bc86f950a9d3a818974e7f27c0f249d669e035ab0e015e0c34eb689c520 gnucash-2.0.4-r1.ebuild 3371 -EBUILD gnucash-2.0.5.ebuild 3234 RMD160 b4882f5af02209643b8763ae4ae8bd2ac7348684 SHA1 09ceefd2787ec627d11a76b771182b4558e4e2db SHA256 f3bc44add630f49702014aa3f3249257c2cf650af3be940fc68e2892c9dc2569 -MD5 7b557eff1933607c7be843f942211be6 gnucash-2.0.5.ebuild 3234 -RMD160 b4882f5af02209643b8763ae4ae8bd2ac7348684 gnucash-2.0.5.ebuild 3234 -SHA256 f3bc44add630f49702014aa3f3249257c2cf650af3be940fc68e2892c9dc2569 gnucash-2.0.5.ebuild 3234 -MISC ChangeLog 19636 RMD160 5d139ed7386e6c3f3811c71b98104172d2c82951 SHA1 63f73937f290ec4cff869732a0feb7609bb6303e SHA256 06b51c4cb97ac17da2e543545736a59599fd774a1a0fcd3774f844f5359c5388 -MD5 d85ec7bdee916b930376a7505b7e42c3 ChangeLog 19636 -RMD160 5d139ed7386e6c3f3811c71b98104172d2c82951 ChangeLog 19636 -SHA256 06b51c4cb97ac17da2e543545736a59599fd774a1a0fcd3774f844f5359c5388 ChangeLog 19636 +EBUILD gnucash-2.0.5.ebuild 3316 RMD160 6af306d3c8beee6c724f43dc8422cf31667aaf5b SHA1 6851059d9a2f8ef0e917ca08e340d3088027ee2c SHA256 a2dd01549f411f6ccb914fa16dcd762d6dbb85b1e124857ba11747360c244153 +MD5 7e3607c4ffab85faccba8af89bd68c7f gnucash-2.0.5.ebuild 3316 +RMD160 6af306d3c8beee6c724f43dc8422cf31667aaf5b gnucash-2.0.5.ebuild 3316 +SHA256 a2dd01549f411f6ccb914fa16dcd762d6dbb85b1e124857ba11747360c244153 gnucash-2.0.5.ebuild 3316 +MISC ChangeLog 19748 RMD160 0eb8672317d743606e9e7de08de7e02adfc2e940 SHA1 8597c824c644af9a95559a90fe2fc56df0662426 SHA256 9bdcb2dc3989756282646776751bef6515b840df2db76aa04e30e4b65e1dcc0d +MD5 b7a1ed63530d483c951a06b93ad61d01 ChangeLog 19748 +RMD160 0eb8672317d743606e9e7de08de7e02adfc2e940 ChangeLog 19748 +SHA256 9bdcb2dc3989756282646776751bef6515b840df2db76aa04e30e4b65e1dcc0d ChangeLog 19748 MISC metadata.xml 259 RMD160 ed12c8563569c0e9f00a7122116ce5770fe97094 SHA1 37d33c924314aee7466dd8c70f06d871a9ca48a2 SHA256 8809ada312cc9e36cd5394df53106996495d83b82759c10360f4b86936cb148c MD5 7a7f2ee070fc06a3289520b81a77a43a metadata.xml 259 RMD160 ed12c8563569c0e9f00a7122116ce5770fe97094 metadata.xml 259 diff --git a/app-office/gnucash/gnucash-2.0.5.ebuild b/app-office/gnucash/gnucash-2.0.5.ebuild index ffc4f6e31810..c655b843fdb5 100644 --- 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.5 2007/03/27 13:14:25 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.0.5.ebuild,v 1.6 2007/03/28 11:05:57 hkbst Exp $ inherit eutils gnome2 @@ -19,7 +19,7 @@ IUSE="ofx hbci chipcard doc debug quotes nls" RDEPEND=">=dev-libs/glib-2.4.0 dev-scheme/guile - =dev-scheme/slib-3.1.1* + ~dev-scheme/slib-3.1.1-r1 >=sys-libs/zlib-1.1.4 >=dev-libs/popt-1.5 >=x11-libs/gtk+-2.4 @@ -54,8 +54,13 @@ 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" - if ! built_with_use =dev-scheme/guile-1.8* regex deprecated discouraged; then - die "dev-scheme/guile must be built with USE=\"regex deprecated discouraged\"" + + if has_version =guile-1.8*; then + local flags="deprecated regex" + if ! built_with_use dev-scheme/guile ${flags}; then + einfo "guile must be built with \"${flags}\" use flags" + die "guile must be built with \"${flags}\" use flags" + fi fi } @@ -90,7 +95,7 @@ src_compile() { src_test() { einfo "Skipping tests because one of the upstream tests is broken" einfo "Please reference: https://bugs.gentoo.org/show_bug.cgi?id=146769#c1" - einfo "We have a filed a bug upstream. When that is resolved," + einfo "We have a filed a bug upstream. When that is resolved," einfo "We will re-enable the tests." }