summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Dupeyron <calchan@gentoo.org>2007-03-09 06:37:31 +0000
committerDenis Dupeyron <calchan@gentoo.org>2007-03-09 06:37:31 +0000
commitf3937c62d31265a5ddd2bf3060cfb8e57d7336ee (patch)
tree8ef063b63627af8e0c72842607306ea850f2e092 /sci-electronics
parentremove unused licenses (diff)
downloadgentoo-2-f3937c62d31265a5ddd2bf3060cfb8e57d7336ee.tar.gz
gentoo-2-f3937c62d31265a5ddd2bf3060cfb8e57d7336ee.tar.bz2
gentoo-2-f3937c62d31265a5ddd2bf3060cfb8e57d7336ee.zip
Fixed compilation with >=dev-scheme/guile-1.8
(Portage version: 2.1.2.1)
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/geda/ChangeLog6
-rw-r--r--sci-electronics/geda/geda-20060123.ebuild10
-rw-r--r--sci-electronics/geda/geda-20061020.ebuild10
3 files changed, 21 insertions, 5 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 <calchan@gentoo.org> geda-20060123.ebuild,
+ geda-20061020.ebuild:
+ Fixed compilation with >=dev-scheme/guile-1.8
03 Mar 2007; Denis Dupeyron <calchan@gentoo.org> geda-20060123.ebuild,
geda-20061020.ebuild:
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
- <dev-scheme/guile-1.8
>=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, or >=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
- <dev-scheme/guile-1.8
>=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, or >=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}