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:41
Message-Id: 1501562071.77d8fa9a9a8cc6ea182607d8bcb500a7403c1681.graaff@gentoo
1 commit: 77d8fa9a9a8cc6ea182607d8bcb500a7403c1681
2 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 1 04:34:31 2017 +0000
4 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 1 04:34:31 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d8fa9a
7
8 app-admin/r10k: cleanup
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 app-admin/r10k/Manifest | 1 -
13 app-admin/r10k/r10k-1.1.3-r1.ebuild | 57 -------------------------------------
14 2 files changed, 58 deletions(-)
15
16 diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
17 index 015969f3755..bdc8d9d18cb 100644
18 --- a/app-admin/r10k/Manifest
19 +++ b/app-admin/r10k/Manifest
20 @@ -1,2 +1 @@
21 -DIST r10k-1.1.3.gem 30720 SHA256 4b4732046a7478f28668dd3db08ce2527bb45c6da83ec0c604f16d09fce9b91a SHA512 9ddb06c3535c4d5f4f0d8156ddf7671f248283874ef7fab4a2e9d00534e6d165e1b7a32937ecef8043a7fb8ff1143a9dd7bc388f0d7c810de86bc369a22fb502 WHIRLPOOL ea9b3a291cc581c719c2852a0d5f268be2389ed783368a0b20c6dc81b047d5725c60956de3282a353dfefd034a4be2eadaceba1a79ee9c0c16b3afaca3be2ac8
22 DIST r10k-1.5.1.gem 164864 SHA256 4dd4edfb1b69400324780784bf214a80bec3d0dbd46bc94113683904d503fdb0 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd WHIRLPOOL b8a3a49857bc97e4b1529c4a8f33ace1e6c1cca270bd4be3669494568bbc9a0b85e15419103bbb63622aadd3ad1453e11ae63b85b9c86a67d013962f4d7b2761
23
24 diff --git a/app-admin/r10k/r10k-1.1.3-r1.ebuild b/app-admin/r10k/r10k-1.1.3-r1.ebuild
25 deleted file mode 100644
26 index 18a0bbfe90f..00000000000
27 --- a/app-admin/r10k/r10k-1.1.3-r1.ebuild
28 +++ /dev/null
29 @@ -1,57 +0,0 @@
30 -# Copyright 1999-2016 Gentoo Foundation
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=5
34 -
35 -USE_RUBY="ruby20 ruby21"
36 -
37 -RUBY_FAKEGEM_RECIPE_TEST="rspec"
38 -RUBY_FAKEGEM_TASK_DOC=""
39 -
40 -RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
41 -
42 -inherit ruby-fakegem
43 -
44 -DESCRIPTION="Puppet environment and module deployment"
45 -HOMEPAGE="https://github.com/adrienthebo/r10k"
46 -
47 -LICENSE="Apache-2.0"
48 -SLOT="0"
49 -KEYWORDS="~amd64 ~x86"
50 -IUSE="+git"
51 -
52 -ruby_add_rdepend "
53 - >=dev-ruby/colored-1.2
54 - =dev-ruby/cri-2*
55 - >=dev-ruby/systemu-2.5.2
56 - >=dev-ruby/log4r-1.1.10
57 - dev-ruby/json"
58 -
59 -RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
60 -
61 -all_ruby_prepare() {
62 - sed -i -e 's/json_pure/json/' \
63 - -e '/cri/ s/2.4.0/2.4/' \
64 - -e '/systemu/ s/2.5.2/2.5/' \
65 - -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
66 -}
67 -
68 -pkg_postinst() {
69 - ewarn
70 - ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
71 - ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
72 - ewarn
73 - ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
74 - ewarn "for environments to be prefixed with the source name so that multiple sources"
75 - ewarn "installed into the same directory would not overwrite each other. However"
76 - ewarn "prefixing was automatically enabled and would break existing setups where"
77 - ewarn "multiple sources were cloned into different directories."
78 - ewarn
79 - ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
80 - ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
81 - ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
82 - ewarn "to enable prefixing on a per-source basis."
83 - ewarn
84 - ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
85 - ewarn "information."
86 -}