Index: ruby.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v
--- ruby.eclass	21 Jan 2007 07:38:43 -0000	1.58
+++ ruby.eclass	22 Jan 2007 15:11:32 -0000
@@ -61,6 +61,18 @@ 
 
 ruby_src_unpack() {
 
+	if [ -x /usr/bin/install ]; then
+		cat <<END >${T}/mkmf.rb
+require 'mkmf'
+
+puts 'patching mkmf'
+CONFIG['INSTALL'] = '/usr/bin/install'
+END
+		# save it because rubygems needs it (for unsetting RUBYOPT)
+		export GENTOO_RUBYOPT="-r${T}/mkmf.rb"
+		export RUBYOPT="${RUBYOPT} ${GENTOO_RUBYOPT}"
+	fi
+
 	unpack ${A}
 	cd ${S}
 	# apply bulk patches
Index: ruby-gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-gnome2.eclass,v
--- ruby-gnome2.eclass	6 Jul 2005 20:23:20 -0000	1.10
+++ ruby-gnome2.eclass	22 Jan 2007 15:11:32 -0000
@@ -8,7 +8,10 @@ 
 # ruby-module.eclass, but at the moment it contains some things
 # specific to ruby-gnome2
 
-EXPORT_FUNCTIONS src_compile src_install
+# Variables:
+# PATCHES	Space delimited list of patch files.
+
+EXPORT_FUNCTIONS src_compile src_install src_unpack
 
 IUSE=""
 
@@ -27,6 +30,29 @@ 
 DEPEND="virtual/ruby"
 RDEPEND="virtual/ruby"
 
+ruby-gnome2_src_unpack() {
+	if [ -x /usr/bin/install ]; then
+		cat <<END >${T}/mkmf.rb
+require 'mkmf'
+
+puts 'patching mkmf'
+CONFIG['INSTALL'] = '/usr/bin/install'
+END
+		# save it because rubygems needs it (for unsetting RUBYOPT)
+		export GENTOO_RUBYOPT="-r${T}/mkmf.rb"
+		export RUBYOPT="${RUBYOPT} ${GENTOO_RUBYOPT}"
+	fi
+
+	unpack ${A}
+	cd ${S}
+	# apply bulk patches
+	if [[ -n "${PATCHES}" ]] ; then
+		for p in ${PATCHES} ; do
+			epatch $p
+		done
+	fi
+}
+
 ruby-gnome2_src_compile() {
 	ruby extconf.rb || die "extconf.rb failed"
 	emake CC=${CC:-gcc} CXX=${CXX:-g++} || die "emake failed"