From 5e90813ec01b7c8e7469f5496f428c2c73831040 Mon Sep 17 00:00:00 2001 From: sebastia Date: Fri, 9 Sep 2016 10:46:15 +0000 Subject: [PATCH] Update to 2.4.3, now with gettext/locale support. OK jasper@ --- sysutils/ruby-r10k/Makefile | 7 ++--- sysutils/ruby-r10k/distinfo | 4 +-- sysutils/ruby-r10k/pkg/PLIST | 52 +++++++++++++++++++----------------- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/sysutils/ruby-r10k/Makefile b/sysutils/ruby-r10k/Makefile index 99a9bc3817f..40ff037bb0f 100644 --- a/sysutils/ruby-r10k/Makefile +++ b/sysutils/ruby-r10k/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2016/06/03 13:33:59 sebastia Exp $ +# $OpenBSD: Makefile,v 1.8 2016/09/09 10:46:15 sebastia Exp $ COMMENT = Puppet module management -DISTNAME = r10k-2.3.0 +DISTNAME = r10k-2.4.3 CATEGORIES = sysutils HOMEPAGE = https://github.com/puppetlabs/r10k MAINTAINER = Sebastian Reitenbach @@ -16,9 +16,10 @@ RUN_DEPENDS += archivers/ruby-minitar,${MODRUBY_FLAVOR}>=0,<2 \ converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.10,<2 \ devel/ruby-colored,${MODRUBY_FLAVOR},=1.2 \ devel/ruby-cri,${MODRUBY_FLAVOR}>=2.6.1,<2.7 \ + devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.5,<1 \ devel/ruby-log4r,${MODRUBY_FLAVOR}=1.1.10 \ devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=0.1.0,<0.2 \ - devel/ruby-puppet_forge,${MODRUBY_FLAVOR}>=2.1.4,<3 + devel/ruby-puppet_forge,${MODRUBY_FLAVOR}>=2.2,<3 CONFIGURE_STYLE = ruby gem diff --git a/sysutils/ruby-r10k/distinfo b/sysutils/ruby-r10k/distinfo index 62b3d24b9c3..008efa0aa41 100644 --- a/sysutils/ruby-r10k/distinfo +++ b/sysutils/ruby-r10k/distinfo @@ -1,2 +1,2 @@ -SHA256 (r10k-2.3.0.gem) = WEvErmUSRA8fvEr9l0ofGrsE81zNyQDB0AZGh9yhr8A= -SIZE (r10k-2.3.0.gem) = 173056 +SHA256 (r10k-2.4.3.gem) = R4LRP6ZT8FRbrW8+uljCJBpZ1Wvnc+RYN6aIDEZkHDM= +SIZE (r10k-2.4.3.gem) = 186368 diff --git a/sysutils/ruby-r10k/pkg/PLIST b/sysutils/ruby-r10k/pkg/PLIST index 55658f5429b..0246e096e49 100644 --- a/sysutils/ruby-r10k/pkg/PLIST +++ b/sysutils/ruby-r10k/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2016/06/03 13:33:59 sebastia Exp $ +@comment $OpenBSD: PLIST,v 1.7 2016/09/09 10:46:15 sebastia Exp $ ${GEM_BIN}/r10k${GEM_BIN_SUFFIX} ${GEM_LIB}/cache/${DISTNAME}.gem ${GEM_LIB}/gems/${DISTNAME}/ @@ -9,6 +9,7 @@ ${GEM_LIB}/gems/${DISTNAME}/CONTRIBUTING.mkd ${GEM_LIB}/gems/${DISTNAME}/Gemfile ${GEM_LIB}/gems/${DISTNAME}/LICENSE ${GEM_LIB}/gems/${DISTNAME}/README.mkd +${GEM_LIB}/gems/${DISTNAME}/Rakefile ${GEM_LIB}/gems/${DISTNAME}/bin/ ${GEM_LIB}/gems/${DISTNAME}/bin/r10k ${GEM_LIB}/gems/${DISTNAME}/doc/ @@ -32,6 +33,7 @@ ${GEM_LIB}/gems/${DISTNAME}/doc/updating-your-puppetfile.mkd ${GEM_LIB}/gems/${DISTNAME}/integration/ ${GEM_LIB}/gems/${DISTNAME}/integration/Gemfile ${GEM_LIB}/gems/${DISTNAME}/integration/README.mkd +${GEM_LIB}/gems/${DISTNAME}/integration/Rakefile ${GEM_LIB}/gems/${DISTNAME}/integration/configs/ ${GEM_LIB}/gems/${DISTNAME}/integration/configs/README.mkd ${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/ @@ -47,6 +49,7 @@ ${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/sles-12-64mda ${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/ubuntu-1004-64mda ${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/ubuntu-1204-64mda ${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/ubuntu-1404-64mda +${GEM_LIB}/gems/${DISTNAME}/integration/configs/pe/ubuntu-1604-64mda ${GEM_LIB}/gems/${DISTNAME}/integration/files/ ${GEM_LIB}/gems/${DISTNAME}/integration/files/README.mkd ${GEM_LIB}/gems/${DISTNAME}/integration/files/hiera.yaml @@ -89,30 +92,10 @@ ${GEM_LIB}/gems/${DISTNAME}/integration/scripts/setup_r10k_env_sles12.sh ${GEM_LIB}/gems/${DISTNAME}/integration/scripts/setup_r10k_env_ubuntu1004.sh ${GEM_LIB}/gems/${DISTNAME}/integration/scripts/setup_r10k_env_ubuntu1204.sh ${GEM_LIB}/gems/${DISTNAME}/integration/scripts/setup_r10k_env_ubuntu1404.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/README.mkd -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-rugged-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-rugged-pe-rhel7.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-rugged-pe-sles11.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1204.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1404.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-shellgit-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-shellgit-pe-rhel7.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-shellgit-pe-sles11.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1204.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1404.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/basic_functionality/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/command_line/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/command_line/all_tests-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/git_source/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/git_source/all_tests-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/basic_workflow/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/complex_workflow/ -${GEM_LIB}/gems/${DISTNAME}/integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh ${GEM_LIB}/gems/${DISTNAME}/integration/tests/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/Puppetfile/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/Puppetfile/HTTPS_PROXY_effects_git_source.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/Puppetfile/HTTP_PROXY_effects_forge_source.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/README.mkd ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb @@ -135,6 +118,7 @@ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/command_line/negative/neg_invalid_ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/command_line/negative/neg_invalid_cli_env_flag.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/command_line/negative/neg_invalid_cmd_line_arg.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/HTTPS_proxy_and_git_source.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/git_source_git.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/git_source_ssh.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/git_source_submodule.rb @@ -143,6 +127,9 @@ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/negative/neg_git_broken ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/negative/neg_git_unauthorized_https.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/git_source/negative/neg_git_unicode_branch.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/purging/ +${GEM_LIB}/gems/${DISTNAME}/integration/tests/purging/content_not_purged_at_root.rb +${GEM_LIB}/gems/${DISTNAME}/integration/tests/purging/default_purging.rb ${GEM_LIB}/gems/${DISTNAME}/integration/tests/user_scenario/ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/user_scenario/basic_workflow/ ${GEM_LIB}/gems/${DISTNAME}/integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb @@ -306,6 +293,8 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/subprocess/runner/windows.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/subprocess/subprocess_error.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/util/symbolize_keys.rb ${GEM_LIB}/gems/${DISTNAME}/lib/r10k/version.rb +${GEM_LIB}/gems/${DISTNAME}/locales/ +${GEM_LIB}/gems/${DISTNAME}/locales/config.yaml ${GEM_LIB}/gems/${DISTNAME}/r10k.gemspec ${GEM_LIB}/gems/${DISTNAME}/r10k.yaml.example ${GEM_LIB}/gems/${DISTNAME}/spec/ @@ -330,7 +319,21 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/invalid-syntax/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/invalid-syntax/Puppetfile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/load-error/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/load-error/Puppetfile +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/valid-forge-with-version/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/valid-forge-with-version/Puppetfile +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/valid-forge-without-version/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/puppetfile/valid-forge-without-version/Puppetfile ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/expected_1 +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_expected_1 +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/managed_subdir_1/subdir_unmanaged_1 +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_one/unmanaged_1 +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/ +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/expected_2 +${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/purgeable/managed_two/unmanaged_2 ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/runner/ ${GEM_LIB}/gems/${DISTNAME}/spec/fixtures/unit/util/subprocess/runner/no-execute.sh @@ -441,6 +444,7 @@ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/attempt_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/commands_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/exec_env_spec.rb +${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/purgeable_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/setopts_spec.rb ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/ ${GEM_LIB}/gems/${DISTNAME}/spec/unit/util/subprocess/result_spec.rb