From dc55c85a3c55ad0f84f329f77a442fa2047ddc8e Mon Sep 17 00:00:00 2001 From: Denis Dupeyron Date: Fri, 9 Mar 2007 06:37:31 +0000 Subject: [PATCH] Fixed compilation with >=dev-scheme/guile-1.8 Package-Manager: portage-2.1.2.1 --- sci-electronics/geda/ChangeLog | 6 +++++- sci-electronics/geda/Manifest | 24 +++++++++++------------ sci-electronics/geda/geda-20060123.ebuild | 10 ++++++++-- sci-electronics/geda/geda-20061020.ebuild | 10 ++++++++-- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/sci-electronics/geda/ChangeLog b/sci-electronics/geda/ChangeLog index 8b1601163a97..51c200ad9d14 100644 --- a/sci-electronics/geda/ChangeLog +++ b/sci-electronics/geda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-electronics/geda # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.29 2007/03/03 14:45:00 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/ChangeLog,v 1.30 2007/03/09 06:37:31 calchan Exp $ + + 09 Mar 2007; Denis Dupeyron geda-20060123.ebuild, + geda-20061020.ebuild: + Fixed compilation with >=dev-scheme/guile-1.8 03 Mar 2007; Denis Dupeyron geda-20060123.ebuild, geda-20061020.ebuild: diff --git a/sci-electronics/geda/Manifest b/sci-electronics/geda/Manifest index ee56b9c077e1..fbacd2301f52 100644 --- a/sci-electronics/geda/Manifest +++ b/sci-electronics/geda/Manifest @@ -17,18 +17,18 @@ DIST geda-symbols-20061020.tar.gz 685214 RMD160 8ebb5252b33948d2c08f208662bc2559 DIST geda-utils-20060123.tar.gz 261074 RMD160 e6efd644ce8c56b21493edea035cf4f0538f9f06 SHA1 fa009f00cc1f8f981c0fe0f11ab75d4d934dd6cb SHA256 d941266a3bb1082e1274357160eb3ad4b7cbb1e65d248a118c367d6bd2d332c3 DIST geda-utils-20061020.tar.gz 268215 RMD160 0a93851ae554edf1b30ffa3021e7c22b9fd9b781 SHA1 892ff9fd664054838f6e1f925e959f85cfcee916 SHA256 7e9ed7ea9dc2ee4afb38da64c8c641ede944c89ec46d66656645a50945d6e88a DIST libgeda-20060123.tar.gz 1047712 RMD160 4b4cf4523d96204deef3fa28a1cc0aa74fb3861c SHA1 9608db1b1e3d6796d7625dad108f78a814d9f6fa SHA256 ff47092ede30a4c34a13924de19dc03b187f1737440b65cebf4a493f1ff47bb1 -EBUILD geda-20060123.ebuild 2755 RMD160 dff81dfbdbee4b5c1c866378bca4b7c1efdc9065 SHA1 cba8260c9547f4f81839a3e33211b605a5740200 SHA256 15677318e28ae1bd6892940af8f66cd26296da9ee4edaf31ee071a8c4c964023 -MD5 eb5115fe98c2f1611ebef0ca287bf771 geda-20060123.ebuild 2755 -RMD160 dff81dfbdbee4b5c1c866378bca4b7c1efdc9065 geda-20060123.ebuild 2755 -SHA256 15677318e28ae1bd6892940af8f66cd26296da9ee4edaf31ee071a8c4c964023 geda-20060123.ebuild 2755 -EBUILD geda-20061020.ebuild 2415 RMD160 8f304a1722719ddbc1d9137184d0477094a03969 SHA1 1f36c956c233e6803f9eb1dd9d69bf9d3585a6a7 SHA256 28e86db2f9adde7feca27bf598e338bbe5e3462360648ff1f6bfb09245507412 -MD5 460e162bd2542f7ead1b2fdc626c382c geda-20061020.ebuild 2415 -RMD160 8f304a1722719ddbc1d9137184d0477094a03969 geda-20061020.ebuild 2415 -SHA256 28e86db2f9adde7feca27bf598e338bbe5e3462360648ff1f6bfb09245507412 geda-20061020.ebuild 2415 -MISC ChangeLog 4445 RMD160 203657fcfdcba14bf9be0070745f1baee3e9039b SHA1 5d518b2f390b36762d89701ae9ac88e1a7a1f255 SHA256 3fc465fe1ba803bdff13b10f7996d43b71a29cf4e1a664347bd54b5e33c96822 -MD5 0bec4c272e3f3bb8c02e954c7581015c ChangeLog 4445 -RMD160 203657fcfdcba14bf9be0070745f1baee3e9039b ChangeLog 4445 -SHA256 3fc465fe1ba803bdff13b10f7996d43b71a29cf4e1a664347bd54b5e33c96822 ChangeLog 4445 +EBUILD geda-20060123.ebuild 2947 RMD160 6b2b71168b017262f72f3cf173a41df6c8956de4 SHA1 350579c21ea86d85391c412e5f27a351976f1e0d SHA256 8f64cbb0b54c3deff5107afd17210f5e5ea389cac4c613ded5a0822fe5b6f682 +MD5 fdcfc46e12de36fb74619d0fc2b732c0 geda-20060123.ebuild 2947 +RMD160 6b2b71168b017262f72f3cf173a41df6c8956de4 geda-20060123.ebuild 2947 +SHA256 8f64cbb0b54c3deff5107afd17210f5e5ea389cac4c613ded5a0822fe5b6f682 geda-20060123.ebuild 2947 +EBUILD geda-20061020.ebuild 2607 RMD160 7cf29d0c98efca8652a269da05e0a4fa0c52bac2 SHA1 5a6448a8ea0afb6a23ea0a0284d21ebd7ee3739f SHA256 a2fe37d3fd38a237a8d5f270d3674c4b2d8568d2ff13ce241f704874322e51ed +MD5 aaef54f63383a06ad7ece7e7c0e99291 geda-20061020.ebuild 2607 +RMD160 7cf29d0c98efca8652a269da05e0a4fa0c52bac2 geda-20061020.ebuild 2607 +SHA256 a2fe37d3fd38a237a8d5f270d3674c4b2d8568d2ff13ce241f704874322e51ed geda-20061020.ebuild 2607 +MISC ChangeLog 4591 RMD160 bb3c931d8b7dcfd7f388205bdb2c8b84dabd82c1 SHA1 1d487acd2908f8deb76ed00b2abbc11ba2796340 SHA256 08011aa646f02bcb97305e6b62c148c9be8a76fc6b9498e66c448b24e2e737e3 +MD5 b1eabbe4a28c2fe7a40fcae56178b1d0 ChangeLog 4591 +RMD160 bb3c931d8b7dcfd7f388205bdb2c8b84dabd82c1 ChangeLog 4591 +SHA256 08011aa646f02bcb97305e6b62c148c9be8a76fc6b9498e66c448b24e2e737e3 ChangeLog 4591 MISC metadata.xml 170 RMD160 b9964e5710864130a4882704bf4b61da7395c60b SHA1 5ba029fddfb2ef28d6348761206dcefab43eceba SHA256 04478b4a4b2a77fac3b6b7eefee87575fcb5c69087ad7cdddf0c3e3189231434 MD5 8246c0116e6c71e97b23c037d4347d38 metadata.xml 170 RMD160 b9964e5710864130a4882704bf4b61da7395c60b metadata.xml 170 diff --git a/sci-electronics/geda/geda-20060123.ebuild b/sci-electronics/geda/geda-20060123.ebuild index 489077c101f4..8339591119d4 100644 --- a/sci-electronics/geda/geda-20060123.ebuild +++ b/sci-electronics/geda/geda-20060123.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-20060123.ebuild,v 1.7 2007/03/03 14:45:00 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-20060123.ebuild,v 1.8 2007/03/09 06:37:31 calchan Exp $ inherit eutils @@ -28,13 +28,19 @@ SLOT="0" DEPEND=">=dev-libs/glib-1.2.10 >=x11-libs/gtk+-2.2 >=dev-scheme/guile-1.6.3 - =sys-libs/zlib-1.1.0 >=media-libs/libpng-1.2.0 >=dev-util/pkgconfig-0.15.0 >=sci-libs/libgdgeda-2.0.15 >=sci-libs/libgeda-${PV}" +pkg_setup() { + if has_version ">=dev-scheme/guile-1.8" ; then + built_with_use "dev-scheme/guile" deprecated \ + || die "You need either =dev-scheme/guile-1.8 with USE=deprecated" + fi +} + src_unpack() { unpack geda-${PV}.tar.gz unpack geda-docs-${PV}.tar.gz diff --git a/sci-electronics/geda/geda-20061020.ebuild b/sci-electronics/geda/geda-20061020.ebuild index 687432fd76e3..e6ec4446018f 100644 --- a/sci-electronics/geda/geda-20061020.ebuild +++ b/sci-electronics/geda/geda-20061020.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-20061020.ebuild,v 1.3 2007/03/03 14:45:00 calchan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-electronics/geda/geda-20061020.ebuild,v 1.4 2007/03/09 06:37:31 calchan Exp $ inherit eutils @@ -24,9 +24,15 @@ SLOT="0" DEPEND=">=x11-libs/gtk+-2.4 >=dev-scheme/guile-1.6.3 - =sci-libs/libgeda-${PV}" +pkg_setup() { + if has_version ">=dev-scheme/guile-1.8" ; then + built_with_use "dev-scheme/guile" deprecated \ + || die "You need either =dev-scheme/guile-1.8 with USE=deprecated" + fi +} + src_compile() { for subdir in geda-{gattrib,gnetlist,gschem,gsymcheck,symbols,utils}-${PV}; do cd ${S}/${subdir} -- 2.26.2