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 A28D1139694 for ; Tue, 1 Aug 2017 05:50:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F75F1FC114; Tue, 1 Aug 2017 05:50:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4EB301FC114 for ; Tue, 1 Aug 2017 05:50:42 +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 2F0703419C7 for ; Tue, 1 Aug 2017 05:50:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 762BD7519 for ; Tue, 1 Aug 2017 05:50:38 +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: <1501566364.8b8054fa7f4484a4d2f3b60eb13f7794aebdda73.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-1.5.1-r1.ebuild X-VCS-Directories: app-admin/r10k/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: 8b8054fa7f4484a4d2f3b60eb13f7794aebdda73 X-VCS-Branch: master Date: Tue, 1 Aug 2017 05:50:38 +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: 5a563df9-6457-4743-97a5-d33fa0617d91 X-Archives-Hash: 66b6d9713f60dd822bb8b4b980fd2367 commit: 8b8054fa7f4484a4d2f3b60eb13f7794aebdda73 Author: Hans de Graaff gentoo org> AuthorDate: Tue Aug 1 05:46:04 2017 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Tue Aug 1 05:46:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8054fa app-admin/r10k: fix various issues - add ruby22, ruby23 - use correct version of rspec to fix tests - add missing test dependency - fix faraday and json dependencies in gemspec, bug 617036 Package-Manager: Portage-2.3.6, Repoman-2.3.2 app-admin/r10k/r10k-1.5.1-r1.ebuild | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild new file mode 100644 index 00000000000..5d19a50800d --- /dev/null +++ b/app-admin/r10k/r10k-1.5.1-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +USE_RUBY="ruby21 ruby22 ruby23" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" +RUBY_FAKEGEM_TASK_DOC="" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Puppet environment and module deployment" +HOMEPAGE="https://github.com/adrienthebo/r10k" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+git" + +ruby_add_rdepend " + >=dev-ruby/colored-1.2 + =dev-ruby/cri-2.7* + >=dev-ruby/systemu-2.5.2 + >=dev-ruby/log4r-1.1.10 + >=dev-ruby/faraday-0.9.0 + >=dev-ruby/faraday_middleware-0.9.0 + >=dev-ruby/faraday_middleware-multi_json-0.0.6 + >=dev-ruby/multi_json-1.10 + >=dev-ruby/semantic_puppet-0.1.1 + >=dev-ruby/json-1.8:0" + +ruby_add_bdepend "test? ( + dev-ruby/archive-tar-minitar +)" + +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )" + +all_ruby_prepare() { + sed -i -e 's/json_pure/json/' \ + -e '/cri/ s/2\.6\../2.7/' \ + -e '/systemu/ s/2.5.2/2.5/' \ + -e '/faraday/ s/0.9.0/0.9/' \ + -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die +} + +pkg_postinst() { + ewarn + ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read" + ewarn "this. (If not, feel free to continue with your regularly scheduled day.)" + ewarn + ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability" + ewarn "for environments to be prefixed with the source name so that multiple sources" + ewarn "installed into the same directory would not overwrite each other. However" + ewarn "prefixing was automatically enabled and would break existing setups where" + ewarn "multiple sources were cloned into different directories." + ewarn + ewarn "Because this introduced a breaking change, SemVer dictates that the automatic" + ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults" + ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml" + ewarn "to enable prefixing on a per-source basis." + ewarn + ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more" + ewarn "information." +}