create USES=gem and update rubygem- ports to use it

Note that for now ports still have to have USE_RUBY=yes to use USES=gem

PR:		209041
Differential Revision:	https://reviews.freebsd.org/D6070

64 files changed, 64 insertions, 132 deletions

diff --git a/sysutils/puppet-lint/Makefile b/sysutils/puppet-lint/Makefile
index be818a3b4c15..e99382c052cb 100644
--- a/sysutils/puppet-lint/Makefile
+++ b/sysutils/puppet-lint/Makefile
@@ -13,8 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/puppet-lint
 NO_ARCH=	yes
 
diff --git a/sysutils/rhc/Makefile b/sysutils/rhc/Makefile
index 880c42260a3e..0e4fc8b48ce8 100644
--- a/sysutils/rhc/Makefile
+++ b/sysutils/rhc/Makefile
@@ -24,8 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/minitar:archivers/rubygem-archive-tar-minitar \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/rhc
 
diff --git a/sysutils/rubygem-SyslogLogger/Makefile b/sysutils/rubygem-SyslogLogger/Makefile
index 662e6ac52d4b..183cc30ebd33 100644
--- a/sysutils/rubygem-SyslogLogger/Makefile
+++ b/sysutils/rubygem-SyslogLogger/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Logger replacement that logs to syslog
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-backup/Makefile b/sysutils/rubygem-backup/Makefile
index ef1437002df8..88776429d604 100644
--- a/sysutils/rubygem-backup/Makefile
+++ b/sysutils/rubygem-backup/Makefile
@@ -76,8 +76,7 @@ RUN_DEPENDS=	rubygem-CFPropertyList>=2.3.1:devel/rubygem-CFPropertyList \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/backup
 
diff --git a/sysutils/rubygem-bosh-gen/Makefile b/sysutils/rubygem-bosh-gen/Makefile
index e699558f1995..76cf0cc10928 100644
--- a/sysutils/rubygem-bosh-gen/Makefile
+++ b/sysutils/rubygem-bosh-gen/Makefile
@@ -23,9 +23,7 @@ RUN_DEPENDS=	rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 SHEBANG_FILES=	lib/bosh/gen/generators/new_release_generator/templates/templates/make_manifest.tt \
 		spec/fixtures/releases/s3test-boshrelease/templates/make_manifest
 
diff --git a/sysutils/rubygem-bosh_cli/Makefile b/sysutils/rubygem-bosh_cli/Makefile
index 1a1246707887..dcc6e41c39ad 100644
--- a/sysutils/rubygem-bosh_cli/Makefile
+++ b/sysutils/rubygem-bosh_cli/Makefile
@@ -29,8 +29,7 @@ RUN_DEPENDS=	rubygem-blobstore_client>=${PORTVERSION}:devel/rubygem-blobstore_cl
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/bosh
 
diff --git a/sysutils/rubygem-bundler/Makefile b/sysutils/rubygem-bundler/Makefile
index 651a9d817f23..e997a2eea38d 100644
--- a/sysutils/rubygem-bundler/Makefile
+++ b/sysutils/rubygem-bundler/Makefile
@@ -13,8 +13,7 @@ LICENSE=	MIT
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/bundle bin/bundler
 
diff --git a/sysutils/rubygem-bundler_ext/Makefile b/sysutils/rubygem-bundler_ext/Makefile
index 338a1bc0f1f2..2113e0d61b90 100644
--- a/sysutils/rubygem-bundler_ext/Makefile
+++ b/sysutils/rubygem-bundler_ext/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-bundler>=0:sysutils/rubygem-bundler
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-capistrano-ext/Makefile b/sysutils/rubygem-capistrano-ext/Makefile
index 2865f7ed7006..79d3f3872fb9 100644
--- a/sysutils/rubygem-capistrano-ext/Makefile
+++ b/sysutils/rubygem-capistrano-ext/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-capistrano>=1.0.0:sysutils/rubygem-capistrano
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index c9dec6956230..f440d6cdafd5 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-i18n>=0:devel/rubygem-i18n \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/cap bin/capify
 
diff --git a/sysutils/rubygem-chef-api/Makefile b/sysutils/rubygem-chef-api/Makefile
index dcdad574c37b..f8703c559c68 100644
--- a/sysutils/rubygem-chef-api/Makefile
+++ b/sysutils/rubygem-chef-api/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-logify>=0.1:sysutils/rubygem-logify
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef-zero/Makefile b/sysutils/rubygem-chef-zero/Makefile
index 571b090eace5..e0ad0f57d700 100644
--- a/sysutils/rubygem-chef-zero/Makefile
+++ b/sysutils/rubygem-chef-zero/Makefile
@@ -20,8 +20,7 @@ RUN_DEPENDS=	rubygem-hashie2>=2.0.0:devel/rubygem-hashie2 \
 NO_ARCH=	yes
 
 USE_RUBY=		yes
-USE_RUBYGEMS=		yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=		bin/chef-zero
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 89ee76ce53e1..c77b612098ec 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -33,8 +33,7 @@ RUN_DEPENDS=	rubygem-chef-zero>=2.1.0:sysutils/rubygem-chef-zero \
 
 NO_ARCH=		yes
 USE_RUBY=		yes
-USE_RUBYGEMS=		yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 SUB_LIST=	RUBY=${RUBY}
 USE_RC_SUBR=	chef_client
diff --git a/sysutils/rubygem-facter/Makefile b/sysutils/rubygem-facter/Makefile
index 311d194fe627..2d397063ca3e 100644
--- a/sysutils/rubygem-facter/Makefile
+++ b/sysutils/rubygem-facter/Makefile
@@ -14,8 +14,7 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/facter
 
diff --git a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
index d7d69b91290e..296d1b3ffdb4 100644
--- a/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
+++ b/sysutils/rubygem-fluent-mixin-plaintextformatter/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	\
 	rubygem-ltsv>0:textproc/rubygem-ltsv
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-config-expander/Makefile b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
index 1c4d13a4fe01..fa76263c827b 100644
--- a/sysutils/rubygem-fluent-plugin-config-expander/Makefile
+++ b/sysutils/rubygem-fluent-plugin-config-expander/Makefile
@@ -12,7 +12,6 @@ RUN_DEPENDS=	\
 	rubygem-fluentd>0:sysutils/rubygem-fluentd
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
index 756b35ddc2d4..b3c99ace7b35 100644
--- a/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
+++ b/sysutils/rubygem-fluent-plugin-file-alternative/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS=	\
 	rubygem-fluent-mixin-plaintextformatter>0:sysutils/rubygem-fluent-mixin-plaintextformatter
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
index a5e97c41b994..1bc5cd07cd59 100644
--- a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
+++ b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
@@ -12,7 +12,6 @@ RUN_DEPENDS=	\
 	rubygem-fluentd>0:sysutils/rubygem-fluentd
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 4e159834f294..6cfc92995941 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS=	\
 	rubygem-tzinfo>=1.0.0:devel/rubygem-tzinfo
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
 PLIST_FILES=	bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
 		"@sample etc/fluentd/fluent.conf.sample"
 PLIST_DIRS=	etc/fluentd/plugin
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
 GROUPS=		fluentd
diff --git a/sysutils/rubygem-fluentd010/Makefile b/sysutils/rubygem-fluentd010/Makefile
index 165badcc1e73..84b39679449a 100644
--- a/sysutils/rubygem-fluentd010/Makefile
+++ b/sysutils/rubygem-fluentd010/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS=	\
 	rubygem-yajl-ruby>=1.0:devel/rubygem-yajl-ruby
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
 PLIST_FILES=	bin/fluent-cat bin/fluent-debug bin/fluent-gem bin/fluentd \
 		"@sample etc/fluentd/fluent.conf.sample"
 PLIST_DIRS=	etc/fluentd/plugin
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
 GROUPS=		fluentd
diff --git a/sysutils/rubygem-fssm/Makefile b/sysutils/rubygem-fssm/Makefile
index 656f41878ea0..bcf5c4cf12b3 100644
--- a/sysutils/rubygem-fssm/Makefile
+++ b/sysutils/rubygem-fssm/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-god/Makefile b/sysutils/rubygem-god/Makefile
index abaab20d905d..048c1b20ea43 100644
--- a/sysutils/rubygem-god/Makefile
+++ b/sysutils/rubygem-god/Makefile
@@ -13,8 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/god
 
diff --git a/sysutils/rubygem-guard-compat/Makefile b/sysutils/rubygem-guard-compat/Makefile
index 0ff67ad84e0c..108afe9dcd74 100644
--- a/sysutils/rubygem-guard-compat/Makefile
+++ b/sysutils/rubygem-guard-compat/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard-livereload/Makefile b/sysutils/rubygem-guard-livereload/Makefile
index c5abd3cf80b8..ebfe5b1b79ad 100644
--- a/sysutils/rubygem-guard-livereload/Makefile
+++ b/sysutils/rubygem-guard-livereload/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-em-websocket>=0.5:www/rubygem-em-websocket \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard-minitest/Makefile b/sysutils/rubygem-guard-minitest/Makefile
index e40714ed5e4e..4b24c4ba1275 100644
--- a/sysutils/rubygem-guard-minitest/Makefile
+++ b/sysutils/rubygem-guard-minitest/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-guard-compat>=1.2:sysutils/rubygem-guard-compat \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard-rspec/Makefile b/sysutils/rubygem-guard-rspec/Makefile
index 6e5b078dbbc1..44d78db054ff 100644
--- a/sysutils/rubygem-guard-rspec/Makefile
+++ b/sysutils/rubygem-guard-rspec/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-guard>=2.1:sysutils/rubygem-guard \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-guard/Makefile b/sysutils/rubygem-guard/Makefile
index 15dfadbf8632..649113355346 100644
--- a/sysutils/rubygem-guard/Makefile
+++ b/sysutils/rubygem-guard/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	rubygem-formatador>=0.2.4:devel/rubygem-formatador \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/guard \
 		bin/_guard-core
diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index e3115eccb7e2..adab3d78b49f 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -23,8 +23,7 @@ RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.14:devel/rubygem-apipie-bindings \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman/Makefile b/sysutils/rubygem-hammer_cli_foreman/Makefile
index d484e24a2496..7a31ce254f7e 100644
--- a/sysutils/rubygem-hammer_cli_foreman/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	rubygem-apipie-bindings>=0.0.16:devel/rubygem-apipie-bindings \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
index 57fc38a2c944..d4ecc305478e 100644
--- a/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_bootdisk/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_forem
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/hammer/cli.modules.d
diff --git a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
index 873eef35dc17..75e2d1b1f479 100644
--- a/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_salt/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	rubygem-hammer_cli_foreman>=0.1.2:sysutils/rubygem-hammer_cli_forem
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	"@sample etc/hammer/cli.modules.d/foreman_salt.yml.sample"
 
diff --git a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
index 5c9e7edc0be0..a67ef3bf99bf 100644
--- a/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman_ssh/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-hammer_cli>=0.0.6:sysutils/rubygem-hammer_cli \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	"@sample etc/hammer/cli.modules.d/foreman_ssh.yml.sample"
 
diff --git a/sysutils/rubygem-hiera-file/Makefile b/sysutils/rubygem-hiera-file/Makefile
index b3da3c9d8a29..4e7190ad04c6 100644
--- a/sysutils/rubygem-hiera-file/Makefile
+++ b/sysutils/rubygem-hiera-file/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Data backend for Hiera that returns whole files
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}hiera1>=0:sysutils/rubygem-hiera1
 
diff --git a/sysutils/rubygem-hiera/Makefile b/sysutils/rubygem-hiera/Makefile
index 04fb665e96be..785a87651041 100644
--- a/sysutils/rubygem-hiera/Makefile
+++ b/sysutils/rubygem-hiera/Makefile
@@ -18,8 +18,7 @@ CONFLICTS_INSTALL=	rubygem-hiera1-*
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 HIERA_DBDIR=	/var/db/hiera
 PLIST_FILES=	bin/hiera
diff --git a/sysutils/rubygem-hiera1/Makefile b/sysutils/rubygem-hiera1/Makefile
index 04e90fee91ee..ef4239a8275f 100644
--- a/sysutils/rubygem-hiera1/Makefile
+++ b/sysutils/rubygem-hiera1/Makefile
@@ -21,8 +21,7 @@ CONFLICTS_INSTALL=	rubygem-hiera-*
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 HIERA_DBDIR=	/var/db/hiera
 PLIST_FILES=	bin/hiera
 PLIST_DIRS=	${HIERA_DBDIR}
diff --git a/sysutils/rubygem-hieracles/Makefile b/sysutils/rubygem-hieracles/Makefile
index 2f8c6886340f..2fc7620fc054 100644
--- a/sysutils/rubygem-hieracles/Makefile
+++ b/sysutils/rubygem-hieracles/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	rubygem-deep_merge>=1.0.1:devel/rubygem-deep_merge \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/hc man/man1/hc.1.gz \
 		bin/ppdb man/man1/ppdb.1.gz
 
diff --git a/sysutils/rubygem-librarian-puppet/Makefile b/sysutils/rubygem-librarian-puppet/Makefile
index 14f7e43bf99f..fced93374594 100644
--- a/sysutils/rubygem-librarian-puppet/Makefile
+++ b/sysutils/rubygem-librarian-puppet/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}librarianp>=0.6.3:devel/rubygem-librarianp \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/librarian-puppet
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-log4r/Makefile b/sysutils/rubygem-log4r/Makefile
index ec0ecf632fad..f891e0a9c497 100644
--- a/sysutils/rubygem-log4r/Makefile
+++ b/sysutils/rubygem-log4r/Makefile
@@ -15,7 +15,6 @@ PORTSCOUT=	skipv:1.1.11
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-logify/Makefile b/sysutils/rubygem-logify/Makefile
index 84e442a6a9e2..435c53961550 100644
--- a/sysutils/rubygem-logify/Makefile
+++ b/sysutils/rubygem-logify/Makefile
@@ -14,7 +14,6 @@ LICENSE=	APACHE20
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-mogilefs-client/Makefile b/sysutils/rubygem-mogilefs-client/Makefile
index e417933f4d46..7638cd20b3a7 100644
--- a/sysutils/rubygem-mogilefs-client/Makefile
+++ b/sysutils/rubygem-mogilefs-client/Makefile
@@ -14,8 +14,7 @@ LICENSE=	BSD3CLAUSE
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/mog
 
diff --git a/sysutils/rubygem-mothra/Makefile b/sysutils/rubygem-mothra/Makefile
index 0a8c6eecb2fd..21f6476139ee 100644
--- a/sysutils/rubygem-mothra/Makefile
+++ b/sysutils/rubygem-mothra/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-colorize>=0.7.3:devel/rubygem-colorize \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 PLIST_FILES=	bin/mothra
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-murder/Makefile b/sysutils/rubygem-murder/Makefile
index 581100672109..a601da256547 100644
--- a/sysutils/rubygem-murder/Makefile
+++ b/sysutils/rubygem-murder/Makefile
@@ -11,11 +11,9 @@ COMMENT=	Large scale deploys using BitTorrent
 
 LICENSE=	APACHE20
 
-USES=		python
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist python
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-ohai/Makefile b/sysutils/rubygem-ohai/Makefile
index 32dd1192be4d..52f79febda85 100644
--- a/sysutils/rubygem-ohai/Makefile
+++ b/sysutils/rubygem-ohai/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS=	rubygem-ffi>=1.9.0:devel/rubygem-ffi \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/ohai
 
diff --git a/sysutils/rubygem-parallel/Makefile b/sysutils/rubygem-parallel/Makefile
index 11ff266f37dd..cb8c05d3e9bc 100644
--- a/sysutils/rubygem-parallel/Makefile
+++ b/sysutils/rubygem-parallel/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-puppet_forge/Makefile b/sysutils/rubygem-puppet_forge/Makefile
index f0f17d0078a1..6026f0d56d04 100644
--- a/sysutils/rubygem-puppet_forge/Makefile
+++ b/sysutils/rubygem-puppet_forge/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-faraday>=0.9.0:www/rubygem-faraday \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-puppet_forge1/Makefile b/sysutils/rubygem-puppet_forge1/Makefile
index 999890bd76da..c4126713500a 100644
--- a/sysutils/rubygem-puppet_forge1/Makefile
+++ b/sysutils/rubygem-puppet_forge1/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-her>=0.6.8:databases/rubygem-her
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index 692ea6a7c86f..ab8e187e1e41 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS=	rubygem-colored>=1.2:textproc/rubygem-colored \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 
 PLIST_FILES=	bin/r10k
 
diff --git a/sysutils/rubygem-rubyipmi/Makefile b/sysutils/rubygem-rubyipmi/Makefile
index a1fbbd5495f7..232ce0f70e22 100644
--- a/sysutils/rubygem-rubyipmi/Makefile
+++ b/sysutils/rubygem-rubyipmi/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	${LOCALBASE}/sbin/bmc-device:sysutils/freeipmi
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-shellany/Makefile b/sysutils/rubygem-shellany/Makefile
index 33dacd2c7707..49a9fbe5e8f3 100644
--- a/sysutils/rubygem-shellany/Makefile
+++ b/sysutils/rubygem-shellany/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-smart_proxy_chef/Makefile b/sysutils/rubygem-smart_proxy_chef/Makefile
index 42a94544e44c..5d457d080fe3 100644
--- a/sysutils/rubygem-smart_proxy_chef/Makefile
+++ b/sysutils/rubygem-smart_proxy_chef/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	foreman-proxy>=1.8.0:net/foreman-proxy \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d
diff --git a/sysutils/rubygem-smart_proxy_dynflow/Makefile b/sysutils/rubygem-smart_proxy_dynflow/Makefile
index 995566245463..89e480609a85 100644
--- a/sysutils/rubygem-smart_proxy_dynflow/Makefile
+++ b/sysutils/rubygem-smart_proxy_dynflow/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	foreman-proxy>=1.9.0:net/foreman-proxy \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	"@sample etc/foreman-proxy/settings.d/dynflow.yml.sample" \
 		share/foreman-proxy/bundler.d/dynflow.rb
diff --git a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
index 310b48d13522..ebe18e75ff63 100644
--- a/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
+++ b/sysutils/rubygem-smart_proxy_remote_execution_ssh/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	foreman-proxy>=1.9.0:net/foreman-proxy \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	"@sample etc/foreman-proxy/settings.d/remote_execution_ssh.yml.sample" \
 		share/foreman-proxy/bundler.d/remote_execution_ssh.rb
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile
index 6d05b105f7e0..dcbdfe7e15d7 100644
--- a/sysutils/rubygem-smart_proxy_salt/Makefile
+++ b/sysutils/rubygem-smart_proxy_salt/Makefile
@@ -15,12 +15,10 @@ LICENSE=	GPLv3
 RUN_DEPENDS=	foreman-proxy>=1.8.0:net/foreman-proxy \
 		${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt
 
-USES=		python
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist python
 
 post-patch:
 		@${REINPLACE_CMD} \
diff --git a/sysutils/rubygem-sys-admin/Makefile b/sysutils/rubygem-sys-admin/Makefile
index 38cc5f4d6902..7903ff5283d1 100644
--- a/sysutils/rubygem-sys-admin/Makefile
+++ b/sysutils/rubygem-sys-admin/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-ffi>=1.1.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-cpu/Makefile b/sysutils/rubygem-sys-cpu/Makefile
index a31e39344a04..8095b50e2411 100644
--- a/sysutils/rubygem-sys-cpu/Makefile
+++ b/sysutils/rubygem-sys-cpu/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-filesystem/Makefile b/sysutils/rubygem-sys-filesystem/Makefile
index d75363981657..c209efdffce5 100644
--- a/sysutils/rubygem-sys-filesystem/Makefile
+++ b/sysutils/rubygem-sys-filesystem/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-host/Makefile b/sysutils/rubygem-sys-host/Makefile
index bd8596f280a9..bc25aa4facb2 100644
--- a/sysutils/rubygem-sys-host/Makefile
+++ b/sysutils/rubygem-sys-host/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Provides hostname, IP address, and other information for a given host
 LICENSE=	ART20
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-proctable/Makefile b/sysutils/rubygem-sys-proctable/Makefile
index a3b3e24759d4..28cdd08daa33 100644
--- a/sysutils/rubygem-sys-proctable/Makefile
+++ b/sysutils/rubygem-sys-proctable/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 GEM_NAME=	${PORTNAME}-${DISTVERSIONFULL}
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-uname/Makefile b/sysutils/rubygem-sys-uname/Makefile
index 3bde604e12c4..d7b4d4f83933 100644
--- a/sysutils/rubygem-sys-uname/Makefile
+++ b/sysutils/rubygem-sys-uname/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-sys-uptime/Makefile b/sysutils/rubygem-sys-uptime/Makefile
index d89bff73f25b..fc3369b9ffb7 100644
--- a/sysutils/rubygem-sys-uptime/Makefile
+++ b/sysutils/rubygem-sys-uptime/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-ffi>=1.0.0:devel/rubygem-ffi
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-teamocil/Makefile b/sysutils/rubygem-teamocil/Makefile
index 88bed66d639b..08f78217a3c3 100644
--- a/sysutils/rubygem-teamocil/Makefile
+++ b/sysutils/rubygem-teamocil/Makefile
@@ -14,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/teamocil
 
diff --git a/sysutils/rubygem-winrm-fs/Makefile b/sysutils/rubygem-winrm-fs/Makefile
index ca80f0064c58..e440769e148a 100644
--- a/sysutils/rubygem-winrm-fs/Makefile
+++ b/sysutils/rubygem-winrm-fs/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-erubis>=2.7:www/rubygem-erubis \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/rwinrmcp
 
diff --git a/sysutils/rubygem-winrm/Makefile b/sysutils/rubygem-winrm/Makefile
index 2fd721ac079c..c66e87745a74 100644
--- a/sysutils/rubygem-winrm/Makefile
+++ b/sysutils/rubygem-winrm/Makefile
@@ -25,8 +25,7 @@ RUN_DEPENDS=	rubygem-builder32>=2.1.2:devel/rubygem-builder32 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/rwinrm
 
diff --git a/sysutils/rubygem-yell/Makefile b/sysutils/rubygem-yell/Makefile
index eb2e0e6b91c0..3248bdc22961 100644
--- a/sysutils/rubygem-yell/Makefile
+++ b/sysutils/rubygem-yell/Makefile
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>