From a67d266a87cd3e0b5c64ea4fc2d52d8134dd997a Mon Sep 17 00:00:00 2001 From: Matthew Brewer Date: Sun, 5 Jun 2016 13:02:06 +0200 Subject: remove perl6 ebuilds from overlay since it got pushed to ::gentoo --- dev-lang/moarvm/Manifest | 2 - dev-lang/moarvm/files/Configure-2016.04.patch | 145 -------------- dev-lang/moarvm/metadata.xml | 27 --- dev-lang/moarvm/moarvm-2016.04-r2.ebuild | 63 ------ dev-lang/moarvm/moarvm-2016.05.ebuild | 63 ------ dev-lang/moarvm/moarvm-9999.ebuild | 63 ------ dev-lang/nqp/Manifest | 2 - dev-lang/nqp/files/enable-external-jars.patch | 214 --------------------- dev-lang/nqp/metadata.xml | 23 --- dev-lang/nqp/nqp-2016.04-r3.ebuild | 161 ---------------- dev-lang/nqp/nqp-2016.05.ebuild | 160 --------------- dev-lang/nqp/nqp-9999.ebuild | 160 --------------- dev-lang/rakudo/Manifest | 1 - .../rakudo/files/rakudo-2016.04-Makefile.in.patch | 17 -- dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch | 21 -- dev-lang/rakudo/metadata.xml | 20 -- dev-lang/rakudo/rakudo-2016.04-r2.ebuild | 84 -------- dev-lang/rakudo/rakudo-2016.05.ebuild | 80 -------- dev-lang/rakudo/rakudo-9999.ebuild | 80 -------- 19 files changed, 1386 deletions(-) delete mode 100644 dev-lang/moarvm/Manifest delete mode 100644 dev-lang/moarvm/files/Configure-2016.04.patch delete mode 100644 dev-lang/moarvm/metadata.xml delete mode 100644 dev-lang/moarvm/moarvm-2016.04-r2.ebuild delete mode 100644 dev-lang/moarvm/moarvm-2016.05.ebuild delete mode 100644 dev-lang/moarvm/moarvm-9999.ebuild delete mode 100644 dev-lang/nqp/Manifest delete mode 100644 dev-lang/nqp/files/enable-external-jars.patch delete mode 100644 dev-lang/nqp/metadata.xml delete mode 100644 dev-lang/nqp/nqp-2016.04-r3.ebuild delete mode 100644 dev-lang/nqp/nqp-2016.05.ebuild delete mode 100644 dev-lang/nqp/nqp-9999.ebuild delete mode 100644 dev-lang/rakudo/Manifest delete mode 100644 dev-lang/rakudo/files/rakudo-2016.04-Makefile.in.patch delete mode 100644 dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch delete mode 100644 dev-lang/rakudo/metadata.xml delete mode 100644 dev-lang/rakudo/rakudo-2016.04-r2.ebuild delete mode 100644 dev-lang/rakudo/rakudo-2016.05.ebuild delete mode 100644 dev-lang/rakudo/rakudo-9999.ebuild diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest deleted file mode 100644 index 8d79641..0000000 --- a/dev-lang/moarvm/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST MoarVM-2016.04.tar.gz 3332850 SHA256 6fe9000daada59535747f2557cc73573241ba8a6044271caf1647aa37be33c6d SHA512 ef22145c9f7c32d7d12192cee63f286544500adff40fc2dbaad677d57108bc6efedc348fe8ddf460fe12d2c6b282e885bcb74fb3bcaa1e06b7719754175afe7d WHIRLPOOL e314f80cd785d31768630798647d7f445831bb29aaded88ef32326df3f4705a5d3fba2da00fce6888a2256b57aeb838922e94c3096250d30112f2be2bfacbb92 -DIST MoarVM-2016.05.tar.gz 3343486 SHA256 d59e3b366cd788a9e9aaa747dc0883dc6f41d97cb76a8fb2815bd565ef75498a SHA512 0cc946962b56cd9075013074228cee008c98b43da9bdaadd8ce91aa06d94510df1c4a2877d36945aff30dada01f3bf66c0ef1028c59967d09c0aec662aa87f99 WHIRLPOOL 1681538cb1a2919bfb49e51fe29877392ee0900d38daed1bbdae92d57332de84888f6ecae3bfbfba5b8132f186ebdfa3151a7cd038f10538e09c97ddae953adc diff --git a/dev-lang/moarvm/files/Configure-2016.04.patch b/dev-lang/moarvm/files/Configure-2016.04.patch deleted file mode 100644 index 6fd46c2..0000000 --- a/dev-lang/moarvm/files/Configure-2016.04.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff --git a/Configure.pl b/Configure.pl -index 72a5dad..f829d5c 100755 ---- a/Configure.pl -+++ b/Configure.pl -@@ -32,7 +32,7 @@ GetOptions(\%args, qw( - os=s shell=s toolchain=s compiler=s - ar=s cc=s ld=s make=s has-sha has-libuv - static has-libtommath has-libatomic_ops -- has-dyncall has-libffi -+ has-dyncall has-libffi pkgconfig=s - build=s host=s big-endian jit! enable-jit lua=s has-dynasm - prefix=s bindir=s libdir=s mastdir=s make-install asan ubsan), - 'no-optimize|nooptimize' => sub { $args{optimize} = 0 }, -@@ -99,6 +99,7 @@ $config{config} = join ' ', map { / / ? "\"$_\"" : $_ } @args; - $config{osname} = $^O; - $config{osvers} = $Config{osvers}; - $config{lua} = $args{lua} // './3rdparty/dynasm/minilua@exe@'; -+$config{pkgconfig} = $args{pkgconfig} // '/usr/bin/pkg-config'; - - # set options that take priority over all others - my @keys = qw( ar cc ld make ); -@@ -164,12 +165,33 @@ if (-e '3rdparty/libuv/src/unix/threadpool' . $defaults{obj} - system($defaults{make}, 'realclean') - } - -+# test whether pkg-config works -+if (-e "$config{pkgconfig}") { -+ print("\nTesting pkgconfig ... "); -+ system("$config{pkgconfig}", "--version"); -+ if ( $? == 0 ) { -+ $config{pkgconfig_works} = 1; -+ } else { -+ $config{pkgconfig_works} = 0; -+ } -+} -+ - # conditionally set include dirs and install rules - $config{cincludes} //= ''; - $config{install} //= ''; - if ($args{'has-libuv'}) { - $defaults{-thirdparty}->{uv} = undef; - unshift @{$config{usrlibs}}, 'uv'; -+ if ($config{pkgconfig_works}) { -+ my $result = `$config{pkgconfig} --cflags libuv`; -+ if ( $? == 0 ) { -+ $result =~ s/\n/ /g; -+ $config{cincludes} .= ' ' . "$result"; -+ print("Adding extra include for libuv: $result\n"); -+ } else { -+ print("Error occured when running $config{pkgconfig} --cflags libuv.\n"); -+ } -+ } - } - else { - $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libuv/include' -@@ -181,6 +203,16 @@ else { - if ($args{'has-libatomic_ops'}) { - $defaults{-thirdparty}->{lao} = undef; - unshift @{$config{usrlibs}}, 'atomic_ops'; -+ if ($config{pkgconfig_works}) { -+ my $result = `$config{pkgconfig} --cflags atomic_ops`; -+ if ( $? == 0 ) { -+ $result =~ s/\n/ /g; -+ $config{cincludes} .= ' ' . "$result"; -+ print("Adding extra include for atomic_ops: $result\n"); -+ } else { -+ print("Error occured when running $config{pkgconfig} --cflags atomic_ops.\n"); -+ } -+ } - } - else { - $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libatomic_ops/src'; -@@ -216,7 +248,8 @@ if ($args{'has-libtommath'}) { - } - else { - $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libtommath'; -- $config{install} .= "\t\$(CP) 3rdparty/libtommath/*.h \$(DESTDIR)\$(PREFIX)/include/libtommath\n"; -+ $config{install} .= "\t\$(MKPATH) \$(DESTDIR)\$(PREFIX)/include/libtommath\n" -+ . "\t\$(CP) 3rdparty/libtommath/*.h \$(DESTDIR)\$(PREFIX)/include/libtommath\n"; - } - - if ($args{'has-dynasm'}) { -@@ -232,6 +265,16 @@ if ($args{'has-libffi'}) { - $config{nativecall_backend} = 'libffi'; - unshift @{$config{usrlibs}}, 'ffi'; - push @{$config{defs}}, 'HAVE_LIBFFI'; -+ if ($config{pkgconfig_works}) { -+ my $result = `$config{pkgconfig} --cflags libffi`; -+ if ( $? == 0 ) { -+ $result =~ s/\n/ /g; -+ $config{cincludes} .= ' ' . "$result"; -+ print("Adding extra include for libffi: $result\n"); -+ } else { -+ print("Error occured when running $config{pkgconfig} --cflags libffi.\n"); -+ } -+ } - } - elsif ($args{'has-dyncall'}) { - unshift @{$config{usrlibs}}, 'dyncall_s', 'dyncallback_s', 'dynload_s'; -@@ -364,6 +407,7 @@ my $order = $config{be} ? 'big endian' : 'little endian'; - print "\n", < '-fPIC', - ldshared => '-shared @ccshared@', - moarshared => '', -- ldrpath => '-Wl,-rpath,@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib', -+ ldrpath => '-Wl,-rpath,/@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib', - - arflags => 'rcs', - arout => '', diff --git a/dev-lang/moarvm/metadata.xml b/dev-lang/moarvm/metadata.xml deleted file mode 100644 index 3e0f367..0000000 --- a/dev-lang/moarvm/metadata.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - - tomboy64@sina.cn - Matthew Brewer - - - perl@gentoo.org - Gentoo Perl Project - - - Enable clang's Address Sanitizer functionality. Expect longer compile time. - Use clang compiler instead of GCC - Enable Just-In-Time-Compiler. Has no effect except on AMD64 and Darwin. - Enable optimization via CFLAGS - Link against the system's shared libraries - Enable clang's Undefined Behavior Sanitizer functionality. Expect longer compile time. - - - MoarVM/MoarVM - - diff --git a/dev-lang/moarvm/moarvm-2016.04-r2.ebuild b/dev-lang/moarvm/moarvm-2016.04-r2.ebuild deleted file mode 100644 index 6c0815b..0000000 --- a/dev-lang/moarvm/moarvm-2016.04-r2.ebuild +++ /dev/null @@ -1,63 +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="http://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 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_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--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 ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2016.05.ebuild b/dev-lang/moarvm/moarvm-2016.05.ebuild deleted file mode 100644 index 6c0815b..0000000 --- a/dev-lang/moarvm/moarvm-2016.05.ebuild +++ /dev/null @@ -1,63 +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="http://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 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_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--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 ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild deleted file mode 100644 index 6c0815b..0000000 --- a/dev-lang/moarvm/moarvm-9999.ebuild +++ /dev/null @@ -1,63 +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="http://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 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_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libtommath" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--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 ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest deleted file mode 100644 index 3bbe823..0000000 --- a/dev-lang/nqp/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 -DIST nqp-2016.05.tar.gz 5159647 SHA256 7fdd76322383632783b4352e8fab144c3d68acbfda5112c1f178d8909277f616 SHA512 c81d2f6ef13fad36ed863869c985049a5e1daa04e979449fbbd3b5b365ff58430711f6a7ed5ac10ff61fe6a78d4f960f76ade7445ecb82eb3100882449747a61 WHIRLPOOL 119237accc6723db4afa27cdbb1409e9d11a572bf24fbd83e8bed3c507193bf2199bb5a1e8a27052d922040892f5ce35ffd30640218bbc15167fff88e70941c7 diff --git a/dev-lang/nqp/files/enable-external-jars.patch b/dev-lang/nqp/files/enable-external-jars.patch deleted file mode 100644 index cf5d4bd..0000000 --- a/dev-lang/nqp/files/enable-external-jars.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff --git a/Configure.pl b/Configure.pl -index 2064ac8..73e2d27 100755 ---- a/Configure.pl -+++ b/Configure.pl -@@ -34,6 +34,7 @@ MAIN: { - 'no-clean', - 'with-parrot=s', 'gen-parrot:s', 'parrot-config=s', 'parrot-option=s@', - 'with-moar=s', 'gen-moar:s', 'moar-option=s@', -+ 'with-asm=s', 'with-asm-tree=s', 'with-jline=s', 'with-jna=s', - 'make-install!', 'makefile-timing!', - 'git-protocol=s', - 'git-depth=s', 'git-reference=s',); -@@ -50,6 +51,53 @@ MAIN: { - "Use --prefix to specify a directory in which parrot is installed."; - } - -+ if ($options{'with-asm'}) { -+ if ($options{'with-asm'} ne '-') { -+ $config{'asm'} = $options{'with-asm'}; -+ } -+ } else { -+ $config{'asm'} = "3rdparty/asm/asm-4.1.jar"; -+ } -+ if ($options{'with-asm-tree'}) { -+ if ($options{'with-asm-tree'} ne '-') { -+ $config{'asmtree'} = $options{'with-asm-tree'}; -+ } -+ } else { -+ $config{'asmtree'} = "3rdparty/asm/asm-tree-4.1.jar"; -+ } -+ if ($options{'with-jline'}) { -+ if ($options{'with-jline'} ne '-') { -+ $config{'jline'} = $options{'with-jline'}; -+ } -+ } else { -+ $config{'jline'} = "3rdparty/jline/jline-1.0.jar"; -+ } -+ if ($options{'with-jna'}) { -+ if ($options{'with-jna'} ne '-') { -+ $config{'jna'} = $options{'with-jna'}; -+ } -+ } else { -+ $config{'jna'} = "3rdparty/jna/jna.jar"; -+ } -+ -+ if ($^O eq 'MSWin32') { -+ $config{'asmfile'} = $config{'asm'}; -+ $config{'asmfile'} =~ s/.*\\//; -+ $config{'jlinefile'} = $config{'jline'}; -+ $config{'jlinefile'} =~ s/.*\\//; -+ } else { -+ $config{'asmfile'} = $config{'asm'}; -+ $config{'asmfile'} =~ s/.*\///; -+ $config{'jlinefile'} = $config{'jline'}; -+ $config{'jlinefile'} =~ s/.*\///; -+ } -+ -+ fill_template_file( -+ 'tools/build/install-jvm-runner.pl.in', -+ 'tools/build/install-jvm-runner.pl', -+ %config, -+ ); -+ - my $default_backend; - my @backends; - my %backends; -@@ -357,6 +405,11 @@ General Options: - --gen-moar Download and build a copy of MoarVM to use - --moar-option='--option=value' - Options to pass to MoarVM configuration for --gen-moar -+ --with-asm='/path/to/jar' -+ --with-asm-tree='/path/to/jar' -+ --with-jline='/path/to/jar' -+ --with-jna='/path/to/jar' -+ Provide paths to already installed jars - --git-protocol={ssh,https,git} - Protocol to use for git clone. Default: https - --make-install Immediately run `MAKE install` after configuring -diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in -index 27959ad..c19965a 100644 ---- a/tools/build/Makefile-JVM.in -+++ b/tools/build/Makefile-JVM.in -@@ -2,7 +2,6 @@ BAT = @bat@ - JAVA = java - JAVAC = javac - JAR = jar --ASM = 3rdparty/asm/ - J_RUNNER = nqp-j$(BAT) - - NQP_JAR_DIR = $(NQP_LANG_DIR)/runtime -@@ -18,7 +17,11 @@ RUNTIME_JAVAS = \ - - RUNTIME_JAR = nqp-runtime.jar - --THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar@cpsep@3rdparty/jna/jna.jar -+ASM = @asm@ -+ASMTREE = @asmtree@ -+JLINE = @jline@ -+JNA = @jna@ -+THIRDPARTY_JARS = $(ASM)@cpsep@$(ASMTREE)@cpsep@$(JLINE)@cpsep@$(JNA) - J_STAGE0 = src/vm/jvm/stage0 - J_STAGE1 = $(JVM_BUILD_DIR)/stage1 - J_STAGE2 = $(JVM_BUILD_DIR)/stage2 -@@ -80,8 +83,8 @@ j-install: j-all - $(MKPATH) $(DESTDIR)$(BIN_DIR) - $(MKPATH) $(DESTDIR)$(NQP_JAR_DIR) - $(MKPATH) $(DESTDIR)$(NQP_LIB_DIR) -- $(CP) 3rdparty/asm/asm-4.1.jar 3rdparty/asm/asm-tree-4.1.jar $(DESTDIR)$(NQP_JAR_DIR) -- $(CP) 3rdparty/jline/jline-1.0.jar 3rdparty/jna/jna.jar $(DESTDIR)$(NQP_JAR_DIR) -+ $(CP) $(ASM) $(ASMTREE) $(DESTDIR)$(NQP_JAR_DIR) -+ $(CP) $(JLINE) $(JNA) $(DESTDIR)$(NQP_JAR_DIR) - $(CP) $(RUNTIME_JAR) $(DESTDIR)$(NQP_JAR_DIR) - $(CP) $(NQP_MO_JAR) $(MODULE_LOADER_JAR) $(DESTDIR)$(NQP_LIB_DIR) - $(CP) $(CORE_SETTING_JAR) $(QASTNODE_JAR) $(QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR) -diff --git a/tools/build/install-jvm-runner.pl b/tools/build/install-jvm-runner.pl -deleted file mode 100644 -index 14541d6..0000000 ---- a/tools/build/install-jvm-runner.pl -+++ /dev/null -@@ -1,44 +0,0 @@ --#!/usr/bin/perl --# Copyright (C) 2013, The Perl Foundation. -- --use strict; --use warnings; --use 5.008; --use File::Spec; -- --my ($destdir, $prefix) = @ARGV; --my $realpath = $destdir.$prefix; -- --unless (File::Spec->file_name_is_absolute($prefix)) { -- $prefix = File::Spec->rel2abs($prefix); --} -- --if ($^O eq 'MSWin32') { -- my $jar_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'runtime'); -- my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib'); -- my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j.bat'); -- -- open my $fh, ">", $install_to -- or die "Could not open $install_to: $!"; -- print $fh '@java -Xss1m -Xmx512m -Xbootclasspath/a:' . $jar_dir . '\\nqp-runtime.jar;' . -- "$jar_dir\\asm-4.1.jar;$jar_dir\\jline-1.0.jar;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n"; -- close $fh -- or die "Could not close $install_to: $!"; --} --else { -- my $nqp_dir = File::Spec->catfile($prefix, qw/share nqp/); -- my $jar_dir = File::Spec->catfile('${NQP_DIR}', 'runtime'); -- my $lib_dir = File::Spec->catfile('${NQP_DIR}', 'lib'); -- my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/asm-4.1.jar:$jar_dir/jline-1.0.jar:$lib_dir/nqp.jar"; -- my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j'); -- -- open my $fh, ">", $install_to -- or die "Could not open $install_to: $!"; -- print $fh "#!/bin/sh\n"; -- print $fh ": \${NQP_DIR:=\"$nqp_dir\"}\n"; -- print $fh ": \${NQP_JARS:=\"$jars\"}\n"; -- print $fh "exec java -Xss1m -Xmx512m -Xbootclasspath/a:\${NQP_JARS} -cp $lib_dir nqp \"\$\@\"\n"; -- close $fh -- or die "Could not close $install_to: $!"; -- chmod 0755, $install_to; --} -diff --git a/tools/build/install-jvm-runner.pl.in b/tools/build/install-jvm-runner.pl.in -new file mode 100644 -index 0000000..92a1109 ---- /dev/null -+++ b/tools/build/install-jvm-runner.pl.in -@@ -0,0 +1,44 @@ -+#!/usr/bin/perl -+# Copyright (C) 2013, The Perl Foundation. -+ -+use strict; -+use warnings; -+use 5.008; -+use File::Spec; -+ -+my ($destdir, $prefix) = @ARGV; -+my $realpath = $destdir.$prefix; -+ -+unless (File::Spec->file_name_is_absolute($prefix)) { -+ $prefix = File::Spec->rel2abs($prefix); -+} -+ -+if ($^O eq 'MSWin32') { -+ my $jar_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'runtime'); -+ my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib'); -+ my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j.bat'); -+ -+ open my $fh, ">", $install_to -+ or die "Could not open $install_to: $!"; -+ print $fh '@java -Xss1m -Xmx512m -Xbootclasspath/a:' . $jar_dir . '\\nqp-runtime.jar;' . -+ "$jar_dir\\@asmfile@;$jar_dir\\@jlinefile@;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n"; -+ close $fh -+ or die "Could not close $install_to: $!"; -+} -+else { -+ my $nqp_dir = File::Spec->catfile($prefix, qw/share nqp/); -+ my $jar_dir = File::Spec->catfile('${NQP_DIR}', 'runtime'); -+ my $lib_dir = File::Spec->catfile('${NQP_DIR}', 'lib'); -+ my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/@asmfile@:$jar_dir/@jlinefile@:$lib_dir/nqp.jar"; -+ my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j'); -+ -+ open my $fh, ">", $install_to -+ or die "Could not open $install_to: $!"; -+ print $fh "#!/bin/sh\n"; -+ print $fh ": \${NQP_DIR:=\"$nqp_dir\"}\n"; -+ print $fh ": \${NQP_JARS:=\"$jars\"}\n"; -+ print $fh "exec java -Xss1m -Xmx512m -Xbootclasspath/a:\${NQP_JARS} -cp $lib_dir nqp \"\$\@\"\n"; -+ close $fh -+ or die "Could not close $install_to: $!"; -+ chmod 0755, $install_to; -+} diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml deleted file mode 100644 index 7d0e9d2..0000000 --- a/dev-lang/nqp/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - - tomboy64@sina.cn - Matthew Brewer - - - perl@gentoo.org - Gentoo Perl Project - - - Toggle usage of the clang compiler in conjunction with MoarVM - Build the MoarVM backend (experimental/broken) - - - perl6/nqp - - diff --git a/dev-lang/nqp/nqp-2016.04-r3.ebuild b/dev-lang/nqp/nqp-2016.04-r3.ebuild deleted file mode 100644 index 35e745f..0000000 --- a/dev-lang/nqp/nqp-2016.04-r3.ebuild +++ /dev/null @@ -1,161 +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 multibuild - -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="~amd64 ~x86" -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=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" -PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream 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_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # 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 - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-2016.05.ebuild b/dev-lang/nqp/nqp-2016.05.ebuild deleted file mode 100644 index fe2ace6..0000000 --- a/dev-lang/nqp/nqp-2016.05.ebuild +++ /dev/null @@ -1,160 +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 multibuild - -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="~amd64 ~x86" -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=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream 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_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # 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 - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/nqp/nqp-9999.ebuild b/dev-lang/nqp/nqp-9999.ebuild deleted file mode 100644 index fe2ace6..0000000 --- a/dev-lang/nqp/nqp-9999.ebuild +++ /dev/null @@ -1,160 +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 multibuild - -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="~amd64 ~x86" -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=] )" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.7 )" -DEPEND="${CDEPEND} - clang? ( sys-devel/clang ) - java? ( >=virtual/jdk-1.7 ) - dev-lang/perl" - -pkg_pretend() { - if has_version dev-lang/rakudo || has_version dev-lang/nqp; then - ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP" - ewarn "already being installed. So if it fails, try uninstalling both" - ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -java_prepare() { - # Don't clean stage0 jars. - einfo "Cleaning upstream 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_prepare() { - MULTIBUILD_VARIANTS=() - use moar && MULTIBUILD_VARIANTS+=( moar ) - use java && MULTIBUILD_VARIANTS+=( jvm ) - - multibuild_copy_sources - - # This will pull in conditional java_prepare - default -} - -nqp_configure() { - pushd "${BUILD_DIR}" > /dev/null || die - local myconfargs=( - "--backend=${MULTIBUILD_VARIANT}" - "--prefix=/usr" ) - - perl Configure.pl "${myconfargs[@]}" || die - popd || die -} - -nqp_compile() { - if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then - emake -j1 \ - -C "${BUILD_DIR}" \ - THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \ - JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)" - elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then - emake -j1 \ - -C "${BUILD_DIR}" - fi -} - -nqp_test() { - emake -j1 \ - -C "${BUILD_DIR}" \ - test -} - -nqp_install() { - # This is the actual reason we need multibuild.eclass. - # We need to distinguish the install procedure for MoarVM and JVM backends. - case "${MULTIBUILD_VARIANT}" in - moar) - emake \ - DESTDIR="${ED}" \ - -C "${BUILD_DIR}" \ - install - ;; - jvm) - pushd "${BUILD_DIR}" > /dev/null || die - # 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 - popd > /dev/null || die - ;; - *) - die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}." - ;; - esac -} - -src_configure() { - multibuild_foreach_variant nqp_configure -} - -src_compile() { - multibuild_foreach_variant nqp_compile -} - -src_test() { - multibuild_foreach_variant nqp_test -} - -src_install() { - multibuild_foreach_variant nqp_install - - dodoc CREDITS README.pod - use doc && dodoc -r docs/* -} diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest deleted file mode 100644 index eb9ab2e..0000000 --- a/dev-lang/rakudo/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST rakudo-2016.05.tar.gz 2786506 SHA256 f3b3236c22ff75427c87dea1fab1dc9a0b4ca3a97296e64a14c3f2695be7a28a SHA512 524a71fa72fc04ed8a04eebe319d68c051d45082ae4ce0894a34b2c08d5dd1f270fd380ffb9a486c1cbad7df20dd96180a11642dc20f2ef343a386ce9df42ac8 WHIRLPOOL 000c74d0c0c26517b2324a20e91d304fafbf4953e028683b84599cc0508e4d79c8324dd78c95fb456e46163b52bb5615e30ec034813df10c8762a3362ae77fae diff --git a/dev-lang/rakudo/files/rakudo-2016.04-Makefile.in.patch b/dev-lang/rakudo/files/rakudo-2016.04-Makefile.in.patch deleted file mode 100644 index adafa0d..0000000 --- a/dev-lang/rakudo/files/rakudo-2016.04-Makefile.in.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in ---- a/tools/build/Makefile-Moar.in 2016-02-02 14:27:13.000000000 +0100 -+++ b/tools/build/Makefile-Moar.in 2016-04-22 15:01:35.338534944 +0200 -@@ -87,11 +87,11 @@ - $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \ - -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \ - -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \ -- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC) -+ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC) - $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \ - -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \ - -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \ -- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC) -+ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC) - $(M_LD) @moar::ldswitch@ -L@moar::libdir@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) -lmoar @moarimplib@ - - $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp diff --git a/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch deleted file mode 100644 index 3f4532f..0000000 --- a/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch +++ /dev/null @@ -1,21 +0,0 @@ -Upstream uses -Xbootclasspath, which prevents us from using -LD_LIBRARY_PATH, thefore we need to set jna.boot.library.path. -See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4285197. - -Chewi -2016/05/15 - -diff -Naur rakudo-2016.04.orig/tools/build/create-jvm-runner.pl rakudo-2016.04/tools/build/create-jvm-runner.pl ---- rakudo-2016.04.orig/tools/build/create-jvm-runner.pl 2015-12-25 19:23:19.000000000 +0000 -+++ rakudo-2016.04/tools/build/create-jvm-runner.pl 2016-05-15 11:30:37.488085661 +0100 -@@ -60,7 +60,10 @@ - } - - my $classpath = join($cpsep, ($jardir, $libdir, $nqplibdir)); -+my $jna_lib = `java-config --query LIBRARY_PATH --package jna-4`; -+chomp $jna_lib; - my $jopts = '-noverify -Xms100m -Xbootclasspath/a:' . $perl6jars -+ . ' -Djna.boot.library.path=' . $jna_lib - . ' -cp ' . ($^O eq 'MSWin32' ? '"%CLASSPATH%";' : '$CLASSPATH:') . $classpath - . ' -Dperl6.prefix=' . $prefix - . ' -Djna.library.path=' . $sharedir diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml deleted file mode 100644 index 4d1883d..0000000 --- a/dev-lang/rakudo/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - patrick@gentoo.org - Patrick Lauer - - - tomboy64@sina.cn - Matthew Brewer - - - perl@gentoo.org - Gentoo Perl Project - - - Use Clang to compile the MoarVM backend - Use the MoarVM as backend - - diff --git a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild b/dev-lang/rakudo/rakudo-2016.04-r2.ebuild deleted file mode 100644 index 18eb631..0000000 --- a/dev-lang/rakudo/rakudo-2016.04-r2.ebuild +++ /dev/null @@ -1,84 +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 - -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=] - >=dev-lang/nqp-2016.04-r3" -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}/${P}-jna-lib.patch" -) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - 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.05.ebuild b/dev-lang/rakudo/rakudo-2016.05.ebuild deleted file mode 100644 index 821e32f..0000000 --- a/dev-lang/rakudo/rakudo-2016.05.ebuild +++ /dev/null @@ -1,80 +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 - -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-jna-lib.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - 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-9999.ebuild b/dev-lang/rakudo/rakudo-9999.ebuild deleted file mode 100644 index 821e32f..0000000 --- a/dev-lang/rakudo/rakudo-9999.ebuild +++ /dev/null @@ -1,80 +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 - -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-jna-lib.patch" ) - -pkg_pretend() { - if has_version dev-lang/rakudo; then - ewarn "Rakudo is known to fail compilation/installation with Rakudo" - ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo," - ewarn "then do a new installation." - ewarn "(see Bug #584394)" - fi -} - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user -} - -src_configure() { - local backends - use moar && backends+="moar," - use java && backends+="jvm" - - local myargs=( - "--prefix=/usr" - "--sysroot=/" - "--sdkroot=/" - "--backends=${backends}" - ) - - perl Configure.pl "${myargs[@]}" || die - - 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 -} -- cgit v1.2.3-65-gdbad