8 files changed, 14 insertions, 13 deletions
diff --git a/dev-scheme/gauche/files/gauche-ext-ldflags.diff b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
index a9de4114d2bf..a9de4114d2bf 100644
--- a/dev-scheme/gauche/files/gauche-ext-ldflags.diff
+++ b/dev-scheme/gauche/files/gauche-0.9-ext-ldflags.patch
diff --git a/dev-scheme/gauche/files/gauche-gauche.m4.diff b/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
index 8c4d3180836a..8c4d3180836a 100644
--- a/dev-scheme/gauche/files/gauche-gauche.m4.diff
+++ b/dev-scheme/gauche/files/gauche-0.9-gauche.m4.patch
diff --git a/dev-scheme/gauche/files/gauche-rfc.tls.diff b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
index 662ab433ef5f..662ab433ef5f 100644
--- a/dev-scheme/gauche/files/gauche-rfc.tls.diff
+++ b/dev-scheme/gauche/files/gauche-0.9-rfc.tls.patch
diff --git a/dev-scheme/gauche/files/gauche-rpath.diff b/dev-scheme/gauche/files/gauche-0.9-rpath.patch
index ca76cb831234..ca76cb831234 100644
--- a/dev-scheme/gauche/files/gauche-rpath.diff
+++ b/dev-scheme/gauche/files/gauche-0.9-rpath.patch
diff --git a/dev-scheme/gauche/files/gauche-xz-info.diff b/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
index 809879c4cbd8..809879c4cbd8 100644
--- a/dev-scheme/gauche/files/gauche-xz-info.diff
+++ b/dev-scheme/gauche/files/gauche-0.9-xz-info.patch
diff --git a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.diff b/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
index a44ee75b8d1a..a44ee75b8d1a 100644
--- a/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.diff
+++ b/dev-scheme/gauche/files/gauche-0.9.3.3-gauche.threads.patch
diff --git a/dev-scheme/gauche/gauche-0.9.3.3.ebuild b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
index da7ad5f7fea6..ba9bc8dfdf77 100644
--- a/dev-scheme/gauche/gauche-0.9.3.3.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,12 +24,13 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
-	epatch "${FILESDIR}"/${PN}-xz-info.diff
-	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
-	epatch "${FILESDIR}"/${P}-gauche.threads.diff
+	epatch "${FILESDIR}"/${PN}-0.9-rpath.patch
+	epatch "${FILESDIR}"/${PN}-0.9-gauche.m4.patch
+	epatch "${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-0.9-xz-info.patch
+	epatch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch
+	epatch "${FILESDIR}"/${P}-gauche.threads.patch
+
 	eautoconf
 }
 
diff --git a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
index 2dbbe970ca2f..03d53dc771fa 100644
--- a/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
+++ b/dev-scheme/gauche/gauche-0.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,11 +27,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-rpath.diff
-	epatch "${FILESDIR}"/${PN}-gauche.m4.diff
-	epatch "${FILESDIR}"/${PN}-ext-ldflags.diff
-	epatch "${FILESDIR}"/${PN}-xz-info.diff
-	epatch "${FILESDIR}"/${PN}-rfc.tls.diff
+	epatch "${FILESDIR}"/${PN}-0.9-rpath.patch
+	epatch "${FILESDIR}"/${PN}-0.9-gauche.m4.patch
+	epatch "${FILESDIR}"/${PN}-0.9-ext-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-0.9-xz-info.patch
+	epatch "${FILESDIR}"/${PN}-0.9-rfc.tls.patch
 
 	mv gc/src/*.[Ss] gc || die
 	sed -i "/^EXTRA_libgc_la_SOURCES/s|src/||g" gc/Makefile.am