From 60258bb71898eee8f3d5d02304e29ec68432ed6d Mon Sep 17 00:00:00 2001
From: Patrick Lauer <patrick@gentoo.org>
Date: Tue, 25 Nov 2014 04:47:46 +0000
Subject: Re-add parrot/nqp backend as nqp works again

(Portage version: 2.2.14/cvs/Linux x86_64, unsigned Manifest commit)
---
 dev-lang/rakudo/ChangeLog                |  8 ++++-
 dev-lang/rakudo/rakudo-2014.11-r1.ebuild | 54 ++++++++++++++++++++++++++++++++
 dev-lang/rakudo/rakudo-2014.11.ebuild    | 50 -----------------------------
 3 files changed, 61 insertions(+), 51 deletions(-)
 create mode 100644 dev-lang/rakudo/rakudo-2014.11-r1.ebuild
 delete mode 100644 dev-lang/rakudo/rakudo-2014.11.ebuild

(limited to 'dev-lang')

diff --git a/dev-lang/rakudo/ChangeLog b/dev-lang/rakudo/ChangeLog
index 507011c7f64a..78f4871277ea 100644
--- a/dev-lang/rakudo/ChangeLog
+++ b/dev-lang/rakudo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/rakudo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/ChangeLog,v 1.64 2014/11/24 01:48:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/ChangeLog,v 1.65 2014/11/25 04:47:46 patrick Exp $
+
+*rakudo-2014.11-r1 (25 Nov 2014)
+
+  25 Nov 2014; Patrick Lauer <patrick@gentoo.org> +rakudo-2014.11-r1.ebuild,
+  -rakudo-2014.11.ebuild:
+  Re-add parrot/nqp backend as nqp works again
 
 *rakudo-2014.11 (24 Nov 2014)
 
diff --git a/dev-lang/rakudo/rakudo-2014.11-r1.ebuild b/dev-lang/rakudo/rakudo-2014.11-r1.ebuild
new file mode 100644
index 000000000000..c2581d8f2397
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2014.11-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2014.11-r1.ebuild,v 1.1 2014/11/25 04:47:46 patrick Exp $
+
+EAPI=5
+
+PARROT_VERSION="6.7.0"
+
+inherit eutils multilib
+
+DESCRIPTION="A Perl 6 implementation built on the Parrot virtual machine"
+HOMEPAGE="http://rakudo.org/"
+SRC_URI="http://rakudo.org/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +parrot java moar"
+
+RDEPEND="parrot? ( >=dev-lang/parrot-${PARROT_VERSION}:=[unicode] )
+	>=dev-lang/nqp-${PV}[parrot?,java?,moar?]"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+src_prepare() {
+	sed -i "s,\$(DOCDIR)/rakudo$,&-${PVR}," tools/build/Makefile-Parrot.in || die
+}
+
+src_configure() {
+	use parrot && myconf+="parrot,"
+	use java && myconf+="jvm,"
+	use moar && myconf+="moar,"
+	perl Configure.pl --backends=${myconf} --prefix=/usr || die
+
+	# why doesn't ops2c get detected?! :(
+	use parrot && sed -i -e 's~OPS2C            = $(PARROT_BIN_DIR)/$(EXE)~OPS2C            = $(PARROT_BIN_DIR)/ops2c~' Makefile || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 DESTDIR="${ED}" install || die
+
+	dodoc CREDITS README.md docs/ChangeLog docs/ROADMAP || die
+
+	if use doc; then
+		dohtml -A svg docs/architecture.html docs/architecture.svg || die
+		dodoc docs/*.pod || die
+		docinto announce
+		dodoc docs/announce/* || die
+	fi
+}
diff --git a/dev-lang/rakudo/rakudo-2014.11.ebuild b/dev-lang/rakudo/rakudo-2014.11.ebuild
deleted file mode 100644
index 968108be0d93..000000000000
--- a/dev-lang/rakudo/rakudo-2014.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/rakudo/rakudo-2014.11.ebuild,v 1.1 2014/11/24 01:48:46 patrick Exp $
-
-EAPI=5
-
-PARROT_VERSION="6.7.0"
-
-inherit eutils multilib
-
-DESCRIPTION="A Perl 6 implementation"
-HOMEPAGE="http://rakudo.org/"
-SRC_URI="http://rakudo.org/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc java +moar"
-
-RDEPEND="
-	>=dev-lang/nqp-${PV}[java?,moar?]"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_prepare() {
-	sed -i "s,\$(DOCDIR)/rakudo$,&-${PVR}," tools/build/Makefile-Parrot.in || die
-}
-
-src_configure() {
-	use java && myconf+="jvm,"
-	use moar && myconf+="moar,"
-	perl Configure.pl --backends=${myconf} --prefix=/usr || die
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${ED}" install || die
-
-	dodoc CREDITS README.md docs/ChangeLog docs/ROADMAP || die
-
-	if use doc; then
-		dohtml -A svg docs/architecture.html docs/architecture.svg || die
-		dodoc docs/*.pod || die
-		docinto announce
-		dodoc docs/announce/* || die
-	fi
-}
-- 
cgit v1.2.3-65-gdbad