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 402C913835A for ; Sat, 21 Nov 2020 07:33:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BC2BE0788; Sat, 21 Nov 2020 07:33:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DCE8E0788 for ; Sat, 21 Nov 2020 07:33:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B6F7A340DD1 for ; Sat, 21 Nov 2020 07:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 015FA456 for ; Sat, 21 Nov 2020 07:33:25 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1605943965.8d6f2e57f22ac828d3d8b194746395e449dfb717.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/r10k/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/r10k/r10k-3.7.0-r2.ebuild X-VCS-Directories: app-admin/r10k/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 8d6f2e57f22ac828d3d8b194746395e449dfb717 X-VCS-Branch: master Date: Sat, 21 Nov 2020 07:33:25 +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: 6bb3678e-8ee9-49a2-8c9e-36bb11dcce40 X-Archives-Hash: 9be4815cd077396a57700a839ca74c83 commit: 8d6f2e57f22ac828d3d8b194746395e449dfb717 Author: Hans de Graaff gentoo org> AuthorDate: Sat Nov 21 07:31:33 2020 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sat Nov 21 07:32:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6f2e57 app-admin/r10k: fix dependencies Add and fix gettext related dependencies similar to dev-ruby/gettext-setup since we don't need to support ruby24. Fix colored2 dependency. Closes: https://bugs.gentoo.org/742629 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Hans de Graaff gentoo.org> app-admin/r10k/r10k-3.7.0-r2.ebuild | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/app-admin/r10k/r10k-3.7.0-r2.ebuild b/app-admin/r10k/r10k-3.7.0-r2.ebuild new file mode 100644 index 00000000000..0d4f8948a75 --- /dev/null +++ b/app-admin/r10k/r10k-3.7.0-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_RECIPE_DOC="none" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" +RUBY_FAKEGEM_EXTRAINSTALL=locales + +inherit ruby-fakegem + +DESCRIPTION="Puppet environment and module deployment" +HOMEPAGE="https://github.com/puppetlabs/r10k" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+git" + +ruby_add_rdepend " + ~dev-ruby/colored2-3.1.2 + >=dev-ruby/cri-2.15.10:0 + >=dev-ruby/gettext-setup-0.24:0 + >=dev-ruby/fast_gettext-1.1:0 + >=dev-ruby/ruby-gettext-3.0.2:0 + ~dev-ruby/log4r-1.1.10 + >=dev-ruby/multi_json-1.10:0 + =dev-ruby/puppet_forge-2.3* +" + +ruby_add_bdepend "test? ( + >=dev-ruby/minitar-0.9 +)" + +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" + +all_ruby_prepare() { + sed -e '/s.files/d' \ + -e '/fast_gettext/ s/1.1.0/1.1/' \ + -e "/gettext/ s/'< 3.3.0'//" \ + -i ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid specs for unpackaged rugget git provider + rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die +}