Update ruby-bundler to 1.8.5.

* pkgsrc change: add support for pkg_alternatives.

## 1.8.5 (2015-03-11)

Bugfixes:

  - remove MIT license from gemspec when removing license file (@indirect)
  - respect 'no' immediately as well as saving it in `gem` config (@kirs)

## 1.8.4 (2015-03-05)

Bugfixes:

  - document --all-platforms option (#3449, @moeffju)
  - find gems from all sources on exec after install (#3450, @TimMoore)

## 1.8.3 (2015-02-24)

Bugfixes:

  - handle boolean values for gem settings (@EduardoBautista)
  - stop always looking for updated `path` gems (#3414, #3417, #3429, @TimMoore)
## 1.8.2 (2015-02-14)

Bugfixes:

  - allow config settings for gems with 'http' in the name again (#3398, @tmoore)

## 1.8.1 (2015-02-13)

Bugfixes:

  - synchronize building git gem native extensions (#3385, @antifuchs & @indirect)
  - set gemspec bindir correctly (#3392, @tmoore)
  - request lockfile deletion when it is malformed (#3396, @indirect)
  - explain problem when mirror config is missing (#3386, @indirect)
  - explain problem when caching causes permission error (#3390, @indirect)
  - normalize URLs in config keys (#3391, @indirect)

## 1.8.0 (2015-02-10)

Bugfixes:

  - Gemfile `github` blocks now work (#3379, @indirect)

Bugfixes from v1.7.13:

  - Look up installed gems in remote sources (#3300, #3368, #3377, #3380, #3381, @indirect)
  - Look up gems across all sources to satisfy dependencies (#3365, @keiths-osc)
  - Request dependencies for no more than 100 gems at a time (#3367, @segiddins)

## 1.8.0.rc (2015-01-26)

Features:

  - add `config disable_multisource` option to ensure sources can't compete (@indirect)

Bugfixes:

  - don't add extra quotes around long, quoted config values (@aroben, #3338)

Security:

  - warn when more than one top-level source is present (@indirect)

## 1.8.0.pre (2015-01-26)

Features:

  - add metadata allowed_push_host to new gem template (#3002, @juanitofatas)
  - adds a `--no-install` flag to `bundle package` (@d-reinhold)
  - add `bundle config auto_install true` to install automatically (@smashwilson)
  - add `bundle viz --without` to exclude gem groups from resulting graph (@fnichol)
  - prevent whitespace in gem declarations with clear messaging (@benlakey)
  - tries to find a `bundler-<command>` executable on your path for non-bundler commands (@andremedeiros)
  - tries to find `gems.rb` and it's new counterpart, `gems.locked` (@andremedeiros)
  - change the initial version of new gems from `0.0.1` to `0.1.0` (@petedmarsh)
  - add `package --all-platforms` to cache gems for each known platform (@ccutrer)
  - speed up `exec` when running commands on the $PATH (@kirs)
  - add gem code of conduct file and option (@kirs)
  - add config settings for gem license and tests (@kirs)
  - add `bin/setup` and `bin/console` to new gems (@indirect)
  - include configured user-agent in network requests (@indirect)
  - support `github`, `gist`, and `bitbucket` options on git gems (@indirect)
  - add `package --cache-path` and `config cache_path` for cache location (@jnraine)
  - allow `config` to work even when a Gemfile is not present (@dholdren)
  - add `config gemfile /path` for other Gemfile locations (@dholdren)

Bugfixes:

  - reduce memory usage with threaded parallel workers (@Who828)
  - support read-only git gems (@pmahoney)
  - various resolver performance improvements (@dubek)
  - untaint git gem paths for Rubygems compatibility (@tdtds)

Documentation:

  - add missing Gemfile global `path` explanation (@agenteo)

## 1.7.13 (2015-02-07)

Bugfixes:

  - Look up installed gems in remote sources (#3300, #3368, #3377, #3380, #3381, @indirect)
  - Look up gems across all sources to satisfy dependencies (#3365, @keiths-osc)
  - Request dependencies for no more than 100 gems at a time (#3367, @segiddins)

4 files changed, 18 insertions, 125 deletions

diff --git a/misc/ruby-bundler/ALTERNATIVES b/misc/ruby-bundler/ALTERNATIVES
new file mode 100644
index 00000000000..77aa29e014c
--- /dev/null
+++ b/misc/ruby-bundler/ALTERNATIVES
@@ -0,0 +1,2 @@
+bin/bundle @PREFIX@/bin/bundle@RUBY_SUFFIX@
+bin/bundler @PREFIX@/bin/bundler@RUBY_SUFFIX@
diff --git a/misc/ruby-bundler/Makefile b/misc/ruby-bundler/Makefile
index 8b444b28e26..ad861502620 100644
--- a/misc/ruby-bundler/Makefile
+++ b/misc/ruby-bundler/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2015/02/03 14:53:20 taca Exp $
+# $NetBSD: Makefile,v 1.21 2015/03/13 14:34:12 taca Exp $
 
-DISTNAME=	bundler-1.7.12
+DISTNAME=	bundler-1.8.5
 CATEGORIES=	misc
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -8,7 +8,7 @@ HOMEPAGE=	http://gembundler.com/
 COMMENT=	Manage your application's dependencies
 LICENSE=	mit
 
-CONFLICTS+=	ruby[1-9][0-9]-bundler-[0-9]*
+RUBYGEM_OPTIONS+=	--format-executable
 
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ruby-bundler/PLIST b/misc/ruby-bundler/PLIST
index c1da622dfc1..6dcde2dcfd8 100644
--- a/misc/ruby-bundler/PLIST
+++ b/misc/ruby-bundler/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.16 2015/02/03 14:53:20 taca Exp $
-bin/bundle
-bin/bundler
+@comment $NetBSD: PLIST,v 1.17 2015/03/13 14:34:12 taca Exp $
+bin/bundle${RUBY_SUFFIX}
+bin/bundler${RUBY_SUFFIX}
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/.gitignore
 ${GEM_LIBDIR}/.rspec
 ${GEM_LIBDIR}/.travis.yml
 ${GEM_LIBDIR}/CHANGELOG.md
+${GEM_LIBDIR}/CODE_OF_CONDUCT.md
 ${GEM_LIBDIR}/CONTRIBUTING.md
 ${GEM_LIBDIR}/DEVELOPMENT.md
 ${GEM_LIBDIR}/ISSUES.md
@@ -81,10 +82,6 @@ ${GEM_LIBDIR}/lib/bundler/man/bundle.txt
 ${GEM_LIBDIR}/lib/bundler/man/gemfile.5
 ${GEM_LIBDIR}/lib/bundler/man/gemfile.5.txt
 ${GEM_LIBDIR}/lib/bundler/match_platform.rb
-${GEM_LIBDIR}/lib/bundler/parallel_workers.rb
-${GEM_LIBDIR}/lib/bundler/parallel_workers/thread_worker.rb
-${GEM_LIBDIR}/lib/bundler/parallel_workers/unix_worker.rb
-${GEM_LIBDIR}/lib/bundler/parallel_workers/worker.rb
 ${GEM_LIBDIR}/lib/bundler/psyched_yaml.rb
 ${GEM_LIBDIR}/lib/bundler/remote_specification.rb
 ${GEM_LIBDIR}/lib/bundler/resolver.rb
@@ -118,11 +115,14 @@ ${GEM_LIBDIR}/lib/bundler/templates/Executable
 ${GEM_LIBDIR}/lib/bundler/templates/Executable.standalone
 ${GEM_LIBDIR}/lib/bundler/templates/Gemfile
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/.travis.yml.tt
+${GEM_LIBDIR}/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/Gemfile.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/LICENSE.txt.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/README.md.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/Rakefile.tt
-${GEM_LIBDIR}/lib/bundler/templates/newgem/bin/newgem.tt
+${GEM_LIBDIR}/lib/bundler/templates/newgem/bin/console.tt
+${GEM_LIBDIR}/lib/bundler/templates/newgem/bin/setup.tt
+${GEM_LIBDIR}/lib/bundler/templates/newgem/exe/newgem.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/ext/newgem/extconf.rb.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/ext/newgem/newgem.c.tt
 ${GEM_LIBDIR}/lib/bundler/templates/newgem/ext/newgem/newgem.h.tt
@@ -179,6 +179,7 @@ ${GEM_LIBDIR}/lib/bundler/vendored_persistent.rb
 ${GEM_LIBDIR}/lib/bundler/vendored_thor.rb
 ${GEM_LIBDIR}/lib/bundler/version.rb
 ${GEM_LIBDIR}/lib/bundler/vlad.rb
+${GEM_LIBDIR}/lib/bundler/worker.rb
 ${GEM_LIBDIR}/man/bundle-config.ronn
 ${GEM_LIBDIR}/man/bundle-exec.ronn
 ${GEM_LIBDIR}/man/bundle-install.ronn
@@ -188,114 +189,4 @@ ${GEM_LIBDIR}/man/bundle-update.ronn
 ${GEM_LIBDIR}/man/bundle.ronn
 ${GEM_LIBDIR}/man/gemfile.5.ronn
 ${GEM_LIBDIR}/man/index.txt
-${GEM_LIBDIR}/spec/bundler/anonymizable_uri_spec.rb
-${GEM_LIBDIR}/spec/bundler/bundler_spec.rb
-${GEM_LIBDIR}/spec/bundler/cli_spec.rb
-${GEM_LIBDIR}/spec/bundler/definition_spec.rb
-${GEM_LIBDIR}/spec/bundler/dsl_spec.rb
-${GEM_LIBDIR}/spec/bundler/friendly_errors_spec.rb
-${GEM_LIBDIR}/spec/bundler/gem_helper_spec.rb
-${GEM_LIBDIR}/spec/bundler/psyched_yaml_spec.rb
-${GEM_LIBDIR}/spec/bundler/retry_spec.rb
-${GEM_LIBDIR}/spec/bundler/settings_spec.rb
-${GEM_LIBDIR}/spec/bundler/source/rubygems_spec.rb
-${GEM_LIBDIR}/spec/bundler/source_list_spec.rb
-${GEM_LIBDIR}/spec/cache/gems_spec.rb
-${GEM_LIBDIR}/spec/cache/git_spec.rb
-${GEM_LIBDIR}/spec/cache/path_spec.rb
-${GEM_LIBDIR}/spec/cache/platform_spec.rb
-${GEM_LIBDIR}/spec/commands/binstubs_spec.rb
-${GEM_LIBDIR}/spec/commands/check_spec.rb
-${GEM_LIBDIR}/spec/commands/clean_spec.rb
-${GEM_LIBDIR}/spec/commands/config_spec.rb
-${GEM_LIBDIR}/spec/commands/console_spec.rb
-${GEM_LIBDIR}/spec/commands/exec_spec.rb
-${GEM_LIBDIR}/spec/commands/help_spec.rb
-${GEM_LIBDIR}/spec/commands/init_spec.rb
-${GEM_LIBDIR}/spec/commands/inject_spec.rb
-${GEM_LIBDIR}/spec/commands/licenses_spec.rb
-${GEM_LIBDIR}/spec/commands/newgem_spec.rb
-${GEM_LIBDIR}/spec/commands/open_spec.rb
-${GEM_LIBDIR}/spec/commands/outdated_spec.rb
-${GEM_LIBDIR}/spec/commands/package_spec.rb
-${GEM_LIBDIR}/spec/commands/show_spec.rb
-${GEM_LIBDIR}/spec/install/binstubs_spec.rb
-${GEM_LIBDIR}/spec/install/bundler_spec.rb
-${GEM_LIBDIR}/spec/install/deploy_spec.rb
-${GEM_LIBDIR}/spec/install/gemfile/gemspec_spec.rb
-${GEM_LIBDIR}/spec/install/gemfile/git_spec.rb
-${GEM_LIBDIR}/spec/install/gemfile/path_spec.rb
-${GEM_LIBDIR}/spec/install/gemfile_spec.rb
-${GEM_LIBDIR}/spec/install/gems/c_ext_spec.rb
-${GEM_LIBDIR}/spec/install/gems/dependency_api_spec.rb
-${GEM_LIBDIR}/spec/install/gems/env_spec.rb
-${GEM_LIBDIR}/spec/install/gems/flex_spec.rb
-${GEM_LIBDIR}/spec/install/gems/groups_spec.rb
-${GEM_LIBDIR}/spec/install/gems/mirror_spec.rb
-${GEM_LIBDIR}/spec/install/gems/platform_spec.rb
-${GEM_LIBDIR}/spec/install/gems/post_install_spec.rb
-${GEM_LIBDIR}/spec/install/gems/resolving_spec.rb
-${GEM_LIBDIR}/spec/install/gems/simple_case_spec.rb
-${GEM_LIBDIR}/spec/install/gems/sources_spec.rb
-${GEM_LIBDIR}/spec/install/gems/standalone_spec.rb
-${GEM_LIBDIR}/spec/install/gems/sudo_spec.rb
-${GEM_LIBDIR}/spec/install/gems/win32_spec.rb
-${GEM_LIBDIR}/spec/install/gemspecs_spec.rb
-${GEM_LIBDIR}/spec/install/path_spec.rb
-${GEM_LIBDIR}/spec/install/post_bundle_message_spec.rb
-${GEM_LIBDIR}/spec/install/prereleases_spec.rb
-${GEM_LIBDIR}/spec/install/security_policy_spec.rb
-${GEM_LIBDIR}/spec/install/upgrade_spec.rb
-${GEM_LIBDIR}/spec/lock/git_spec.rb
-${GEM_LIBDIR}/spec/lock/lockfile_spec.rb
-${GEM_LIBDIR}/spec/other/bundle_ruby_spec.rb
-${GEM_LIBDIR}/spec/other/cli_dispatch_spec.rb
-${GEM_LIBDIR}/spec/other/ext_spec.rb
-${GEM_LIBDIR}/spec/other/platform_spec.rb
-${GEM_LIBDIR}/spec/other/ssl_cert_spec.rb
-${GEM_LIBDIR}/spec/quality_spec.rb
-${GEM_LIBDIR}/spec/realworld/dependency_api_spec.rb
-${GEM_LIBDIR}/spec/realworld/edgecases_spec.rb
-${GEM_LIBDIR}/spec/realworld/parallel_spec.rb
-${GEM_LIBDIR}/spec/resolver/basic_spec.rb
-${GEM_LIBDIR}/spec/resolver/platform_spec.rb
-${GEM_LIBDIR}/spec/runtime/executable_spec.rb
-${GEM_LIBDIR}/spec/runtime/load_spec.rb
-${GEM_LIBDIR}/spec/runtime/platform_spec.rb
-${GEM_LIBDIR}/spec/runtime/require_spec.rb
-${GEM_LIBDIR}/spec/runtime/setup_spec.rb
-${GEM_LIBDIR}/spec/runtime/with_clean_env_spec.rb
-${GEM_LIBDIR}/spec/spec_helper.rb
-${GEM_LIBDIR}/spec/support/artifice/endopint_marshal_fail_basic_authentication.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_500.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_api_forbidden.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_api_missing.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_basic_authentication.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_creds_diff_host.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_extra.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_extra_missing.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_fallback.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_host_redirect.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_marshal_fail.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_redirect.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_strict_basic_authentication.rb
-${GEM_LIBDIR}/spec/support/artifice/endpoint_timeout.rb
-${GEM_LIBDIR}/spec/support/builders.rb
-${GEM_LIBDIR}/spec/support/fakeweb/rack-1.0.0.marshal
-${GEM_LIBDIR}/spec/support/fakeweb/windows.rb
-${GEM_LIBDIR}/spec/support/hax.rb
-${GEM_LIBDIR}/spec/support/helpers.rb
-${GEM_LIBDIR}/spec/support/indexes.rb
-${GEM_LIBDIR}/spec/support/matchers.rb
-${GEM_LIBDIR}/spec/support/path.rb
-${GEM_LIBDIR}/spec/support/permissions.rb
-${GEM_LIBDIR}/spec/support/platforms.rb
-${GEM_LIBDIR}/spec/support/ruby_ext.rb
-${GEM_LIBDIR}/spec/support/rubygems_ext.rb
-${GEM_LIBDIR}/spec/support/streams.rb
-${GEM_LIBDIR}/spec/support/sudo.rb
-${GEM_LIBDIR}/spec/update/gems_spec.rb
-${GEM_LIBDIR}/spec/update/git_spec.rb
-${GEM_LIBDIR}/spec/update/path_spec.rb
 ${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/misc/ruby-bundler/distinfo b/misc/ruby-bundler/distinfo
index 21429d99d01..0e24932baf7 100644
--- a/misc/ruby-bundler/distinfo
+++ b/misc/ruby-bundler/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20 2015/02/03 14:53:20 taca Exp $
+$NetBSD: distinfo,v 1.21 2015/03/13 14:34:12 taca Exp $
 
-SHA1 (bundler-1.7.12.gem) = 622d21ab12c00a00d9ee3711b5e5872516de6dc3
-RMD160 (bundler-1.7.12.gem) = 04b844322279dd267576cd3a07f8a23094973428
-Size (bundler-1.7.12.gem) = 306176 bytes
+SHA1 (bundler-1.8.5.gem) = 803f9c38a56c81a88d6e7c191f671c276bc0fac4
+RMD160 (bundler-1.8.5.gem) = 7eb5c3b6ffc5a6fa0acceb3b96d3daa8f7a838f7
+Size (bundler-1.8.5.gem) = 235008 bytes