commit: 8b8054fa7f4484a4d2f3b60eb13f7794aebdda73
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 1 05:46:04 2017 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> 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."
+}
