From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ECF3E158093 for ; Sat, 18 Sep 2021 02:31:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAF4FE0809; Sat, 18 Sep 2021 02:30:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5DC5E0809 for ; Sat, 18 Sep 2021 02:30:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4ADC9342F03 for ; Sat, 18 Sep 2021 02:30:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E8E1EA for ; Sat, 18 Sep 2021 02:30:56 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1631932238.bf8f8e4d8d86c80b86de38a1af7490c4b60e34ca.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/metasm/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/metasm/metasm-1.0.4-r1.ebuild dev-ruby/metasm/metasm-1.0.4.ebuild dev-ruby/metasm/metasm-1.0.5-r1.ebuild dev-ruby/metasm/metasm-1.0.5.ebuild X-VCS-Directories: dev-ruby/metasm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bf8f8e4d8d86c80b86de38a1af7490c4b60e34ca X-VCS-Branch: master Date: Sat, 18 Sep 2021 02:30:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 93179fd5-4407-420d-a842-f3e4c9008075 X-Archives-Hash: 3dfa8ed2a8c11d924d3f46d8a0de61ef commit: bf8f8e4d8d86c80b86de38a1af7490c4b60e34ca Author: Sam James gentoo org> AuthorDate: Sat Sep 18 02:21:14 2021 +0000 Commit: Sam James gentoo 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 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 -}