dev-lang/moarvm: Fix dependency on libtommath-1.0 re bugs #608548 and #576284

Upstream has used a bundled copy of libtommath at version 1.0 since
version 2016.02, but we use system copies, and so, which end users
who are running full ~arch would have gotten a working version by
fortunate accident.

An -r1 bump is required here, as dependency propagation must replicate,
even for people who already have compile working, as users must be
discouraged fron downgrading libtommath if they try to do partial
reversion to 'arch'

Thanks to the patient reporters and commenters on the related bugs.

Bug: https://bugs.gentoo.org/576284
Bug: https://bugs.gentoo.org/608548
Package-Manager: Portage-2.3.6, Repoman-2.3.2

15 files changed, 311 insertions, 311 deletions

diff --git a/dev-lang/moarvm/moarvm-2017.02.ebuild b/dev-lang/moarvm/moarvm-2016.10-r1.ebuild
index 44513e80382d..f119a7ae28bc 100644
--- a/dev-lang/moarvm/moarvm-2017.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2016.10-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
+		>=dev-libs/libtommath-1.0
 		dev-libs/libuv
 		jit? ( dev-lang/lua:0[deprecated]
 			dev-lua/LuaBitOp )
diff --git a/dev-lang/moarvm/moarvm-2016.10.ebuild b/dev-lang/moarvm/moarvm-2016.10.ebuild
deleted file mode 100644
index 67393ca666f6..000000000000
--- a/dev-lang/moarvm/moarvm-2016.10.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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-2017.03.ebuild b/dev-lang/moarvm/moarvm-2016.11-r1.ebuild
index 44513e80382d..f119a7ae28bc 100644
--- a/dev-lang/moarvm/moarvm-2017.03.ebuild
+++ b/dev-lang/moarvm/moarvm-2016.11-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
+		>=dev-libs/libtommath-1.0
 		dev-libs/libuv
 		jit? ( dev-lang/lua:0[deprecated]
 			dev-lua/LuaBitOp )
diff --git a/dev-lang/moarvm/moarvm-2016.11.ebuild b/dev-lang/moarvm/moarvm-2016.11.ebuild
deleted file mode 100644
index 67393ca666f6..000000000000
--- a/dev-lang/moarvm/moarvm-2016.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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-2017.04.ebuild b/dev-lang/moarvm/moarvm-2016.12-r1.ebuild
index 44513e80382d..f119a7ae28bc 100644
--- a/dev-lang/moarvm/moarvm-2017.04.ebuild
+++ b/dev-lang/moarvm/moarvm-2016.12-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
+		>=dev-libs/libtommath-1.0
 		dev-libs/libuv
 		jit? ( dev-lang/lua:0[deprecated]
 			dev-lua/LuaBitOp )
diff --git a/dev-lang/moarvm/moarvm-2016.12.ebuild b/dev-lang/moarvm/moarvm-2016.12.ebuild
deleted file mode 100644
index 67393ca666f6..000000000000
--- a/dev-lang/moarvm/moarvm-2016.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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-2017.01.ebuild b/dev-lang/moarvm/moarvm-2017.01-r1.ebuild
index 44513e80382d..f119a7ae28bc 100644
--- a/dev-lang/moarvm/moarvm-2017.01.ebuild
+++ b/dev-lang/moarvm/moarvm-2017.01-r1.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
+		>=dev-libs/libtommath-1.0
 		dev-libs/libuv
 		jit? ( dev-lang/lua:0[deprecated]
 			dev-lua/LuaBitOp )
diff --git a/dev-lang/moarvm/moarvm-2017.02-r1.ebuild b/dev-lang/moarvm/moarvm-2017.02-r1.ebuild
new file mode 100644
index 000000000000..f119a7ae28bc
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.02-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.0
+		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"
+
+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-2017.03-r1.ebuild b/dev-lang/moarvm/moarvm-2017.03-r1.ebuild
new file mode 100644
index 000000000000..f119a7ae28bc
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.03-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.0
+		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"
+
+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-2017.04-r1.ebuild b/dev-lang/moarvm/moarvm-2017.04-r1.ebuild
new file mode 100644
index 000000000000..f119a7ae28bc
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.04-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.0
+		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"
+
+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-2017.05-r1.ebuild b/dev-lang/moarvm/moarvm-2017.05-r1.ebuild
new file mode 100644
index 000000000000..f119a7ae28bc
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.05-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.0
+		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"
+
+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-2017.05.ebuild b/dev-lang/moarvm/moarvm-2017.05.ebuild
deleted file mode 100644
index 44513e80382d..000000000000
--- a/dev-lang/moarvm/moarvm-2017.05.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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-2017.06-r1.ebuild b/dev-lang/moarvm/moarvm-2017.06-r1.ebuild
new file mode 100644
index 000000000000..f119a7ae28bc
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.06-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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-1.0
+		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"
+
+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-2017.06.ebuild b/dev-lang/moarvm/moarvm-2017.06.ebuild
deleted file mode 100644
index 44513e80382d..000000000000
--- a/dev-lang/moarvm/moarvm-2017.06.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-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
index 67393ca666f6..f119a7ae28bc 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ SLOT="0"
 IUSE="asan clang debug doc +jit static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
-		dev-libs/libtommath
+		>=dev-libs/libtommath-1.0
 		dev-libs/libuv
 		jit? ( dev-lang/lua:0[deprecated]
 			dev-lua/LuaBitOp )