Fixed compilation with >=dev-scheme/guile-1.8

Package-Manager: portage-2.1.2.1

4 files changed, 37 insertions, 17 deletions

diff --git a/sci-libs/libgeda/ChangeLog b/sci-libs/libgeda/ChangeLog
index 3c1d09544299..36033b6e6c25 100644
--- a/sci-libs/libgeda/ChangeLog
+++ b/sci-libs/libgeda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/libgeda
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/ChangeLog,v 1.30 2007/03/07 20:14:52 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/ChangeLog,v 1.31 2007/03/09 06:26:37 calchan Exp $
+
+  09 Mar 2007; Denis Dupeyron <calchan@gentoo.org> libgeda-20060123.ebuild,
+  libgeda-20061020.ebuild:
+  Fixed compilation with >=dev-scheme/guile-1.8
 
   07 Mar 2007; Denis Dupeyron <calchan@gentoo.org> -libgeda-20060824.ebuild,
   -libgeda-20060906.ebuild:
diff --git a/sci-libs/libgeda/Manifest b/sci-libs/libgeda/Manifest
index 1801b9d67f05..e4b2f01c0d00 100644
--- a/sci-libs/libgeda/Manifest
+++ b/sci-libs/libgeda/Manifest
@@ -1,17 +1,17 @@
 DIST libgeda-20060123.tar.gz 1047712 RMD160 4b4cf4523d96204deef3fa28a1cc0aa74fb3861c SHA1 9608db1b1e3d6796d7625dad108f78a814d9f6fa SHA256 ff47092ede30a4c34a13924de19dc03b187f1737440b65cebf4a493f1ff47bb1
 DIST libgeda-20061020.tar.gz 615370 RMD160 b62ef82138c967f0c935d0bc7d6a0bf319c46f0d SHA1 eaa691ce88a60f85925bff3f8ee8c9dc5d8a76d6 SHA256 be073da934e3b4d3d4ab46a7e23f2423d2f5ff7b87147f001ef25231045ae2ab
-EBUILD libgeda-20060123.ebuild 907 RMD160 9545d30f2162cd6797180656a624e2d7505d2b39 SHA1 934bf6da05eef192e6f18d6db6af665b10718b68 SHA256 ed3117da18b988a4e6368b777c5b1d7eb3731bdf7b5b07154972f51d71ca4ba9
-MD5 d7df8efcd69f0a2fbd73a465f0794c7f libgeda-20060123.ebuild 907
-RMD160 9545d30f2162cd6797180656a624e2d7505d2b39 libgeda-20060123.ebuild 907
-SHA256 ed3117da18b988a4e6368b777c5b1d7eb3731bdf7b5b07154972f51d71ca4ba9 libgeda-20060123.ebuild 907
-EBUILD libgeda-20061020.ebuild 1128 RMD160 05a464e885693edd695625cd3b01118a5d7d66fd SHA1 7df27648a00d92e894b452d487cd7ed4e577470e SHA256 4274403a3f64b3c7133b16d6c9df8b5f6d86f4ae8bc76f9b4b8a09f20108326a
-MD5 878e28a68ed1579515bd05e51cabd636 libgeda-20061020.ebuild 1128
-RMD160 05a464e885693edd695625cd3b01118a5d7d66fd libgeda-20061020.ebuild 1128
-SHA256 4274403a3f64b3c7133b16d6c9df8b5f6d86f4ae8bc76f9b4b8a09f20108326a libgeda-20061020.ebuild 1128
-MISC ChangeLog 4533 RMD160 0d5cb5ada67f2a6e7ac60918014245515bbff25b SHA1 936ab25460a757f831672449919651f07fbdde85 SHA256 292a52f028e42f49c2a1f8295a923d3c5a54accd136b80f048d6f05231f0ed68
-MD5 c6d30ac1f24e4f00da01dd5f25922ec4 ChangeLog 4533
-RMD160 0d5cb5ada67f2a6e7ac60918014245515bbff25b ChangeLog 4533
-SHA256 292a52f028e42f49c2a1f8295a923d3c5a54accd136b80f048d6f05231f0ed68 ChangeLog 4533
+EBUILD libgeda-20060123.ebuild 1115 RMD160 91812db1bcd0d995ece96f3ad1bed13755f5e593 SHA1 9797fb92f22b1f9bb80f169893a22bc78a2f1327 SHA256 0bc37a551bedf32f5210d86de00b3cad461708ba05b55d057e1ee0da07f6491d
+MD5 4b2d0bc7058264510f6d6b5d67425486 libgeda-20060123.ebuild 1115
+RMD160 91812db1bcd0d995ece96f3ad1bed13755f5e593 libgeda-20060123.ebuild 1115
+SHA256 0bc37a551bedf32f5210d86de00b3cad461708ba05b55d057e1ee0da07f6491d libgeda-20060123.ebuild 1115
+EBUILD libgeda-20061020.ebuild 1336 RMD160 51e7b3e1a45275f78088221694fcf5bed5642ac6 SHA1 54ac4dc00f04a84e076e32d64f6483c2cae3e9ea SHA256 9a9ddd99059b3051f9db8cb94b3fa38d79e8cfea3a25a3edb1f1226a3bca94ea
+MD5 4d1110fdea2cdee4cb6eb6548a4489ad libgeda-20061020.ebuild 1336
+RMD160 51e7b3e1a45275f78088221694fcf5bed5642ac6 libgeda-20061020.ebuild 1336
+SHA256 9a9ddd99059b3051f9db8cb94b3fa38d79e8cfea3a25a3edb1f1226a3bca94ea libgeda-20061020.ebuild 1336
+MISC ChangeLog 4685 RMD160 f0c8b64948c1f749bb38b4a420cbb06266df9cbc SHA1 3aea3ac83027212f252669b6c8ffbd6605b61cc2 SHA256 2ae1f2a1707bae84d2793a249e8fff673ac82ab30f401d0f77705f3407049a94
+MD5 31eb0a5ee0ea1af3f3c3fd2363f96257 ChangeLog 4685
+RMD160 f0c8b64948c1f749bb38b4a420cbb06266df9cbc ChangeLog 4685
+SHA256 2ae1f2a1707bae84d2793a249e8fff673ac82ab30f401d0f77705f3407049a94 ChangeLog 4685
 MISC metadata.xml 170 RMD160 b9964e5710864130a4882704bf4b61da7395c60b SHA1 5ba029fddfb2ef28d6348761206dcefab43eceba SHA256 04478b4a4b2a77fac3b6b7eefee87575fcb5c69087ad7cdddf0c3e3189231434
 MD5 8246c0116e6c71e97b23c037d4347d38 metadata.xml 170
 RMD160 b9964e5710864130a4882704bf4b61da7395c60b metadata.xml 170
diff --git a/sci-libs/libgeda/libgeda-20060123.ebuild b/sci-libs/libgeda/libgeda-20060123.ebuild
index cc2c4d83be3d..041ecb0704ce 100644
--- a/sci-libs/libgeda/libgeda-20060123.ebuild
+++ b/sci-libs/libgeda/libgeda-20060123.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/libgeda-20060123.ebuild,v 1.8 2007/03/03 13:29:39 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/libgeda-20060123.ebuild,v 1.9 2007/03/09 06:26:37 calchan Exp $
 
 HOMEPAGE="http://www.geda.seul.org"
 DESCRIPTION="libgeda - this library provides functions needed for the gEDA core suite"
 SRC_URI="http://www.geda.seul.org/devel/${PV}/libgeda-${PV}.tar.gz"
 
+inherit eutils
+
 IUSE="png"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc sparc x86"
@@ -14,10 +16,16 @@ SLOT="0"
 DEPEND=">=dev-libs/glib-2.4.8
 	>=x11-libs/gtk+-2.2
 	>=dev-scheme/guile-1.6.3
-	<dev-scheme/guile-1.8
 	>=dev-util/pkgconfig-0.15.0
 	png? ( >=sci-libs/libgdgeda-2.0.15 )"
 
+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, or >=dev-scheme/guile-1.8 with USE=deprecated"
+	fi
+}
+
 src_compile () {
 	local myconf
 
diff --git a/sci-libs/libgeda/libgeda-20061020.ebuild b/sci-libs/libgeda/libgeda-20061020.ebuild
index d13e07ef397e..62496a6b97a0 100644
--- a/sci-libs/libgeda/libgeda-20061020.ebuild
+++ b/sci-libs/libgeda/libgeda-20061020.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/libgeda-20061020.ebuild,v 1.5 2007/03/03 13:29:39 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libgeda/libgeda-20061020.ebuild,v 1.6 2007/03/09 06:26:37 calchan Exp $
 
 HOMEPAGE="http://www.geda.seul.org"
 DESCRIPTION="libgeda - this library provides functions needed for the gEDA core suite"
 SRC_URI="http://www.geda.seul.org/devel/${PV}/libgeda-${PV}.tar.gz"
 
+inherit eutils
+
 IUSE=""
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -13,9 +15,15 @@ SLOT="0"
 
 DEPEND=">=x11-libs/gtk+-2.4
 	>=dev-scheme/guile-1.6.3
-	<dev-scheme/guile-1.8
 	>=dev-libs/libstroke-0.5.1"
 
+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, or >=dev-scheme/guile-1.8 with USE=deprecated"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}