From 4dcc904a4140c14aee040f2d0ed055bd1c33be5d Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Sat, 7 Apr 2007 20:24:41 +0000 Subject: [PATCH] Fixed bug #173398 again, thanks to Matteo Azzali. Package-Manager: portage-2.1.2.2 --- sci-electronics/geda/Manifest | 8 ++++---- sci-electronics/geda/geda-20070216.ebuild | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index 35066fa77b51..c9c1d8ad3490 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -33,10 +33,10 @@ EBUILD geda-20061020.ebuild 2606 RMD160 55f1c7c71ffafaf0af6eab294e7973de0580faec MD5 9919b145665968c1e11421bf54aa4d94 geda-20061020.ebuild 2606 RMD160 55f1c7c71ffafaf0af6eab294e7973de0580faec geda-20061020.ebuild 2606 SHA256 3272bd4145ecd54a65ce072e28dc2304c1b54ebfe310e9769b25cb574c628e78 geda-20061020.ebuild 2606 -EBUILD geda-20070216.ebuild 2710 RMD160 5aec4b62155954695abc90229a937eb902860988 SHA1 d07b95ba2fcb7ccfa865c032d7089dd2963557d1 SHA256 1a089ca6f53b03aa1e1428c2db62b72225d8b71b1cadb6b74abb1e51a1852012 -MD5 93e022fbcc38493163ab872758be9a40 geda-20070216.ebuild 2710 -RMD160 5aec4b62155954695abc90229a937eb902860988 geda-20070216.ebuild 2710 -SHA256 1a089ca6f53b03aa1e1428c2db62b72225d8b71b1cadb6b74abb1e51a1852012 geda-20070216.ebuild 2710 +EBUILD geda-20070216.ebuild 2824 RMD160 f31b10d3548158b86c1ad5c0593b6012ef248caf SHA1 b7c4f3b253d269c32a81632a9311a88d7c08ce14 SHA256 50d305e863efb65e54cfcb1a090d64064b7ac98aff5c921d0a9f9b8bf2f811ac +MD5 7c86f2ef572c5b6d2a615a19a2711f0a geda-20070216.ebuild 2824 +RMD160 f31b10d3548158b86c1ad5c0593b6012ef248caf geda-20070216.ebuild 2824 +SHA256 50d305e863efb65e54cfcb1a090d64064b7ac98aff5c921d0a9f9b8bf2f811ac geda-20070216.ebuild 2824 MISC ChangeLog 5176 RMD160 e5c08c5d59542370c9801605e2f3abe1384e2e9f SHA1 c6d917cb8f289d3da253253387d303379c1f28d3 SHA256 9a79c23e0d717bc907c28fb506caccaea99ce8dafb117ec0b130ccf54b3a02ea MD5 83602ee9c41ed81eec94fbc5c74c8a19 ChangeLog 5176 RMD160 e5c08c5d59542370c9801605e2f3abe1384e2e9f ChangeLog 5176 diff --git a/sci-electronics/geda/geda-20070216.ebuild b/sci-electronics/geda/geda-20070216.ebuild index 5d60ab26b79c..e0d75adb5f54 100644 --- a/sci-electronics/geda/geda-20070216.ebuild +++ b/sci-electronics/geda/geda-20070216.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/sci-electronics/geda/geda-20070216.ebuild,v 1.3 2007/04/05 07:00:21 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-20070216.ebuild,v 1.4 2007/04/07 20:24:41 calchan Exp $ inherit eutils @@ -31,7 +31,11 @@ pkg_setup() { built_with_use "dev-scheme/guile" deprecated \ || die "You need either =dev-scheme/guile-1.8 with USE=deprecated" fi - use gd && built_with_use sci-libs/libgeda gd || die "sci-libs/libgeda must be compiled with USE=gd" + if use gd ; then + built_with_use sci-libs/libgeda gd || die "sci-libs/libgeda must be compiled with USE=gd" + else + ! built_with_use sci-libs/libgeda gd || die "sci-libs/libgeda must be compiled with USE=-gd" + fi } src_compile() { -- 2.26.2