From: Hans de Graaff <graaff@gentoo.org>
Date: Sat, 21 Nov 2015 07:41:21 +0000 (+0100)
Subject: app-admin/puppet: fix dev-ruby/rgen dependencies
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a16204030ec9283f947039f45227ec2deccf0c8d;p=gentoo.git

app-admin/puppet: fix dev-ruby/rgen dependencies

The code does feature detection so it does not concern itself with versions.
The feature detected was first introduced in 0.6.5, but the notice shown when
the feature is not present mentions installing 0.7.0 or better. In any case we
should not limit this dependency to exclude newer versions.

Package-Manager: portage-2.2.20.1
---

diff --git a/app-admin/puppet/puppet-3.7.4-r2.ebuild b/app-admin/puppet/puppet-3.7.4-r3.ebuild
similarity index 99%
rename from app-admin/puppet/puppet-3.7.4-r2.ebuild
rename to app-admin/puppet/puppet-3.7.4-r3.ebuild
index c841755a6ec0..fbc3b74f0bca 100644
--- a/app-admin/puppet/puppet-3.7.4-r2.ebuild
+++ b/app-admin/puppet/puppet-3.7.4-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite vim-synta
 
 ruby_add_rdepend "
 	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/rgen-0.6.5
 	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
 	dev-ruby/json
 	augeas? ( dev-ruby/ruby-augeas )
diff --git a/app-admin/puppet/puppet-4.0.0-r2.ebuild b/app-admin/puppet/puppet-4.0.0-r3.ebuild
similarity index 99%
rename from app-admin/puppet/puppet-4.0.0-r2.ebuild
rename to app-admin/puppet/puppet-4.0.0-r3.ebuild
index fbf97dd07b00..a6a95de28071 100644
--- a/app-admin/puppet/puppet-4.0.0-r2.ebuild
+++ b/app-admin/puppet/puppet-4.0.0-r3.ebuild
@@ -21,7 +21,7 @@ IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs
 
 ruby_add_rdepend "
 	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/rgen-0.6.5
 	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
 	dev-ruby/json
 	augeas? ( dev-ruby/ruby-augeas )
diff --git a/app-admin/puppet/puppet-4.1.0.ebuild b/app-admin/puppet/puppet-4.1.0-r1.ebuild
similarity index 99%
rename from app-admin/puppet/puppet-4.1.0.ebuild
rename to app-admin/puppet/puppet-4.1.0-r1.ebuild
index fbf97dd07b00..a6a95de28071 100644
--- a/app-admin/puppet/puppet-4.1.0.ebuild
+++ b/app-admin/puppet/puppet-4.1.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax xemacs
 
 ruby_add_rdepend "
 	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/rgen-0.6.5
 	>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3
 	dev-ruby/json
 	augeas? ( dev-ruby/ruby-augeas )
diff --git a/app-admin/puppet/puppet-4.2.2.ebuild b/app-admin/puppet/puppet-4.2.1-r1.ebuild
similarity index 99%
rename from app-admin/puppet/puppet-4.2.2.ebuild
rename to app-admin/puppet/puppet-4.2.1-r1.ebuild
index 68a38701208e..06b0bcbd37f1 100644
--- a/app-admin/puppet/puppet-4.2.2.ebuild
+++ b/app-admin/puppet/puppet-4.2.1-r1.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/rgen-0.6.5
 	dev-ruby/json
 	>=dev-ruby/facter-3.0.0
 	augeas? ( dev-ruby/ruby-augeas )
diff --git a/app-admin/puppet/puppet-4.2.1.ebuild b/app-admin/puppet/puppet-4.2.2-r1.ebuild
similarity index 99%
rename from app-admin/puppet/puppet-4.2.1.ebuild
rename to app-admin/puppet/puppet-4.2.2-r1.ebuild
index 68a38701208e..06b0bcbd37f1 100644
--- a/app-admin/puppet/puppet-4.2.1.ebuild
+++ b/app-admin/puppet/puppet-4.2.2-r1.ebuild
@@ -22,7 +22,7 @@ RESTRICT="test"
 
 ruby_add_rdepend "
 	dev-ruby/hiera
-	>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
+	>=dev-ruby/rgen-0.6.5
 	dev-ruby/json
 	>=dev-ruby/facter-3.0.0
 	augeas? ( dev-ruby/ruby-augeas )