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

(Portage version: 2.1.2.1)

3 files changed, 25 insertions, 5 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/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}