Fix compilation of jakudo with upstream patch, #550710

(Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 36 insertions, 5 deletions

diff --git a/dev-lang/rakudo/ChangeLog b/dev-lang/rakudo/ChangeLog
index 967a97b14eed..b4778914ca28 100644
--- a/dev-lang/rakudo/ChangeLog
+++ b/dev-lang/rakudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/rakudo
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/ChangeLog,v 1.74 2015/05/23 19:57:10 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/ChangeLog,v 1.75 2015/05/29 04:11:42 patrick Exp $
+
+*rakudo-2015.05-r1 (29 May 2015)
+
+  29 May 2015; Patrick Lauer <patrick@gentoo.org> +files/jakudo-fix-paths.patch,
+  +rakudo-2015.05-r1.ebuild, -rakudo-2015.05.ebuild:
+  Fix compilation of jakudo with upstream patch, #550710
 
   23 May 2015; Mikle Kolyada <zlogene@gentoo.org> -rakudo-2014.12.ebuild:
   Drop old 2014.x series
diff --git a/dev-lang/rakudo/files/jakudo-fix-paths.patch b/dev-lang/rakudo/files/jakudo-fix-paths.patch
new file mode 100644
index 000000000000..dc75407d1182
--- /dev/null
+++ b/dev-lang/rakudo/files/jakudo-fix-paths.patch
@@ -0,0 +1,23 @@
+commit b9f993b86acf0f1ca3108d1b799ca35c21e726c7
+Author: Tobias Leich <email@froggs.de>
+Date:   Tue May 26 20:27:50 2015 +0200
+
+    dont create dirs when instanciating CUR
+    
+    But also do not skip non-existing locations, because we might be
+    creating them when installing into.
+
+diff --git a/src/core/CompUnitRepo/Locally.pm b/src/core/CompUnitRepo/Locally.pm
+index 72a7eca..5acffca 100644
+--- a/src/core/CompUnitRepo/Locally.pm
++++ b/src/core/CompUnitRepo/Locally.pm
+@@ -7,9 +7,7 @@ role CompUnitRepo::Locally {
+ 
+     method new(CompUnitRepo::Locally: $dir) {
+         my $abspath := $*SPEC.rel2abs($dir);
+-        try mkdir $abspath;
+         my $IO      := IO::Path.new-from-absolute-path($abspath);
+-        return Nil unless $IO.d and $IO.r;
+ 
+         %instances{$abspath} //=
+           self.bless(:$IO,:lock(Lock.new),:WHICH(self.^name ~ '|' ~ $abspath));
diff --git a/dev-lang/rakudo/rakudo-2015.05.ebuild b/dev-lang/rakudo/rakudo-2015.05-r1.ebuild
index ff2de92670bf..a612f3f72b1e 100644
--- a/dev-lang/rakudo/rakudo-2015.05.ebuild
+++ b/dev-lang/rakudo/rakudo-2015.05-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2015.05.ebuild,v 1.1 2015/05/23 00:01:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2015.05-r1.ebuild,v 1.1 2015/05/29 04:11:42 patrick Exp $
 
 EAPI=5
 
-MY_PV="2015.01"
-
 inherit eutils multilib
 
 DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
@@ -17,10 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc java +moar"
 
-RDEPEND=">=dev-lang/nqp-${MY_PV}[java?,moar?]"
+RDEPEND=">=dev-lang/nqp-${PV}[java?,moar?]"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 
+src_prepare() {
+	epatch "${FILESDIR}/jakudo-fix-paths.patch"
+}
+
 src_configure() {
 	use java && myconf+="jvm,"
 	use moar && myconf+="moar,"