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 4BB84139694 for ; Mon, 8 May 2017 19:22:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 418FB21C248; Mon, 8 May 2017 19:22:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11A3C21C248 for ; Mon, 8 May 2017 19:22:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE5CB3416E4 for ; Mon, 8 May 2017 19:22:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EE5877441 for ; Mon, 8 May 2017 19:22:06 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1494271317.cb91bdb35c3fcfcac554c9e2399ab6a1e4fa8e23.zerochaos@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.2-r3.ebuild dev-ruby/metasm/metasm-1.0.2-r4.ebuild dev-ruby/metasm/metasm-9999.ebuild X-VCS-Directories: dev-ruby/metasm/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: cb91bdb35c3fcfcac554c9e2399ab6a1e4fa8e23 X-VCS-Branch: master Date: Mon, 8 May 2017 19:22:06 +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-Archives-Salt: 1a91f945-4814-4065-9dab-f1c2c1d47968 X-Archives-Hash: 83c1cac1355c7cfc2c781b65a5550239 commit: cb91bdb35c3fcfcac554c9e2399ab6a1e4fa8e23 Author: Zero_Chaos gentoo org> AuthorDate: Mon May 8 19:21:41 2017 +0000 Commit: Richard Farina gentoo org> CommitDate: Mon May 8 19:21:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb91bdb3 dev-ruby/metasm: fixup and merge from pentoo overlay Package-Manager: Portage-2.3.5, Repoman-2.3.2 ...tasm-1.0.2-r3.ebuild => metasm-1.0.2-r4.ebuild} | 46 ++++++++-------- dev-ruby/metasm/metasm-9999.ebuild | 62 ++++++++++++++++++++++ 2 files changed, 87 insertions(+), 21 deletions(-) diff --git a/dev-ruby/metasm/metasm-1.0.2-r3.ebuild b/dev-ruby/metasm/metasm-1.0.2-r4.ebuild similarity index 50% rename from dev-ruby/metasm/metasm-1.0.2-r3.ebuild rename to dev-ruby/metasm/metasm-1.0.2-r4.ebuild index 913ef717e4b..70d29918932 100644 --- a/dev-ruby/metasm/metasm-1.0.2-r3.ebuild +++ b/dev-ruby/metasm/metasm-1.0.2-r4.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +EAPI=6 +USE_RUBY="ruby21 ruby22 ruby23" RUBY_FAKEGEM_RECIPE_DOC="none" RUBY_FAKEGEM_EXTRADOC="BUGS README TODO" - RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples" inherit ruby-fakegem @@ -14,13 +13,21 @@ inherit ruby-fakegem DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger" HOMEPAGE="http://metasm.cr0.org/" -LICENSE="BSD" -SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~x86" -#IUSE="development test" +LICENSE="LGPL-2.1" +SLOT="0" IUSE="" -RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jjyg/metasm.git" + KEYWORDS="" + SRC_URI="" + EGIT_CHECKOUT_DIR="${WORKDIR}/all" +else + KEYWORDS="~amd64 ~arm ~x86" +fi + +QA_PREBUILT="usr/lib*/ruby/gems/*/gems/${P}/${PN}/dynldr-linux-x64-233.so" ruby_add_bdepend "dev-ruby/bundler" @@ -28,18 +35,9 @@ all_ruby_prepare() { if [ -f Gemfile.lock ]; then rm Gemfile.lock || die fi - #For now, we don't support development or testing at all - #if ! use development; then - sed -i -e "/^group :development do/,/^end$/d" Gemfile || die - sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die - sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die - #fi - #if ! use test; then - sed -i -e "/^group :test do/,/^end$/d" Gemfile || die - #fi - #if ! use test && ! use development; then - sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die - #fi + + mkdir bin + ln -s ../samples/disassemble.rb ./bin/disassemble } each_ruby_prepare() { @@ -50,6 +48,12 @@ each_ruby_prepare() { fi } +all_ruby_install() { + all_fakegem_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-9999.ebuild b/dev-ruby/metasm/metasm-9999.ebuild new file mode 100644 index 00000000000..c8c346a8631 --- /dev/null +++ b/dev-ruby/metasm/metasm-9999.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +USE_RUBY="ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_EXTRADOC="BUGS README TODO" +RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples" + +inherit ruby-fakegem + +DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger" +HOMEPAGE="http://metasm.cr0.org/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="gtk" + +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/jjyg/metasm.git" + KEYWORDS="" + SRC_URI="" + EGIT_CHECKOUT_DIR="${WORKDIR}/all" +else + KEYWORDS="~amd64 ~arm ~x86" +fi + +QA_PREBUILT="usr/lib*/ruby/gems/*/gems/${P}/${PN}/dynldr-linux-x64-233.so" + +ruby_add_bdepend "dev-ruby/bundler + gtk? ( dev-ruby/ruby-gtk2 )" + +all_ruby_prepare() { + if [ -f Gemfile.lock ]; then + rm Gemfile.lock || die + fi + + mkdir bin + ln -s ../samples/disassemble.rb ./bin/disassemble + ln -s ../samples/disassemble-gui.rb ./bin/disassemble-gui +} + +each_ruby_prepare() { + if [ -f Gemfile ] + then + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die + BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die + fi +} + +all_ruby_install() { + all_fakegem_install + + ruby_fakegem_binwrapper disassemble + ruby_fakegem_binwrapper disassemble-gui +} + +each_ruby_test() { + ${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die +}