diff --git a/devel/ruby-puppet-resource_api/Makefile b/devel/ruby-puppet-resource_api/Makefile
index 23c99def04c..e3007918d04 100644
--- a/devel/ruby-puppet-resource_api/Makefile
+++ b/devel/ruby-puppet-resource_api/Makefile
@@ -1,6 +1,6 @@
-COMMENT =		simple way to write new native resources for puppet
+COMMENT =		simple way to write new native resources for Puppet
 
-DISTNAME =		puppet-resource_api-1.9.0
+DISTNAME =		puppet-resource_api-2.0.0
 CATEGORIES =		devel
 HOMEPAGE =		https://github.com/puppetlabs/puppet-resource_api
 MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
diff --git a/devel/ruby-puppet-resource_api/distinfo b/devel/ruby-puppet-resource_api/distinfo
index 9c04bb79c6a..7d3a4b7b076 100644
--- a/devel/ruby-puppet-resource_api/distinfo
+++ b/devel/ruby-puppet-resource_api/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-resource_api-1.9.0.gem) = S4Lnf60dOBDzqErXJ6qf18TosRebrMA06QccCo8uvmc=
-SIZE (puppet-resource_api-1.9.0.gem) = 101888
+SHA256 (puppet-resource_api-2.0.0.gem) = Rkn8tdXl+MvaCIf3Brlb5bUqCJvPmM6OvwSWwyZv2cQ=
+SIZE (puppet-resource_api-2.0.0.gem) = 102912
diff --git a/devel/ruby-puppet-resource_api/pkg/PLIST b/devel/ruby-puppet-resource_api/pkg/PLIST
index 4c30bcee760..88b8ea5d9ac 100644
--- a/devel/ruby-puppet-resource_api/pkg/PLIST
+++ b/devel/ruby-puppet-resource_api/pkg/PLIST
@@ -28,6 +28,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/glue.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/io_context.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/parameter.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/property.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/provider_get_cache.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/puppet_context.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/read_only_parameter.rb
 ${GEM_LIB}/gems/${DISTNAME}/lib/puppet/resource_api/simple_provider.rb
diff --git a/sysutils/ruby-openvox/8/Makefile b/sysutils/ruby-openvox/8/Makefile
index 5b969df1a41..ed4cfd9e13e 100644
--- a/sysutils/ruby-openvox/8/Makefile
+++ b/sysutils/ruby-openvox/8/Makefile
@@ -1,4 +1,5 @@
 VERSION =		8.23.1
+REVISION =		0
 
 RUN_DEPENDS =		converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
 			devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
diff --git a/sysutils/ruby-openvox/8/patches/patch-_metadata b/sysutils/ruby-openvox/8/patches/patch-_metadata
new file mode 100644
index 00000000000..94bd30015fd
--- /dev/null
+++ b/sysutils/ruby-openvox/8/patches/patch-_metadata
@@ -0,0 +1,22 @@
+Relax version requirement for the puppet-resource_api gem to use newer versions.
+
+Index: .metadata
+--- .metadata.orig
++++ .metadata
+@@ -171,14 +171,14 @@ dependencies:
+   name: puppet-resource_api
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
+-    - - "~>"
++    - - ">="
+       - !ruby/object:Gem::Version
+         version: '1.5'
+   type: :runtime
+   prerelease: false
+   version_requirements: !ruby/object:Gem::Requirement
+     requirements:
+-    - - "~>"
++    - - ">="
+       - !ruby/object:Gem::Version
+         version: '1.5'
+ - !ruby/object:Gem::Dependency
diff --git a/sysutils/ruby-puppet/8/Makefile b/sysutils/ruby-puppet/8/Makefile
index 70881f8530b..b4aa2568c50 100644
--- a/sysutils/ruby-puppet/8/Makefile
+++ b/sysutils/ruby-puppet/8/Makefile
@@ -1,14 +1,14 @@
 PORTROACH=		limit:^8
 
 VERSION=		8.10.0
-REVISION=		2
+REVISION=		3
 
 RUN_DEPENDS+=		converters/ruby-multi_json,${MODRUBY_FLAVOR}>=1.13,<2 \
 			devel/ruby-concurrent-ruby,${MODRUBY_FLAVOR}>=1,<2 \
 			devel/ruby-deep_merge,${MODRUBY_FLAVOR}>=1,<2 \
 			devel/ruby-fast_gettext,${MODRUBY_FLAVOR}>=2.1,<4 \
 			devel/ruby-locale,${MODRUBY_FLAVOR}>=2.1,<3 \
-			devel/ruby-puppet-resource_api,${MODRUBY_FLAVOR}>=1.5,<2 \
+			devel/ruby-puppet-resource_api,${MODRUBY_FLAVOR}>=1.5 \
 			devel/ruby-scanf,${MODRUBY_FLAVOR}>=1,<2 \
 			devel/ruby-semantic_puppet,${MODRUBY_FLAVOR}>=1,<2 \
 			net/ruby-msgpack,${MODRUBY_FLAVOR} \
diff --git a/sysutils/ruby-puppet/8/patches/patch-_metadata b/sysutils/ruby-puppet/8/patches/patch-_metadata
new file mode 100644
index 00000000000..89303bbea89
--- /dev/null
+++ b/sysutils/ruby-puppet/8/patches/patch-_metadata
@@ -0,0 +1,22 @@
+Relax version requirement for the puppet-resource_api gem to use newer versions.
+
+Index: .metadata
+--- .metadata.orig
++++ .metadata
+@@ -124,14 +124,14 @@ dependencies:
+   name: puppet-resource_api
+   requirement: !ruby/object:Gem::Requirement
+     requirements:
+-    - - "~>"
++    - - ">="
+       - !ruby/object:Gem::Version
+         version: '1.5'
+   type: :runtime
+   prerelease: false
+   version_requirements: !ruby/object:Gem::Requirement
+     requirements:
+-    - - "~>"
++    - - ">="
+       - !ruby/object:Gem::Version
+         version: '1.5'
+ - !ruby/object:Gem::Dependency