Gentoo Archives: gentoo-commits

From: Hans de Graaff <graaff@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/r10k/
Date: Tue, 01 Aug 2017 05:50:45
Message-Id: 1501566364.8b8054fa7f4484a4d2f3b60eb13f7794aebdda73.graaff@gentoo
1 commit: 8b8054fa7f4484a4d2f3b60eb13f7794aebdda73
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 1 05:46:04 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 1 05:46:04 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b8054fa
7
8 app-admin/r10k: fix various issues
9
10 - add ruby22, ruby23
11 - use correct version of rspec to fix tests
12 - add missing test dependency
13 - fix faraday and json dependencies in gemspec, bug 617036
14
15 Package-Manager: Portage-2.3.6, Repoman-2.3.2
16
17 app-admin/r10k/r10k-1.5.1-r1.ebuild | 67 +++++++++++++++++++++++++++++++++++++
18 1 file changed, 67 insertions(+)
19
20 diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild
21 new file mode 100644
22 index 00000000000..5d19a50800d
23 --- /dev/null
24 +++ b/app-admin/r10k/r10k-1.5.1-r1.ebuild
25 @@ -0,0 +1,67 @@
26 +# Copyright 1999-2017 Gentoo Foundation
27 +# Distributed under the terms of the GNU General Public License v2
28 +
29 +EAPI=5
30 +
31 +USE_RUBY="ruby21 ruby22 ruby23"
32 +
33 +RUBY_FAKEGEM_RECIPE_TEST="rspec3"
34 +RUBY_FAKEGEM_TASK_DOC=""
35 +
36 +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
37 +
38 +inherit ruby-fakegem
39 +
40 +DESCRIPTION="Puppet environment and module deployment"
41 +HOMEPAGE="https://github.com/adrienthebo/r10k"
42 +
43 +LICENSE="Apache-2.0"
44 +SLOT="0"
45 +KEYWORDS="~amd64"
46 +IUSE="+git"
47 +
48 +ruby_add_rdepend "
49 + >=dev-ruby/colored-1.2
50 + =dev-ruby/cri-2.7*
51 + >=dev-ruby/systemu-2.5.2
52 + >=dev-ruby/log4r-1.1.10
53 + >=dev-ruby/faraday-0.9.0
54 + >=dev-ruby/faraday_middleware-0.9.0
55 + >=dev-ruby/faraday_middleware-multi_json-0.0.6
56 + >=dev-ruby/multi_json-1.10
57 + >=dev-ruby/semantic_puppet-0.1.1
58 + >=dev-ruby/json-1.8:0"
59 +
60 +ruby_add_bdepend "test? (
61 + dev-ruby/archive-tar-minitar
62 +)"
63 +
64 +RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
65 +
66 +all_ruby_prepare() {
67 + sed -i -e 's/json_pure/json/' \
68 + -e '/cri/ s/2\.6\../2.7/' \
69 + -e '/systemu/ s/2.5.2/2.5/' \
70 + -e '/faraday/ s/0.9.0/0.9/' \
71 + -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
72 +}
73 +
74 +pkg_postinst() {
75 + ewarn
76 + ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
77 + ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
78 + ewarn
79 + ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
80 + ewarn "for environments to be prefixed with the source name so that multiple sources"
81 + ewarn "installed into the same directory would not overwrite each other. However"
82 + ewarn "prefixing was automatically enabled and would break existing setups where"
83 + ewarn "multiple sources were cloned into different directories."
84 + ewarn
85 + ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
86 + ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
87 + ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
88 + ewarn "to enable prefixing on a per-source basis."
89 + ewarn
90 + ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
91 + ewarn "information."
92 +}