summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@gentoo.org>2010-07-01 16:27:53 +0000
committerTomás Touceda <chiiph@gentoo.org>2010-07-01 16:27:53 +0000
commit422debf99f9b37173febfca8cf23d360786ca03b (patch)
tree509cb4c5a615dced4859a681b0eb53b031e8bb67 /dev-scheme
parentAdd installation to missing docs, and port to EAPI 3 (diff)
downloadgentoo-2-422debf99f9b37173febfca8cf23d360786ca03b.tar.gz
gentoo-2-422debf99f9b37173febfca8cf23d360786ca03b.tar.bz2
gentoo-2-422debf99f9b37173febfca8cf23d360786ca03b.zip
Add patch for gcc-4.5 wrt bug 317747, and port to EAPI 3
(Portage version: 2.2_rc67/cvs/Linux i686)
Diffstat (limited to 'dev-scheme')
-rw-r--r--dev-scheme/guile-gnome-platform/ChangeLog6
-rw-r--r--dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch11
-rw-r--r--dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild17
3 files changed, 27 insertions, 7 deletions
diff --git a/dev-scheme/guile-gnome-platform/ChangeLog b/dev-scheme/guile-gnome-platform/ChangeLog
index 29648edd084c..57fc02dddd55 100644
--- a/dev-scheme/guile-gnome-platform/ChangeLog
+++ b/dev-scheme/guile-gnome-platform/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-scheme/guile-gnome-platform
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.12 2010/06/27 13:45:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/ChangeLog,v 1.13 2010/07/01 16:27:53 chiiph Exp $
+
+ 01 Jul 2010; Tomas Touceda <chiiph@gentoo.org> +files/2.16.1-gcc45.patch,
+ guile-gnome-platform-2.16.1.ebuild:
+ Add patch for gcc-4.5 wrt bug 317747, and port to EAPI 3
27 Jun 2010; <nixnut@gentoo.org> guile-gnome-platform-2.16.1.ebuild:
ppc stable #317159
diff --git a/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
new file mode 100644
index 000000000000..39c7e94760bd
--- /dev/null
+++ b/dev-scheme/guile-gnome-platform/files/2.16.1-gcc45.patch
@@ -0,0 +1,11 @@
+--- common.mk
++++ common.mk
+@@ -50,7 +50,7 @@
+ guile-snarf $(GUILE_SNARF_CFLAGS) $< > $@ \
+ || { rm $@; false; }
+ .c.doc:
+- $(CPP) -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
++ $(CPP) -P -DSCM_MAGIC_SNARF_DOCS $(GUILE_SNARF_CFLAGS) $< \
+ | grep -E '^\^\^ {.*\^\^ }' > $@ || { rm $@; false; }
+
+ %.scm guile-gnome-gw-%.c: %-spec.scm
diff --git a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
index 3dc3b1a8c4ae..156f8ecb1d6a 100644
--- a/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
+++ b/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.8 2010/06/27 13:45:10 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-gnome-platform/guile-gnome-platform-2.16.1.ebuild,v 1.9 2010/07/01 16:27:53 chiiph Exp $
-inherit eutils multilib
+EAPI="3"
+
+inherit autotools eutils multilib
DESCRIPTION="Guile Scheme code that wraps the GNOME developer platform"
HOMEPAGE="http://www.gnu.org/software/guile-gnome"
@@ -34,14 +36,17 @@ DEPEND="${RDEPEND}
#needs guile with networking
RESTRICT=test
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}/${PV}-conflicting-types.patch"
+ epatch "${FILESDIR}/${PV}-gcc45.patch"
+ eautoreconf
}
-src_compile() {
+src_configure() {
econf --disable-Werror
+}
+
+src_compile() {
emake -j1 guilegnomedir=/usr/share/guile/site \
guilegnomelibdir=/usr/$(get_libdir) || die "emake failed."
}