commit: 8c4422d3cf05adc5bc1e582d6d92adc28c995854
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 20 08:04:45 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 08:04:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c4422d3
app-admin/r10k: fix missing locales
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
.../{r10k-3.4.1.ebuild => r10k-3.4.1-r1.ebuild} | 1 +
.../{r10k-3.5.0.ebuild => r10k-3.5.0-r1.ebuild} | 1 +
.../{r10k-3.5.1.ebuild => r10k-3.5.1-r1.ebuild} | 1 +
.../{r10k-3.5.2.ebuild => r10k-3.5.2-r1.ebuild} | 1 +
.../{r10k-3.4.1.ebuild => r10k-3.6.0-r1.ebuild} | 1 +
app-admin/r10k/r10k-3.6.0.ebuild | 43 ----------------------
.../{r10k-3.4.1.ebuild => r10k-3.7.0-r1.ebuild} | 1 +
app-admin/r10k/r10k-3.7.0.ebuild | 43 ----------------------
8 files changed, 6 insertions(+), 86 deletions(-)
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild
b/app-admin/r10k/r10k-3.4.1-r1.ebuild
similarity index 96%
copy from app-admin/r10k/r10k-3.4.1.ebuild
copy to app-admin/r10k/r10k-3.4.1-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.4.1-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.5.0.ebuild
b/app-admin/r10k/r10k-3.5.0-r1.ebuild
similarity index 96%
rename from app-admin/r10k/r10k-3.5.0.ebuild
rename to app-admin/r10k/r10k-3.5.0-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.5.0.ebuild
+++ b/app-admin/r10k/r10k-3.5.0-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.5.1.ebuild
b/app-admin/r10k/r10k-3.5.1-r1.ebuild
similarity index 96%
rename from app-admin/r10k/r10k-3.5.1.ebuild
rename to app-admin/r10k/r10k-3.5.1-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.5.1.ebuild
+++ b/app-admin/r10k/r10k-3.5.1-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.5.2.ebuild
b/app-admin/r10k/r10k-3.5.2-r1.ebuild
similarity index 96%
rename from app-admin/r10k/r10k-3.5.2.ebuild
rename to app-admin/r10k/r10k-3.5.2-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.5.2.ebuild
+++ b/app-admin/r10k/r10k-3.5.2-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild
b/app-admin/r10k/r10k-3.6.0-r1.ebuild
similarity index 96%
copy from app-admin/r10k/r10k-3.4.1.ebuild
copy to app-admin/r10k/r10k-3.6.0-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.6.0-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.6.0.ebuild b/app-admin/r10k/r10k-3.6.0.ebuild
deleted file mode 100644
index ab8b11160cc..00000000000
--- a/app-admin/r10k/r10k-3.6.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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.15.10:0
- >=dev-ruby/gettext-setup-0.24:0
- ~dev-ruby/log4r-1.1.10
- >=dev-ruby/multi_json-1.10:0
- =dev-ruby/puppet_forge-2.3*
-"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/minitar-0.9
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
- sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Avoid specs for unpackaged rugget git provider
- rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-}
diff --git a/app-admin/r10k/r10k-3.4.1.ebuild
b/app-admin/r10k/r10k-3.7.0-r1.ebuild
similarity index 96%
rename from app-admin/r10k/r10k-3.4.1.ebuild
rename to app-admin/r10k/r10k-3.7.0-r1.ebuild
index ab8b11160cc..b34c3d7d971 100644
--- a/app-admin/r10k/r10k-3.4.1.ebuild
+++ b/app-admin/r10k/r10k-3.7.0-r1.ebuild
@@ -9,6 +9,7 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
inherit ruby-fakegem
diff --git a/app-admin/r10k/r10k-3.7.0.ebuild b/app-admin/r10k/r10k-3.7.0.ebuild
deleted file mode 100644
index ab8b11160cc..00000000000
--- a/app-admin/r10k/r10k-3.7.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-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.15.10:0
- >=dev-ruby/gettext-setup-0.24:0
- ~dev-ruby/log4r-1.1.10
- >=dev-ruby/multi_json-1.10:0
- =dev-ruby/puppet_forge-2.3*
-"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/minitar-0.9
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
- sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Avoid specs for unpackaged rugget git provider
- rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-}
