73 files changed, 73 insertions, 152 deletions

diff --git a/databases/rubygem-activemodel/Makefile b/databases/rubygem-activemodel/Makefile
index 5983eabfc089..1eaf20268182 100644
--- a/databases/rubygem-activemodel/Makefile
+++ b/databases/rubygem-activemodel/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activesupport>=${PORTVERSION}:devel/rubygem-activesupport \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activemodel4/Makefile b/databases/rubygem-activemodel4/Makefile
index a04fc3894261..16290bd1bac4 100644
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-jdbc-adapter/Makefile b/databases/rubygem-activerecord-jdbc-adapter/Makefile
index 2c57c35a4f05..173160463c95 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	jruby:lang/jruby \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index ae0af6409ff5..f882a987752f 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	jruby:lang/jruby \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-mysql-adapter/Makefile b/databases/rubygem-activerecord-mysql-adapter/Makefile
index 48ad9c374fd9..88a8eddb22ec 100644
--- a/databases/rubygem-activerecord-mysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-mysql-adapter/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord>=3.2.9:databases/rubygem-activerecord \
 		rubygem-mysql>=2.9.0:databases/rubygem-mysql
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-session_store/Makefile b/databases/rubygem-activerecord-session_store/Makefile
index 685f19206ec3..dc949e1cca94 100644
--- a/databases/rubygem-activerecord-session_store/Makefile
+++ b/databases/rubygem-activerecord-session_store/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-actionpack4>=4.0.0:www/rubygem-actionpack4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord/Makefile b/databases/rubygem-activerecord/Makefile
index 4f8a76bfba7a..bbddc4bb3d52 100644
--- a/databases/rubygem-activerecord/Makefile
+++ b/databases/rubygem-activerecord/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	rubygem-activemodel>=${PORTVERSION}:databases/rubygem-activemodel \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE3
 MYSQL_DESC=	Use native MySQL bindings
diff --git a/databases/rubygem-activerecord4/Makefile b/databases/rubygem-activerecord4/Makefile
index c526c51d8387..25d389190e87 100644
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-after_commit_queue/Makefile b/databases/rubygem-after_commit_queue/Makefile
index c57cf12a033c..dbb9dac1e516 100644
--- a/databases/rubygem-after_commit_queue/Makefile
+++ b/databases/rubygem-after_commit_queue/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS?=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-amalgalite/Makefile b/databases/rubygem-amalgalite/Makefile
index 13ed667c22bd..43e752f69519 100644
--- a/databases/rubygem-amalgalite/Makefile
+++ b/databases/rubygem-amalgalite/Makefile
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-arrayfields>=4.9:devel/rubygem-arrayfields
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/amalgalite-pack
 
diff --git a/databases/rubygem-arel-helpers/Makefile b/databases/rubygem-arel-helpers/Makefile
index e30f03a807cb..110f509f4a11 100644
--- a/databases/rubygem-arel-helpers/Makefile
+++ b/databases/rubygem-arel-helpers/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-activerecord>=3.1.0:databases/rubygem-activerecord
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-arel/Makefile b/databases/rubygem-arel/Makefile
index b8d352b308ba..6cd24f4ef678 100644
--- a/databases/rubygem-arel/Makefile
+++ b/databases/rubygem-arel/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/databases/rubygem-arel3/Makefile b/databases/rubygem-arel3/Makefile
index 0750824273b0..880868fa95ba 100644
--- a/databases/rubygem-arel3/Makefile
+++ b/databases/rubygem-arel3/Makefile
@@ -15,8 +15,7 @@ LICENSE=	MIT
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PORTSCOUT=	ignore
 
diff --git a/databases/rubygem-arel5/Makefile b/databases/rubygem-arel5/Makefile
index 10c5225dc1af..b7b7e245b12b 100644
--- a/databases/rubygem-arel5/Makefile
+++ b/databases/rubygem-arel5/Makefile
@@ -14,7 +14,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/databases/rubygem-arel6/Makefile b/databases/rubygem-arel6/Makefile
index c57358672213..5b7d130f3ded 100644
--- a/databases/rubygem-arel6/Makefile
+++ b/databases/rubygem-arel6/Makefile
@@ -14,7 +14,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/databases/rubygem-awesome_nested_set/Makefile b/databases/rubygem-awesome_nested_set/Makefile
index 1611a209eb51..c392236859aa 100644
--- a/databases/rubygem-awesome_nested_set/Makefile
+++ b/databases/rubygem-awesome_nested_set/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=4.0.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile
index 5dd8f7b448c9..0e3ef3a9d60a 100644
--- a/databases/rubygem-bdb1/Makefile
+++ b/databases/rubygem-bdb1/Makefile
@@ -11,10 +11,8 @@ COMMENT=	Ruby interface to Berkeley DB revision 1.8x with full feature support
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-USES=		execinfo
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		execinfo gem:autoplist
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/rubygem-bigrecord/Makefile b/databases/rubygem-bigrecord/Makefile
index 26a27386032d..bf71d8315f58 100644
--- a/databases/rubygem-bigrecord/Makefile
+++ b/databases/rubygem-bigrecord/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=0:databases/rubygem-activerecord4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-couchrest/Makefile b/databases/rubygem-couchrest/Makefile
index d8be088942c4..55b071ef47d1 100644
--- a/databases/rubygem-couchrest/Makefile
+++ b/databases/rubygem-couchrest/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-mime-types>=1.15:misc/rubygem-mime-types \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-data_objects/Makefile b/databases/rubygem-data_objects/Makefile
index d5e6447acb2a..464eefac97d3 100644
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-addressable>=2.1:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-datamapper/Makefile b/databases/rubygem-datamapper/Makefile
index 6ff4bf14491e..d3dfc45e8389 100644
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@@ -25,7 +25,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=${PORTVERSION}:databases/rubygem-dm-aggregat
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-mysql/Makefile b/databases/rubygem-dbd-mysql/Makefile
index 784f51c61ac4..43e4b500d607 100644
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@@ -14,7 +14,6 @@ RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
 		rubygem-mysql>=0:databases/rubygem-mysql
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-odbc/Makefile b/databases/rubygem-dbd-odbc/Makefile
index e4c104f7036f..f1e5c9d3dca3 100644
--- a/databases/rubygem-dbd-odbc/Makefile
+++ b/databases/rubygem-dbd-odbc/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-pg/Makefile b/databases/rubygem-dbd-pg/Makefile
index 59cf09ca7a7e..5ec07e537198 100644
--- a/databases/rubygem-dbd-pg/Makefile
+++ b/databases/rubygem-dbd-pg/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-sqlite3/Makefile b/databases/rubygem-dbd-sqlite3/Makefile
index cfc4b81d2a43..2e0e1f93b72c 100644
--- a/databases/rubygem-dbd-sqlite3/Makefile
+++ b/databases/rubygem-dbd-sqlite3/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbi/Makefile b/databases/rubygem-dbi/Makefile
index bd4673246bef..c21f5c6e44ed 100644
--- a/databases/rubygem-dbi/Makefile
+++ b/databases/rubygem-dbi/Makefile
@@ -18,8 +18,7 @@ RUN_DEPENDS=	rubygem-deprecated2>=2.0.1:devel/rubygem-deprecated2 \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/dbi bin/test_broken_dbi
 
diff --git a/databases/rubygem-dm-active_model/Makefile b/databases/rubygem-dm-active_model/Makefile
index d1dafc9a7528..ff885b6e8cd3 100644
--- a/databases/rubygem-dm-active_model/Makefile
+++ b/databases/rubygem-dm-active_model/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-activemodel>=3.0:databases/rubygem-activemodel \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-aggregates/Makefile b/databases/rubygem-dm-aggregates/Makefile
index 4c07401d06ce..d6078fc5c462 100644
--- a/databases/rubygem-dm-aggregates/Makefile
+++ b/databases/rubygem-dm-aggregates/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-chunked_query/Makefile b/databases/rubygem-dm-chunked_query/Makefile
index 3cde1e522af1..542fe829c526 100644
--- a/databases/rubygem-dm-chunked_query/Makefile
+++ b/databases/rubygem-dm-chunked_query/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=1.0:databases/rubygem-dm-aggregates \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-constraints/Makefile b/databases/rubygem-dm-constraints/Makefile
index 7cc7b319f82f..b07669aded7b 100644
--- a/databases/rubygem-dm-constraints/Makefile
+++ b/databases/rubygem-dm-constraints/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-core/Makefile b/databases/rubygem-dm-core/Makefile
index f224a83aff81..cff8562517e4 100644
--- a/databases/rubygem-dm-core/Makefile
+++ b/databases/rubygem-dm-core/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-devise/Makefile b/databases/rubygem-dm-devise/Makefile
index d66415d174a8..b630d746e743 100644
--- a/databases/rubygem-dm-devise/Makefile
+++ b/databases/rubygem-dm-devise/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	rubygem-devise>=1.3:devel/rubygem-devise \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-do-adapter/Makefile b/databases/rubygem-dm-do-adapter/Makefile
index fea7a53b0797..1927847f923c 100644
--- a/databases/rubygem-dm-do-adapter/Makefile
+++ b/databases/rubygem-dm-do-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-data_objects>=0.10.6:databases/rubygem-data_objects \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-migrations/Makefile b/databases/rubygem-dm-migrations/Makefile
index 3e70733c57ab..1d643610f9a5 100644
--- a/databases/rubygem-dm-migrations/Makefile
+++ b/databases/rubygem-dm-migrations/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-mysql-adapter/Makefile b/databases/rubygem-dm-mysql-adapter/Makefile
index 45bd9401de9f..6c737a25a078 100644
--- a/databases/rubygem-dm-mysql-adapter/Makefile
+++ b/databases/rubygem-dm-mysql-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-observer/Makefile b/databases/rubygem-dm-observer/Makefile
index d6abc8209136..c1b43e2e7ff4 100644
--- a/databases/rubygem-dm-observer/Makefile
+++ b/databases/rubygem-dm-observer/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-pager/Makefile b/databases/rubygem-dm-pager/Makefile
index d096ad847135..1e513d944a3c 100644
--- a/databases/rubygem-dm-pager/Makefile
+++ b/databases/rubygem-dm-pager/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=0.10.1:databases/rubygem-dm-aggregates \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-paperclip/Makefile b/databases/rubygem-dm-paperclip/Makefile
index dd6a56742c67..ad88f350b56b 100644
--- a/databases/rubygem-dm-paperclip/Makefile
+++ b/databases/rubygem-dm-paperclip/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-postgres-adapter/Makefile b/databases/rubygem-dm-postgres-adapter/Makefile
index 86b9e8fbee1b..6bd26cda2515 100644
--- a/databases/rubygem-dm-postgres-adapter/Makefile
+++ b/databases/rubygem-dm-postgres-adapter/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-rails/Makefile b/databases/rubygem-dm-rails/Makefile
index a64b44895505..fa660d102410 100644
--- a/databases/rubygem-dm-rails/Makefile
+++ b/databases/rubygem-dm-rails/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-actionpack>=3.0:www/rubygem-actionpack \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile
index 660a6f8c0899..a385afedbeb0 100644
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@@ -19,7 +19,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-timestamps/Makefile b/databases/rubygem-dm-timestamps/Makefile
index c9ddf1aa418d..fc7f2eb99347 100644
--- a/databases/rubygem-dm-timestamps/Makefile
+++ b/databases/rubygem-dm-timestamps/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-transactions/Makefile b/databases/rubygem-dm-transactions/Makefile
index c7ddc805da48..e3dc0109dc2d 100644
--- a/databases/rubygem-dm-transactions/Makefile
+++ b/databases/rubygem-dm-transactions/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-types/Makefile b/databases/rubygem-dm-types/Makefile
index 4003110feffe..3c298042d244 100644
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@@ -23,7 +23,6 @@ RUN_DEPENDS=	rubygem-bcrypt-ruby>=3.0:security/rubygem-bcrypt-ruby \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-validations/Makefile b/databases/rubygem-dm-validations/Makefile
index 552114af1ca2..737264923cc6 100644
--- a/databases/rubygem-dm-validations/Makefile
+++ b/databases/rubygem-dm-validations/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-do_mysql/Makefile b/databases/rubygem-do_mysql/Makefile
index b1e1033bba41..11876a27c963 100644
--- a/databases/rubygem-do_mysql/Makefile
+++ b/databases/rubygem-do_mysql/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile
index 8cc4ed07b428..943eb404d8ee 100644
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@@ -11,10 +11,7 @@ COMMENT=	Ruby DataObjects driver for PostgreSQL
 
 RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
-USES+=		pgsql
-
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist pgsql
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-do_sqlite3/Makefile b/databases/rubygem-do_sqlite3/Makefile
index 8b3840b25cd5..6bd1202e3d53 100644
--- a/databases/rubygem-do_sqlite3/Makefile
+++ b/databases/rubygem-do_sqlite3/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	rubygem-data_objects>=0.10.13:databases/rubygem-data_objects
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 
diff --git a/databases/rubygem-em-redis-unified/Makefile b/databases/rubygem-em-redis-unified/Makefile
index 4828d7a481c0..3dcda8c73d35 100644
--- a/databases/rubygem-em-redis-unified/Makefile
+++ b/databases/rubygem-em-redis-unified/Makefile
@@ -13,8 +13,7 @@ LICENSE=	MIT
 RUN_DEPENDS=	rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-familia/Makefile b/databases/rubygem-familia/Makefile
index 21c979615703..fefe400e225d 100644
--- a/databases/rubygem-familia/Makefile
+++ b/databases/rubygem-familia/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	rubygem-gibbler>=0.8.6:devel/rubygem-gibbler \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile
index 4897445d18b9..13a7c770ac09 100644
--- a/databases/rubygem-globalid/Makefile
+++ b/databases/rubygem-globalid/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activesupport4>=4.1.0:devel/rubygem-activesupport4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-her/Makefile b/databases/rubygem-her/Makefile
index c425c1c5db9f..0145ddb32784 100644
--- a/databases/rubygem-her/Makefile
+++ b/databases/rubygem-her/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=3.0.0:databases/rubygem-activemodel4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-hiredis/Makefile b/databases/rubygem-hiredis/Makefile
index 0577d480f139..3fdec6114daa 100644
--- a/databases/rubygem-hiredis/Makefile
+++ b/databases/rubygem-hiredis/Makefile
@@ -15,8 +15,6 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	redis>=0:databases/redis
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		gmake
+USES=		gem:autoplist gmake
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-jdbc-mysql/Makefile b/databases/rubygem-jdbc-mysql/Makefile
index 52c9411ce04d..747fa8b60d76 100644
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	jruby:lang/jruby
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-leo_manager_client/Makefile b/databases/rubygem-leo_manager_client/Makefile
index fbf5c9d02810..dc11425fa5e8 100644
--- a/databases/rubygem-leo_manager_client/Makefile
+++ b/databases/rubygem-leo_manager_client/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/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index 4beca358d57c..1e037f037469 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-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/memcached_top
 
diff --git a/databases/rubygem-memcache/Makefile b/databases/rubygem-memcache/Makefile
index 2a88d0d002f4..9527eb0d4967 100644
--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 CONFIGURE_ARGS=	--with-opt-dir=${LOCALBASE}
 GEM_ENV=	EXTERNAL_LIB="yes"
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
index f1c2f86fa3eb..c33ac5d9c242 100644
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@@ -14,7 +14,6 @@ LICENSE_COMB=	dual
 
 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
index 86d04ba7db44..6ef90983706c 100644
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -13,7 +13,6 @@ LICENSE=	MIT
 
 USE_MYSQL=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-openid-redis-store/Makefile b/databases/rubygem-openid-redis-store/Makefile
index d5edc4339fcf..904e9db69d4a 100644
--- a/databases/rubygem-openid-redis-store/Makefile
+++ b/databases/rubygem-openid-redis-store/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-redis>=0:databases/rubygem-redis \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-paranoia/Makefile b/databases/rubygem-paranoia/Makefile
index 58daa1a1d1d0..590866e8f6de 100644
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS?=	rubygem-activerecord4>=0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile
index 93d69e54280c..7a65f33c1706 100644
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@@ -15,9 +15,7 @@ LICENSE_COMB=	dual
 CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
 		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
 PG_CONFIG=	${LOCALBASE}/bin/pg_config
-USES=		pgsql
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist pgsql
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-rbase/Makefile b/databases/rubygem-rbase/Makefile
index 269c89aaea06..e547370fb607 100644
--- a/databases/rubygem-rbase/Makefile
+++ b/databases/rubygem-rbase/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Library to create/read/write to XBase databases (*.DBF files)
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-redis-actionpack/Makefile b/databases/rubygem-redis-actionpack/Makefile
index 8be6e87c5078..785a133c3c54 100644
--- a/databases/rubygem-redis-actionpack/Makefile
+++ b/databases/rubygem-redis-actionpack/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-actionpack4>=4:www/rubygem-actionpack4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-redis-namespace/Makefile b/databases/rubygem-redis-namespace/Makefile
index 5356f1e69f4b..5239bccd8d3d 100644
--- a/databases/rubygem-redis-namespace/Makefile
+++ b/databases/rubygem-redis-namespace/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-redis>=3.0.4:databases/rubygem-redis
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-redis/Makefile b/databases/rubygem-redis/Makefile
index 100984c49bff..c14dd2666b03 100644
--- a/databases/rubygem-redis/Makefile
+++ b/databases/rubygem-redis/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/databases/rubygem-rubyrep/Makefile b/databases/rubygem-rubyrep/Makefile
index 16fa801dd99e..e62602b5a451 100644
--- a/databases/rubygem-rubyrep/Makefile
+++ b/databases/rubygem-rubyrep/Makefile
@@ -21,9 +21,7 @@ RUN_DEPENDS=	flog>=0:sysutils/flog \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
-USES=		shebangfix
+USES=		gem:autoplist shebangfix
 SHEBANG_FILES=	bin/rubyrep rubyrep
 
 USE_RC_SUBR=	rubyrep
diff --git a/databases/rubygem-seed-fu/Makefile b/databases/rubygem-seed-fu/Makefile
index 04227d924239..e88e40b1d7ff 100644
--- a/databases/rubygem-seed-fu/Makefile
+++ b/databases/rubygem-seed-fu/Makefile
@@ -16,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=3.1:databases/rubygem-activerecord4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 6b550ccfd1d7..88ac029fea6d 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 PLIST_FILES=	bin/sqlite3_ruby
 
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index 17f4dada1ecb..0b495c99ecf0 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-state_machines-activemodel/Makefile b/databases/rubygem-state_machines-activemodel/Makefile
index cce9bbf58281..8586236b27de 100644
--- a/databases/rubygem-state_machines-activemodel/Makefile
+++ b/databases/rubygem-state_machines-activemodel/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=4.1:databases/rubygem-activemodel4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-state_machines-activerecord/Makefile b/databases/rubygem-state_machines-activerecord/Makefile
index 71f78d554f03..9258a2a62b81 100644
--- a/databases/rubygem-state_machines-activerecord/Makefile
+++ b/databases/rubygem-state_machines-activerecord/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=4.1:databases/rubygem-activerecord4 \
 
 NO_ARCH=	yes
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-tarantool/Makefile b/databases/rubygem-tarantool/Makefile
index b5ab68590415..17a472e55bc7 100644
--- a/databases/rubygem-tarantool/Makefile
+++ b/databases/rubygem-tarantool/Makefile
@@ -17,7 +17,6 @@ RUN_DEPENDS=	rubygem-bin_utils>=0.0.3:devel/rubygem-bin_utils \
 NO_ARCH=	yes
 
 USE_RUBY=	yes
-USE_RUBYGEMS=	yes
-RUBYGEM_AUTOPLIST=	yes
+USES=		gem:autoplist
 
 .include <bsd.port.mk>