gentoo resync : 25.01.2018

3 files changed, 0 insertions, 131 deletions

diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 6aeaf9b027f7..9db9eea39a34 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,3 @@
 DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
-EBUILD r10k-1.5.1-r1.ebuild 2099 BLAKE2B b543d218a0ad9f1ae2757486b9262c203c994dd512d3b2c5466c321493c2feb46344436d14b649a46fdb006ab7515dce8deb18497fe06fb0fa55683015276e79 SHA512 bdff5cd90b0b6b2533ce625b1dd2042bf11c98e2469d34a9cce7b14d844649d4044fa71b6458a82f7462b7a2f5efb00c32ca480554ea2c6ac3a714161a9cc926
 EBUILD r10k-1.5.1-r2.ebuild 2134 BLAKE2B 597a5b42e0bda5da73b54d6535acf9aa614a71dc1e893951cb5c70e9ecaebfb7ec0bfcc9334162c5bf63d45d17254a732a1b4544d0916ca636e1baa37da81c9f SHA512 504697400828795efd7bdc3e5ee1d7dcc55a7cb01e56941b01555d3e28ec618733b45e3e0e8e316c56457d51153276b7b5db109c98edd05599dca72a28b22f43
-EBUILD r10k-1.5.1.ebuild 1996 BLAKE2B 84002c1f3961a39bbffc2dd51809afab7f5e8e02df5ff6dc1b0667c319e6d7606c160ae2244dc338ebcbbe71a0c43e0fa03b981ff750f252a3335de44bcf5f78 SHA512 fbb5ddf6a4dd7d34780cbc739d7b7fe74348ce4290c1317a23d00b62724ae41e7c5b51ceda111d222d62e09598267fd57489d97604c29db9db916311c7741bc1
 MISC metadata.xml 696 BLAKE2B 13606b1e280dd0e75f1871c7c749eb67a8e0b455a9f357bf65ffca50547c0811c050a31858fec52c97f3fbc9234222f34372f087660ca65e5a13fd1561d098f1 SHA512 1158620e00396d313aeda263aa479ac878a42162f5c122ca69b26a8fb41d84cbeae688b0c3cda77658edc12056ec17cd12a0c84b95422442ab1bb6aba3cc16df
diff --git a/app-admin/r10k/r10k-1.5.1-r1.ebuild b/app-admin/r10k/r10k-1.5.1-r1.ebuild
deleted file mode 100644
index 0044332eec8a..000000000000
--- a/app-admin/r10k/r10k-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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/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 '/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."
-}
diff --git a/app-admin/r10k/r10k-1.5.1.ebuild b/app-admin/r10k/r10k-1.5.1.ebuild
deleted file mode 100644
index c9589256bce3..000000000000
--- a/app-admin/r10k/r10k-1.5.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-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 ~x86"
-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"
-
-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 '/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."
-}