commit: 05304eced7d3da2c0c9ffd9ae290095336862af2
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 17:48:39 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu May 30 18:04:01 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05304ece
app-admin/r10k: cleanup
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
app-admin/r10k/Manifest | 1 -
app-admin/r10k/r10k-1.5.1-r2.ebuild | 68 -------------------------------------
2 files changed, 69 deletions(-)
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 046d9503610..fc32d23087a 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,3 +1,2 @@
-DIST r10k-1.5.1.gem 164864 BLAKE2B
398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30
SHA512
4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
DIST r10k-3.1.0.gem 202240 BLAKE2B
46b7b03d7d57aa856f31ee1a8fe804b1e5ed2272f2543955c46fd194a956c4074fab7a0ca59ce828e1d0841cd7beabdcaa7a167329a8ac707e96be9e71f2cd2f
SHA512
7ec80be0e09d0693f33eaca4420a47a6fa7c2216ab8a06a45611b7150f97be00eaca7dd674962f14b169f9b0b315c3b47c76612baee0724c7d928541e535a960
DIST r10k-3.2.0.gem 206336 BLAKE2B
badc840ec7e6793daf205f1352899fa909e9a922a353a52841809dc80fd03758a865e0cb8210e58bb5c25968207d537b3f19c1903fbb519c50b6af2dd27eb5fb
SHA512
7ea00ec28ba631877d33fa8b00b25e1c69346b787499ec7b26118c16acecf6bd39fcdc4618af016ebf5b62850b6d984510f7e9153dd4e99771def299b7d0703d
diff --git a/app-admin/r10k/r10k-1.5.1-r2.ebuild
b/app-admin/r10k/r10k-1.5.1-r2.ebuild
deleted file mode 100644
index ff43d400d34..00000000000
--- a/app-admin/r10k/r10k-1.5.1-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-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/puppetlabs/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 '/semantic_puppet/ s/~>/>/' \
- -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/puppetlabs/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/puppetlabs/r10k/issues/48) for more"
- ewarn "information."
-}
