[gentoo-commits] gentoo-x86 commit in eclass: ruby-ng.eclass

["Hans de Graaff (graaff)" <graaff@gentoo.org>]

graaff      11/04/25 06:27:23

  Modified:             ruby-ng.eclass
  Log:
  Support EAPI=4 in ruby-ng.eclass, fixing bug 358349.

Revision  Changes    Path
1.31                 eclass/ruby-ng.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.30&r2=1.31

Index: ruby-ng.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ruby-ng.eclass	7 Nov 2010 22:52:44 -0000	1.30
+++ ruby-ng.eclass	25 Apr 2011 06:27:22 -0000	1.31
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.30 2010/11/07 22:52:44 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.31 2011/04/25 06:27:22 graaff Exp $
 #
 # @ECLASS: ruby-ng.eclass
 # @MAINTAINER:
@@ -48,6 +48,14 @@
 # @DESCRIPTION:
 # Set the value to "yes" to make the dependency on a Ruby interpreter optional.
 
+# @ECLASS-VARIABLE: RUBY_S
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If defined this variable determines the source directory name after
+# unpacking. This defaults to the name of the package. Note that this
+# variable supports a wildcard mechanism to help with github tarballs
+# that contain the commit hash as part of the directory name.
+
 inherit eutils toolchain-funcs
 
 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup
@@ -56,6 +64,10 @@
 	0|1)
 		die "Unsupported EAPI=${EAPI} (too old) for ruby-ng.eclass" ;;
 	2|3) ;;
+	4)
+		# S is no longer automatically assigned when it doesn't exist.
+		S="${WORKDIR}"
+		;;
 	*)
 		die "Unknown EAPI=${EAPI} for ruby-ng.eclass"
 esac
@@ -245,7 +257,14 @@
 
 _ruby_invoke_environment() {
 	old_S=${S}
-	sub_S=${S#${WORKDIR}/}
+	case ${EAPI} in
+		4)
+			sub_S=${RUBY_S}
+			;;
+		*)
+			sub_S=${S#${WORKDIR}/}
+			;;
+	esac
 
 	# Special case, for the always-lovely GitHub fetches. With this,
 	# we allow the star glob to just expand to whatever directory it's