commit: a4ce1918e55a1e927dd1280714e241fa8cd47d90
Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Wed Jun 1 15:48:29 2016 +0000
Commit: M. B. <tomboy64 <AT> sina <DOT> cn>
CommitDate: Wed Jun 1 15:49:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=a4ce1918
update perl6 stuffs (moarvm this time)
...{moarvm-2016.04-r1.ebuild => moarvm-2016.04-r2.ebuild} | 10 +++++-----
dev-lang/moarvm/moarvm-2016.05.ebuild | 12 +++++++-----
dev-lang/moarvm/moarvm-9999.ebuild | 12 +++++++-----
profiles/base/package.use.mask | 15 ---------------
profiles/package.use.mask | 3 +++
5 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/dev-lang/moarvm/moarvm-2016.04-r1.ebuild
b/dev-lang/moarvm/moarvm-2016.04-r2.ebuild
similarity index 85%
rename from dev-lang/moarvm/moarvm-2016.04-r1.ebuild
rename to dev-lang/moarvm/moarvm-2016.04-r2.ebuild
index 30b7f13..6c0815b 100644
--- a/dev-lang/moarvm/moarvm-2016.04-r1.ebuild
+++ b/dev-lang/moarvm/moarvm-2016.04-r2.ebuild
@@ -22,7 +22,7 @@ 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"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
RDEPEND="dev-libs/libatomic_ops
dev-libs/libtommath
@@ -44,6 +44,10 @@ 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)"
@@ -51,10 +55,6 @@ src_configure() {
"$(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*'
diff --git a/dev-lang/moarvm/moarvm-2016.05.ebuild
b/dev-lang/moarvm/moarvm-2016.05.ebuild
index f6c45bd..6c0815b 100644
--- a/dev-lang/moarvm/moarvm-2016.05.ebuild
+++ b/dev-lang/moarvm/moarvm-2016.05.ebuild
@@ -22,7 +22,7 @@ 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"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
RDEPEND="dev-libs/libatomic_ops
dev-libs/libtommath
@@ -33,6 +33,8 @@ RDEPEND="dev-libs/libatomic_ops
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
@@ -42,6 +44,10 @@ 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)"
@@ -49,10 +55,6 @@ src_configure() {
"$(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*'
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild
b/dev-lang/moarvm/moarvm-9999.ebuild
index f6c45bd..6c0815b 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -22,7 +22,7 @@ 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"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
RDEPEND="dev-libs/libatomic_ops
dev-libs/libtommath
@@ -33,6 +33,8 @@ RDEPEND="dev-libs/libatomic_ops
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
@@ -42,6 +44,10 @@ 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)"
@@ -49,10 +55,6 @@ src_configure() {
"$(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*'
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
deleted file mode 100644
index c6b4f3e..0000000
--- a/profiles/base/package.use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# This file requires >=portage-2.1.1
-# New entries go on top.
-
-# Matthew Brewer <[email protected]> (21 Apr 2016)
-# Upstream supports using Clang's address sanitizer, but apparently
-# invokes it wrong.
-dev-lang/moarvm asan
-
-# Johannes Huber <[email protected]> (21 Apr 2016)
-# Unreleased dependency.
-
diff --git a/profiles/package.use.mask b/profiles/package.use.mask
new file mode 100644
index 0000000..997fb40
--- /dev/null
+++ b/profiles/package.use.mask
@@ -0,0 +1,3 @@
+dev-lang/rakudo java
+=dev-lang/moarvm-2016.04* asan
+
