summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2015-05-31 06:14:54 +0000
committerHans de Graaff <graaff@gentoo.org>2015-05-31 06:14:54 +0000
commitd078ec2a151d16b7ed045f1889bb5b97c4b9e6af (patch)
tree6a9e529e6030e68a1e3324d6b37a2764cc9abcc1
parentAdd ruby-single.eclass to support packages that just need a ruby interpreter ... (diff)
downloadgentoo-2-d078ec2a151d16b7ed045f1889bb5b97c4b9e6af.tar.gz
gentoo-2-d078ec2a151d16b7ed045f1889bb5b97c4b9e6af.tar.bz2
gentoo-2-d078ec2a151d16b7ed045f1889bb5b97c4b9e6af.zip
Add virtual/rubygems to dependencies to ensure that it is present in time, which may not happen since this is a PDEPEND of dev-lang/ruby.
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/ruby-single.eclass10
2 files changed, 11 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 968379d5e192..86eb9dbd8815 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1630 2015/05/31 05:57:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1631 2015/05/31 06:14:54 graaff Exp $
+
+ 31 May 2015; Hans de Graaff <graaff@gentoo.org> ruby-single.eclass:
+ Add virtual/rubygems to dependencies to ensure that it is present in time,
+ which may not happen since this is a PDEPEND of dev-lang/ruby.
31 May 2015; Hans de Graaff <graaff@gentoo.org> ruby-ng.eclass,
+ruby-single.eclass, +ruby-utils.eclass:
diff --git a/eclass/ruby-single.eclass b/eclass/ruby-single.eclass
index 226752109939..e0d5d270d4db 100644
--- a/eclass/ruby-single.eclass
+++ b/eclass/ruby-single.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-single.eclass,v 1.1 2015/05/31 05:57:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-single.eclass,v 1.2 2015/05/31 06:14:54 graaff Exp $
# @ECLASS: ruby-single
# @MAINTAINER:
@@ -43,7 +43,9 @@ inherit ruby-utils
#
# This is an eclass-generated Ruby dependency string for all
# implementations listed in USE_RUBY. Any one of the supported ruby
-# targets will satisfy this dependency.
+# targets will satisfy this dependency. A dependency on
+# virtual/rubygems is also added to ensure that this is installed
+# in time for the package to use it.
#
# Example use:
# @CODE
@@ -54,7 +56,7 @@ inherit ruby-utils
#
# Example value:
# @CODE
-# || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 )
+# || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) virtual/rubygems
# @CODE
_ruby_single_implementations_depend() {
@@ -64,7 +66,7 @@ _ruby_single_implementations_depend() {
depend="${depend} $(_ruby_implementation_depend $_ruby_implementation)"
fi
done
- echo "|| ( ${depend} )"
+ echo "|| ( ${depend} ) virtual/rubygems"
}
_ruby_single_set_globals() {