Update to the new ruby_add_rdepend syntax (classic-style) and use virtual/ruby-ssl rather than reimplementing it by hand.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 22 insertions, 21 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 90c366257e46..f232fc18cce1 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.66 2010/08/13 13:20:50 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.67 2010/08/15 13:21:30 flameeyes Exp $
+
+  15 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org> puppet-2.6.0.ebuild,
+  puppet-2.6.0-r1.ebuild:
+  Update to the new ruby_add_rdepend syntax (classic-style) and use
+  virtual/ruby-ssl rather than reimplementing it by hand.
 
   13 Aug 2010; Joseph Jezak <josejx@gentoo.org> puppet-0.25.5.ebuild:
   Marked ppc stable for bug #325129.
diff --git a/app-admin/puppet/puppet-2.6.0-r1.ebuild b/app-admin/puppet/puppet-2.6.0-r1.ebuild
index a62a438ef329..561c08c4f779 100644
--- a/app-admin/puppet/puppet-2.6.0-r1.ebuild
+++ b/app-admin/puppet/puppet-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.0-r1.ebuild,v 1.1 2010/08/01 01:12:12 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.0-r1.ebuild,v 1.2 2010/08/15 13:21:30 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -21,11 +21,13 @@ KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
 RESTRICT="test"
 
-ruby_add_rdepend ">=dev-ruby/facter-1.5.1"
-ruby_add_rdepend augeas dev-ruby/ruby-augeas
-ruby_add_rdepend ldap dev-ruby/ruby-ldap
-#ruby_add_rdepend rrdtool ">=net-analyzer/rrdtool-1.2.23[ruby]"
-ruby_add_rdepend shadow dev-ruby/ruby-shadow
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.1
+	augeas? ( dev-ruby/ruby-augeas )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	virtual/ruby-ssl"
+#rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 
 DEPEND="${DEPEND}
 	emacs? ( virtual/emacs )"
@@ -34,10 +36,6 @@ RDEPEND="${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	>=app-portage/eix-0.18.0"
 
-for _ruby in ${USE_RUBY}; do
-	DEPEND="${DEPEND} ruby_targets_${_ruby}? ( $(ruby_implementation_depend $_ruby)[ssl] )"
-done
-
 SITEFILE="50${PN}-mode-gentoo.el"
 
 pkg_setup() {
diff --git a/app-admin/puppet/puppet-2.6.0.ebuild b/app-admin/puppet/puppet-2.6.0.ebuild
index 577bfa745e1b..8ca2a3bad65b 100644
--- a/app-admin/puppet/puppet-2.6.0.ebuild
+++ b/app-admin/puppet/puppet-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.0.ebuild,v 1.1 2010/07/20 23:29:43 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.6.0.ebuild,v 1.2 2010/08/15 13:21:30 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18"
@@ -15,11 +15,13 @@ SLOT="0"
 IUSE="augeas emacs ldap rrdtool shadow vim-syntax"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
-ruby_add_rdepend ">=dev-ruby/facter-1.5.1"
-ruby_add_rdepend augeas dev-ruby/ruby-augeas
-ruby_add_rdepend ldap dev-ruby/ruby-ldap
-#ruby_add_rdepend rrdtool ">=net-analyzer/rrdtool-1.2.23[ruby]"
-ruby_add_rdepend shadow dev-ruby/ruby-shadow
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.1
+	augeas? ( dev-ruby/ruby-augeas )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	virtual/ruby-ssl"
+#rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 
 DEPEND="${DEPEND}
 	emacs? ( virtual/emacs )"
@@ -28,10 +30,6 @@ RDEPEND="${RDEPEND}
 	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
 	>=app-portage/eix-0.18.0"
 
-for _ruby in ${USE_RUBY}; do
-	DEPEND="${DEPEND} ruby_targets_${_ruby}? ( $(ruby_implementation_depend $_ruby)[ssl] )"
-done
-
 SITEFILE="50${PN}-mode-gentoo.el"
 
 pkg_setup() {