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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 29 insertions, 28 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/Manifest b/app-admin/puppet/Manifest
index 8b394860292a..0a5d7334e415 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -13,14 +13,14 @@ DIST puppet-0.25.5.tar.gz 1446756 RMD160 c9b934ef9135c5b0d5abe9b97a2491e52145abb
 DIST puppet-2.6.0.gem 1482240 RMD160 4c4683ed5ec6647e766eb69d4df9cc89751bc56a SHA1 ae11e51c55433f006bd5a9bcbf0ec0a1308d71c3 SHA256 f186a08246d0ababbb99dda768dac9f986e397f455e646b125b69f452743564e
 EBUILD puppet-0.25.4-r1.ebuild 3477 RMD160 bcf39391589e8fecf93dfb75a3d2b7445b6d7e7c SHA1 192038e8193a70a401021e5f0e911ae8d0d0b0d6 SHA256 cc49a02852b9f114a765a772469a06cebbd6b16c65f35f61a4711a16e224460f
 EBUILD puppet-0.25.5.ebuild 3471 RMD160 9d3903985ac90575e3f95c4816b55d445c6313ff SHA1 e04597dc6f0cc90092df4a5bf23681d0439a500e SHA256 e54807d400c4b825542a19094beb37f13401c43e80ce69de7747d77d6c9a1560
-EBUILD puppet-2.6.0-r1.ebuild 3765 RMD160 40f6ce3b9ac71e5622dfe419dc06ea114870b6b7 SHA1 c567bbcdd32595f3d4e22e2152c0f2926864863a SHA256 e6e546645b91cfa490089159cbf25bbc67dd8898ababc6e24d9cba73b8c125d8
-EBUILD puppet-2.6.0.ebuild 3646 RMD160 efd987dc1fbfbff13fcfed5f94723cb3bd80948d SHA1 050eeb1ef5da5e0d47511e891033d45118c770f8 SHA256 29e6395c9478612ce4323588714f4f5490dfc7552fc2403133d20d11a1034bde
-MISC ChangeLog 11886 RMD160 163d70907337ff9f6d98720733a2f22c743b5feb SHA1 1e7c6cfd74579db00f5cf7f9726392a3b69a24fd SHA256 f8675589bbb2ee8f4d9ba6c7391817acb1642ffb0356d03a4164590a5c2c6c53
+EBUILD puppet-2.6.0-r1.ebuild 3617 RMD160 225f746c00a70d1de295a88154bdd00f9cccc466 SHA1 1ee3135818e1e51560461c65fe3fdc0cbfde7686 SHA256 0258fecfaf96a4936b1b2f46058889736a912e82088ae4513a26308c8d55dd2b
+EBUILD puppet-2.6.0.ebuild 3498 RMD160 2632bdbed7fc17f7289e9ffd6268426819375ca3 SHA1 95526f4808950d6cfd171e21904f49ad8cacd3c6 SHA256 a6955c0382a807c8f3dd329a461b663bca1a6bdb6a74a736d433b56d7b6825c1
+MISC ChangeLog 12119 RMD160 f20df2d62cbbf1431a7b7b302b4bbf3a38a386a3 SHA1 cf23f039d2f49d1cd52d52392b795f6b43f19827 SHA256 6a8af233adeeb4d64417a60c951b66b22c17776de3cd43e94b3fb4ae3b166b3e
 MISC metadata.xml 1104 RMD160 ad88e28f2133835ffd72b6e4621bd3e5d61ed4ff SHA1 aa694fb688719a7a1fa327bbc5f40c7326daee0c SHA256 24012dce9971f449f7b4bad4402b7d229a5bb4fb073ce363ecb2b01f21c4acd2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxlRmAACgkQcsIHjyDViGRV0QCgp4+NofEXNaDsVXo4bV9FqVxZ
-3mcAn29UG4CC1AGiAtL4Iy6HX3ypgVHj
-=m+5P
+iEYEARECAAYFAkxn6b0ACgkQAiZjviIA2XjwUgCcCrsyXN+7BAO/6X9vmMoVe9cr
+Rd4AnRXah60WCEkmu2tZjGG/BGYoo57W
+=Pw71
 -----END PGP SIGNATURE-----
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() {