[gentoo-commits] repo/user/tbc:master commit in: dev-lang/moarvm/, tools/, dev-lang/nqp/, dev-lang/rakudo/

[M. B.]

commit:     12e55f5e736c85f7de65af998b973df6a67a763f
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed May 25 11:15:53 2016 +0000
Commit:     M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Wed May 25 11:15:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=12e55f5e

remove old perl6 ebuilds

 dev-lang/moarvm/moarvm-2016.01-r1.ebuild |  31 ---------
 dev-lang/moarvm/moarvm-2016.02.ebuild    |  31 ---------
 dev-lang/moarvm/moarvm-2016.03.ebuild    |  31 ---------
 dev-lang/moarvm/moarvm-2016.04-r1.ebuild |  68 ------------------
 dev-lang/moarvm/moarvm-2016.04.ebuild    |  35 ----------
 dev-lang/nqp/nqp-2016.01.ebuild          |  64 -----------------
 dev-lang/nqp/nqp-2016.02.ebuild          |  64 -----------------
 dev-lang/nqp/nqp-2016.03.ebuild          |  64 -----------------
 dev-lang/nqp/nqp-2016.04-r2.ebuild       | 114 -------------------------------
 dev-lang/nqp/nqp-2016.04.ebuild          |  64 -----------------
 dev-lang/rakudo/rakudo-2016.01.1.ebuild  |  36 ----------
 dev-lang/rakudo/rakudo-2016.02.ebuild    |  36 ----------
 dev-lang/rakudo/rakudo-2016.03.ebuild    |  36 ----------
 dev-lang/rakudo/rakudo-2016.04-r1.ebuild |  85 -----------------------
 dev-lang/rakudo/rakudo-2016.04.ebuild    |  34 ---------
 tools/chroot-here.sh                     |  12 ++--
 16 files changed, 6 insertions(+), 799 deletions(-)

diff --git a/dev-lang/moarvm/moarvm-2016.01-r1.ebuild b/dev-lang/moarvm/moarvm-2016.01-r1.ebuild
deleted file mode 100644
index 0e7c088..0000000
--- a/dev-lang/moarvm/moarvm-2016.01-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_PN="MoarVM"
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/MoarVM-${PV}"
-
-src_configure() {
-	perl Configure.pl --prefix="/usr"|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}

diff --git a/dev-lang/moarvm/moarvm-2016.02.ebuild b/dev-lang/moarvm/moarvm-2016.02.ebuild
deleted file mode 100644
index 0e7c088..0000000
--- a/dev-lang/moarvm/moarvm-2016.02.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_PN="MoarVM"
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/MoarVM-${PV}"
-
-src_configure() {
-	perl Configure.pl --prefix="/usr"|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}

diff --git a/dev-lang/moarvm/moarvm-2016.03.ebuild b/dev-lang/moarvm/moarvm-2016.03.ebuild
deleted file mode 100644
index 0e7c088..0000000
--- a/dev-lang/moarvm/moarvm-2016.03.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_PN="MoarVM"
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libuv"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/MoarVM-${PV}"
-
-src_configure() {
-	perl Configure.pl --prefix="/usr"|| die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}

diff --git a/dev-lang/moarvm/moarvm-2016.04-r1.ebuild b/dev-lang/moarvm/moarvm-2016.04-r1.ebuild
deleted file mode 100644
index 7b75a88..0000000
--- a/dev-lang/moarvm/moarvm-2016.04-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit flag-o-matic
-
-MY_PN="MoarVM"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-${PV}"
-fi
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="asan clang debug doc +jit static-libs +system-libs optimize ubsan"
-
-RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
-		dev-libs/libuv
-		jit? ( dev-lang/lua:0[deprecated]
-			dev-lua/LuaBitOp )
-		virtual/libffi"
-DEPEND="${RDEPEND}
-	clang? ( >=sys-devel/clang-3.1 )
-	dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/Configure-2016.04.patch" )
-DOCS=( CREDITS README.markdown )
-
-# Tests are conducted via nqp
-RESTRICT=test
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-	eapply_user
-	use doc && DOCS+=( docs/* )
-}
-
-src_configure() {
-	local myconfigargs=(
-		"--prefix=/usr"
-		"--libdir=$(get_libdir)"
-		"--compiler=$(usex clang clang gcc)"
-		"$(usex asan        --asan)"
-		"$(usex debug       --debug            --no-debug)"
-		"$(usex jit         --lua=/usr/bin/lua --no-jit)"
-		"$(usex optimize    --optimize=        --no-optimize)"
-		"$(usex static-libs --static)"
-		"$(usex system-libs --has-libtommath)"
-		"$(usex system-libs --has-libuv)"
-		"$(usex system-libs --has-libatomic_ops)"
-		"$(usex system-libs --has-libffi)"
-		"$(usex ubsan       --ubsan)"
-	)
-	use optimize && filter-flags '-O*'
-
-	perl Configure.pl "${myconfigargs[@]}" || die
-}

diff --git a/dev-lang/moarvm/moarvm-2016.04.ebuild b/dev-lang/moarvm/moarvm-2016.04.ebuild
deleted file mode 100644
index 9ce8da2..0000000
--- a/dev-lang/moarvm/moarvm-2016.04.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_PN="MoarVM"
-
-DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
-HOMEPAGE="http://moarvm.org"
-SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libuv
-	dev-libs/libtommath
-	dev-libs/libatomic_ops
-	dev-libs/libuv
-	"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S="${WORKDIR}/MoarVM-${PV}"
-
-src_configure() {
-	perl Configure.pl --prefix="/usr" --has-libtommath --has-libatomic_ops --has-libuv || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}

diff --git a/dev-lang/nqp/nqp-2016.01.ebuild b/dev-lang/nqp/nqp-2016.01.ebuild
deleted file mode 100644
index 39d021f..0000000
--- a/dev-lang/nqp/nqp-2016.01.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# still not working
-RESTRICT="test"
-
-inherit eutils multilib versionator
-
-GITCRAP=b5ebdaa
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc java +moar"
-REQUIRED_USE="|| ( java moar )"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.7 )
-	moar? ( ~dev-lang/moarvm-${PV} )
-	dev-libs/libffi"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.7 )
-	dev-lang/perl"
-
-S=${WORKDIR}/perl6-nqp-${GITCRAP}
-
-src_configure() {
-	use java && myconf+="jvm,"
-	use moar && myconf+="moar,"
-	perl Configure.pl --backend=${myconf} --prefix=/usr || die
-	# dirty hack to make dyncall not fail
-	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
-	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
-	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
-
-	# more dirty hack to allow building with newer gcc
-	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
-	sed -i -e 's/-Werror=nested-externs//' Makefile || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-
-	dodoc CREDITS README.pod || die
-
-	if use doc; then
-		dodoc -r docs/* || die
-	fi
-}

diff --git a/dev-lang/nqp/nqp-2016.02.ebuild b/dev-lang/nqp/nqp-2016.02.ebuild
deleted file mode 100644
index ab671df..0000000
--- a/dev-lang/nqp/nqp-2016.02.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# still not working
-RESTRICT="test"
-
-inherit eutils multilib versionator
-
-GITCRAP=1d6b8cb
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc java +moar"
-REQUIRED_USE="|| ( java moar )"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.7 )
-	moar? ( ~dev-lang/moarvm-${PV} )
-	dev-libs/libffi"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.7 )
-	dev-lang/perl"
-
-S=${WORKDIR}/perl6-nqp-${GITCRAP}
-
-src_configure() {
-	use java && myconf+="jvm,"
-	use moar && myconf+="moar,"
-	perl Configure.pl --backend=${myconf} --prefix=/usr || die
-	# dirty hack to make dyncall not fail
-	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
-	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
-	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
-
-	# more dirty hack to allow building with newer gcc
-	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
-	sed -i -e 's/-Werror=nested-externs//' Makefile || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-
-	dodoc CREDITS README.pod || die
-
-	if use doc; then
-		dodoc -r docs/* || die
-	fi
-}

diff --git a/dev-lang/nqp/nqp-2016.03.ebuild b/dev-lang/nqp/nqp-2016.03.ebuild
deleted file mode 100644
index 63020f3..0000000
--- a/dev-lang/nqp/nqp-2016.03.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# still not working
-RESTRICT="test"
-
-inherit eutils multilib versionator
-
-GITCRAP=d1e443f
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc java +moar"
-REQUIRED_USE="|| ( java moar )"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.7 )
-	moar? ( ~dev-lang/moarvm-${PV} )
-	dev-libs/libffi"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.7 )
-	dev-lang/perl"
-
-S=${WORKDIR}/perl6-nqp-${GITCRAP}
-
-src_configure() {
-	use java && myconf+="jvm,"
-	use moar && myconf+="moar,"
-	perl Configure.pl --backend=${myconf} --prefix=/usr || die
-	# dirty hack to make dyncall not fail
-	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
-	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
-	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
-
-	# more dirty hack to allow building with newer gcc
-	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
-	sed -i -e 's/-Werror=nested-externs//' Makefile || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-
-	dodoc CREDITS README.pod || die
-
-	if use doc; then
-		dodoc -r docs/* || die
-	fi
-}

diff --git a/dev-lang/nqp/nqp-2016.04-r2.ebuild b/dev-lang/nqp/nqp-2016.04-r2.ebuild
deleted file mode 100644
index 9575dfb..0000000
--- a/dev-lang/nqp/nqp-2016.04-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-	inherit vcs-snapshot
-	KEYWORDS="~x86 ~amd64"
-fi
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-
-LICENSE="Artistic-2"
-SLOT="0"
-IUSE="doc clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="java? (
-		dev-java/asm:4
-		dev-java/jline:0
-		dev-java/jna:4
-	)
-	moar? ( ~dev-lang/moarvm-${PV}[clang=] )
-	dev-libs/libffi"
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7:* )
-	dev-lang/perl"
-
-java_prepare() {
-	# Don't clean stage0 jars.
-	java-pkg_clean 3rdparty/
-
-	# Don't use jars we just deleted.
-	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
-		src/vm/jvm/runners/nqp-j || die
-}
-
-src_configure() {
-	local backends
-	use java && backends+="jvm,"
-	use moar && backends+="moar"
-
-	local myconfargs=(
-		"--backend=${backends}"
-		"--prefix=/usr" )
-
-	perl Configure.pl "${myconfargs[@]}" || die
-
-	if use java; then
-		# Export this for the script we sed'd above.
-		export THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4)
-	fi
-}
-
-src_compile() {
-	if use java; then
-		emake -j1 \
-			  THIRDPARTY_JARS="${THIRDPARTY_JARS}" \
-			  JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
-	else
-		emake -j1
-	fi
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	if use java; then
-		# Set JAVA_PKG_JARDEST early.
-		java-pkg_init_paths_
-
-		# Upstream sets the classpath to this location. Perhaps it's
-		# used to locate the additional libraries?
-		java-pkg_addcp "${JAVA_PKG_JARDEST}"
-
-		insinto "${JAVA_PKG_JARDEST}"
-		local jar
-
-		for jar in *.jar; do
-			if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
-				# jars for NQP itself.
-				java-pkg_dojar ${jar}
-			else
-				# jars used by NQP.
-				doins ${jar}
-			fi
-		done
-
-		# Upstream uses -Xbootclasspath/a, which is faster due to lack
-		# of verification, but gjl isn't flexible enough yet. :(
-		java-pkg_dolauncher ${PN}-j --main ${PN}
-		dosym ${PN}-j /usr/bin/${PN}
-		dobin tools/jvm/eval-client.pl
-	else
-		emake DESTDIR="${ED}" install
-	fi
-
-	dodoc CREDITS README.pod
-	use doc && dodoc -r docs/*
-}

diff --git a/dev-lang/nqp/nqp-2016.04.ebuild b/dev-lang/nqp/nqp-2016.04.ebuild
deleted file mode 100644
index 4a45644..0000000
--- a/dev-lang/nqp/nqp-2016.04.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# still not working
-RESTRICT="test"
-
-inherit eutils multilib versionator
-
-GITCRAP=10d3ecc
-
-DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
-HOMEPAGE="http://rakudo.org/"
-SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc java +moar"
-REQUIRED_USE="|| ( java moar )"
-
-RDEPEND="
-	java? ( >=virtual/jre-1.7 )
-	moar? ( ~dev-lang/moarvm-${PV} )
-	dev-libs/libffi"
-DEPEND="${RDEPEND}
-	java? ( >=virtual/jdk-1.7 )
-	dev-lang/perl"
-
-S=${WORKDIR}/perl6-nqp-${GITCRAP}
-
-src_configure() {
-	use java && myconf+="jvm,"
-	use moar && myconf+="moar,"
-	perl Configure.pl --backend=${myconf} --prefix=/usr || die
-	# dirty hack to make dyncall not fail
-	sed -i -e 's/-Werror=missing-prototypes//' Makefile || die
-	sed -i -e 's/-Werror=missing-declarations//' Makefile || die
-	sed -i -e 's/-Werror=strict-prototypes//' Makefile || die
-
-	# more dirty hack to allow building with newer gcc
-	sed -i -e 's/-Werror=implicit-function-declaration//' Makefile || die
-	sed -i -e 's/-Werror=nested-externs//' Makefile || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_test() {
-	emake -j1 test || die
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install || die
-
-	dodoc CREDITS README.pod || die
-
-	if use doc; then
-		dodoc -r docs/* || die
-	fi
-}

diff --git a/dev-lang/rakudo/rakudo-2016.01.1.ebuild b/dev-lang/rakudo/rakudo-2016.01.1.ebuild
deleted file mode 100644
index 8c17dfb..0000000
--- a/dev-lang/rakudo/rakudo-2016.01.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="test"
-
-RDEPEND="=dev-lang/nqp-2016.01:=[moar]"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10"
-
-#PATCHES=(${FILESDIR}/${PV})
-
-src_configure() {
-	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
-}
-
-src_test() {
-	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
-	default
-}

diff --git a/dev-lang/rakudo/rakudo-2016.02.ebuild b/dev-lang/rakudo/rakudo-2016.02.ebuild
deleted file mode 100644
index 623e8f4..0000000
--- a/dev-lang/rakudo/rakudo-2016.02.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="test"
-
-RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10"
-
-#PATCHES=(${FILESDIR}/${PV})
-
-src_configure() {
-	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
-}
-
-src_test() {
-	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
-	default
-}

diff --git a/dev-lang/rakudo/rakudo-2016.03.ebuild b/dev-lang/rakudo/rakudo-2016.03.ebuild
deleted file mode 100644
index 623e8f4..0000000
--- a/dev-lang/rakudo/rakudo-2016.03.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="test"
-
-RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10"
-
-#PATCHES=(${FILESDIR}/${PV})
-
-src_configure() {
-	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
-}
-
-src_test() {
-	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
-	default
-}

diff --git a/dev-lang/rakudo/rakudo-2016.04-r1.ebuild b/dev-lang/rakudo/rakudo-2016.04-r1.ebuild
deleted file mode 100644
index 7421cad..0000000
--- a/dev-lang/rakudo/rakudo-2016.04-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit java-pkg-opt-2
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="clang java +moar test"
-REQUIRED_USE="|| ( java moar )"
-
-CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java=,moar=,clang=]"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.7:* )"
-
-DEPEND="${CDEPEND}
-	clang? ( sys-devel/clang )
-	java? ( >=virtual/jdk-1.7:* )
-	>=dev-lang/perl-5.10"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2016.04-Makefile.in.patch"
-	"${FILESDIR}/${PN}-jna-lib.patch"
-)
-
-src_prepare() {
-	eapply "${PATCHES[@]}"
-
-	# yup, this is ugly. but emake doesn't respect DESTDIR.
-	for i in Moar JVM; do
-		echo "DESTDIR   = ${D}" > "${T}/Makefile-${i}.in" || die
-		cat "${S}/tools/build/Makefile-${i}.in" >> "${T}/Makefile-${i}.in" || die
-		mv "${T}/Makefile-${i}.in" "${S}/tools/build/Makefile-${i}.in" || die
-	done
-
-	eapply_user
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local backends
-	use java && backends+="jvm,"
-	use moar && backends+="moar,"
-
-	local myargs=(
-		"--prefix=/usr"
-		"--sysroot=/"
-		"--sdkroot=/"
-		"--backends=${backends}"
-	)
-
-	perl Configure.pl "${myargs[@]}"
-
-	if use java; then
-		NQP=$(java-pkg_getjars --with-dependencies nqp)
-	fi
-}
-
-src_compile() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
-}
-
-src_test() {
-	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
-}

diff --git a/dev-lang/rakudo/rakudo-2016.04.ebuild b/dev-lang/rakudo/rakudo-2016.04.ebuild
deleted file mode 100644
index 4903a0a..0000000
--- a/dev-lang/rakudo/rakudo-2016.04.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-DESCRIPTION="A compiler for the Perl 6 programming language"
-HOMEPAGE="http://rakudo.org"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# TODO: add USE="javascript" once that's usable in nqp
-IUSE="test"
-
-RDEPEND="=dev-lang/nqp-${PV}:=[moar]"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10"
-
-src_configure() {
-	perl Configure.pl --prefix=/usr --sysroot=/usr --backends=moar
-}
-
-src_test() {
-	export RAKUDO_PRECOMP_PREFIX=$(mktemp -d)
-	default
-}

diff --git a/tools/chroot-here.sh b/tools/chroot-here.sh
index b8721b3..408fef4 100755
--- a/tools/chroot-here.sh
+++ b/tools/chroot-here.sh
@@ -199,12 +199,12 @@ cp -v /etc/resolv.conf etc/ || quit "Couldn't copy resolv.conf"
 if [[ ${ARCH_FULL} != x86 && ${ARCH} != amd64 ]]; then
   cp -v "${QEMU_BIN}" ".$(dirname "${QEMU_BIN}")" || quit "Couldn't copy qemu binary."
 fi
-  cat <<EOF >> etc/portage/make.conf || quit "Couldn't write to etc/portage/make.conf."
-MAKEOPTS="-j5"
-EMERGE_DEFAULT_OPTS="--verbose --autounmask-write --nospinner --keep-going -j5 --load-average=5 --verbose-conflict"
-PYTHON_SINGLE_TARGET="python3_4"
-PYTHON_TARGETS="python2_7 python3_3 python3_4 python3_5 pypy pypy2"
-EOF
+  cat <<-EOF >> etc/portage/make.conf || quit "Couldn't write to etc/portage/make.conf."
+    MAKEOPTS="-j5"
+    EMERGE_DEFAULT_OPTS="--verbose --autounmask-write --nospinner --keep-going -j5 --load-average=5 --verbose-conflict"
+    PYTHON_SINGLE_TARGET="python3_4"
+    PYTHON_TARGETS="python2_7 python3_3 python3_4 python3_5 pypy pypy2"
+  EOF
 if [[ ${ARCH_FULL} == x86 ]]; then
   PS1="chroot${PS1}" linux32 chroot ./ /bin/bash --login || quit "Chrooting failed."
 else