ruby.eclass-1.10.diff

ruby.eclass-1.10.diff (text/plain), 1.39 KB, created by Akinori Hattori on 2003-10-22 08:20:09 UTC

Index: ruby.eclass
===================================================================
--- ruby.eclass	(revision 68)
+++ ruby.eclass	(working copy)
@@ -10,7 +10,8 @@
 ECLASS=ruby
 INHERITED="${INHERITED} ${ECLASS}"
 EXPORT_FUNCTIONS erubyconf erubymake erubyinstall erubydoc \
-	src_unpack econf emake src_compile einstall src_install
+	src_unpack econf emake src_compile einstall src_install \
+	erubyunpack erubycmd
 
 HOMEPAGE="http://raa.ruby-lang.org/list.rhtml?name=${PN}"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
@@ -26,17 +27,39 @@
 	USE_RUBY_1_8=1
 fi
 
-ruby_src_unpack() {
+erubycmd() {
 	if [ "${USE_RUBY_1_6}" -a "${USE_RUBY_1_8}" ] && \
 		[ ! "${WANT_RUBY_1_6}" -a ! "${WANT_RUBY_1_8}" ] ; then
+		if [ "${DO_RUBY_1_6}" -a ! "${DO_RUBY_1_8}" ] ; then
+			cd ${S}/1.6/*; $@; cd -
+		elif [ ! "${DO_RUBY_1_6}" -a "${DO_RUBY_1_8}" ] ; then
+			cd ${S}/1.8/*; $@; cd -
+		else
+			cd ${S}/1.6/*; $@; cd -
+			cd ${S}/1.8/*; $@; cd -
+		fi
+	else
+		cd ${S}; $@; cd -
+	fi
+}
+
+erubyunpack() {
+	if [ "${USE_RUBY_1_6}" -a "${USE_RUBY_1_8}" ] && \
+		[ ! "${WANT_RUBY_1_6}" -a ! "${WANT_RUBY_1_8}" ] ; then
 		mkdir -p ${S}/{1.6,1.8}
-		cd ${S}/1.6; unpack ${A}; cd -
-		cd ${S}/1.8; unpack ${A}; cd -
+		cd ${S}/1.6; unpack $@; cd -
+		cd ${S}/1.8; unpack $@; cd -
 	else
-		unpack ${A}
+		unpack $@
 	fi
 }
 
+src_unpack() {
+
+	erubyunpack ${A}
+
+}
+
 erubyconf() {
 	local RUBY
 	if [ "$1" = ruby16 ] ; then