[gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasm/

[Sam James]

commit:     bf8f8e4d8d86c80b86de38a1af7490c4b60e34ca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 02:21:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 02:30:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf8f8e4d

dev-ruby/metasm: unslot

Pentoo seems to already be unmerging the older version anyway
so isn't intending to install them in parallel.

We can always re-slot it in future, but nowadays, we end up
using =..* for Ruby deps anyway most of the time.

Closes: https://bugs.gentoo.org/686712
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...{metasm-1.0.4.ebuild => metasm-1.0.4-r1.ebuild} | 26 +++++++++++++---------
 ...{metasm-1.0.5.ebuild => metasm-1.0.5-r1.ebuild} | 24 +++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/dev-ruby/metasm/metasm-1.0.4.ebuild b/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
similarity index 65%
rename from dev-ruby/metasm/metasm-1.0.4.ebuild
rename to dev-ruby/metasm/metasm-1.0.4-r1.ebuild
index 1ca58ace640..8810ff79935 100644
--- a/dev-ruby/metasm/metasm-1.0.4.ebuild
+++ b/dev-ruby/metasm/metasm-1.0.4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -10,18 +11,25 @@ RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
 
 inherit ruby-fakegem
 
-DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+DESCRIPTION="Cross-architecture assembler, disassembler, linker, and debugger"
 HOMEPAGE="https://metasm.cr0.org/"
 
 LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE=""
-
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+RDEPEND="!dev-ruby/metasm:1.0.5
+	!dev-ruby/metasm:1.0.4
+	!dev-ruby/metasm:1.0.2"
+DEPEND="${RDEPEND}"
+
 all_ruby_prepare() {
-	mkdir bin
-	ln -s ../samples/disassemble.rb ./bin/disassemble
+	mkdir bin || die
+	ln -s ../samples/disassemble.rb ./bin/disassemble || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
 }
 
 all_ruby_install() {
@@ -29,7 +37,3 @@ all_ruby_install() {
 
 	ruby_fakegem_binwrapper disassemble
 }
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
-}

diff --git a/dev-ruby/metasm/metasm-1.0.5.ebuild b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
similarity index 70%
rename from dev-ruby/metasm/metasm-1.0.5.ebuild
rename to dev-ruby/metasm/metasm-1.0.5-r1.ebuild
index 0cd06d33120..59108ac0207 100644
--- a/dev-ruby/metasm/metasm-1.0.5.ebuild
+++ b/dev-ruby/metasm/metasm-1.0.5-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
@@ -10,18 +11,25 @@ RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
 
 inherit ruby-fakegem
 
-DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+DESCRIPTION="Cross-architecture assembler, disassembler, linker, and debugger"
 HOMEPAGE="https://metasm.cr0.org/"
 
 LICENSE="LGPL-2.1"
-SLOT="${PV}"
-IUSE=""
-
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+RDEPEND="!dev-ruby/metasm:1.0.5
+	!dev-ruby/metasm:1.0.4
+	!dev-ruby/metasm:1.0.2"
+DEPEND="${RDEPEND}"
+
 all_ruby_prepare() {
-	mkdir bin
-	ln -s ../samples/disassemble.rb ./bin/disassemble
+	mkdir bin || die
+	ln -s ../samples/disassemble.rb ./bin/disassemble || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
 }
 
 all_ruby_install() {
@@ -29,7 +37,3 @@ all_ruby_install() {
 
 	ruby_fakegem_binwrapper disassemble
 }
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
-}