Simplify (and fix) dependency over ruby-debug-base since jruby support is gone.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/dev-ruby/ruby-debug/ChangeLog b/dev-ruby/ruby-debug/ChangeLog
index 412b11c0464bc63842e3cf9931dcb094fc6f37c8..35c10da2f4896f4d52e24a93db38b06d8145f6ca 100644 (file)
--- a/dev-ruby/ruby-debug/ChangeLog
+++ b/dev-ruby/ruby-debug/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/ruby-debug
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-debug/ChangeLog,v 1.26 2011/07/31 16:54:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-debug/ChangeLog,v 1.27 2011/09/25 14:21:48 flameeyes Exp $
+
+  25 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  ruby-debug-0.10.4.ebuild:
+  Simplify (and fix) dependency over ruby-debug-base since jruby support is
+  gone.
 
   31 Jul 2011; Raúl Porcel <armin76@gentoo.org> ruby-debug-0.10.3-r2.ebuild,
   ruby-debug-0.10.3-r6.ebuild, ruby-debug-0.10.4.ebuild:

diff --git a/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild b/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild
index ef5295889c1e5ba326d7ea8ccd84701f7ac473c1..1fa6265b2d9b2add5c68acf25927c31c5b265c18 100644 (file)
--- a/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild
+++ b/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild,v 1.2 2011/07/31 16:54:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-debug/ruby-debug-0.10.4.ebuild,v 1.3 2011/09/25 14:21:48 flameeyes Exp $
 
 EAPI="2"
 USE_RUBY="ruby18 ree18"
@@ -29,17 +29,13 @@ SRC_URI="mirror://rubygems/${P}.gem
 
 EXTRA_S="${WORKDIR}/all/${PN}-extra-${PV}"
 
-ruby_add_rdepend ">=dev-ruby/columnize-0.1"
+ruby_add_rdepend "
+       >=dev-ruby/columnize-0.1
+       ~dev-ruby/ruby-debug-base-${PV}"
 
 DEPEND="${DEPEND} emacs? ( >=virtual/emacs-22 )"
 RDEPEND="${RDEPEND} emacs? ( >=virtual/emacs-22 )"
 
-# The original extension is used for MRI (ruby18)
-USE_RUBY="ruby18" \
-       ruby_add_rdepend "ruby_targets_ruby18? ( ~dev-ruby/ruby-debug-base-${PV} )"
-USE_RUBY="ree18" \
-       ruby_add_rdepend "ruby_targets_ruby18? ( ~dev-ruby/ruby-debug-base-${PV} )"
-
 all_ruby_compile() {
        all_fakegem_compile