Fixed #159922

diff --git a/eclass/ruby-gnome2.eclass b/eclass/ruby-gnome2.eclass
index 684f4e0b9d0d5be076501d635d26aeb541eb748e..e8c31d9a0f772659008219c07c347e7138fdf52d 100644 (file)
--- a/eclass/ruby-gnome2.eclass
+++ b/eclass/ruby-gnome2.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-gnome2.eclass,v 1.10 2005/07/06 20:23:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-gnome2.eclass,v 1.11 2007/01/26 15:53:18 pclouds Exp $
 #
 # This eclass simplifies installation of the various pieces of
 # ruby-gnome2 since they share a very common installation procedure.
@@ -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 @@ SLOT="0"
 DEPEND="virtual/ruby"
 RDEPEND="virtual/ruby"
 
+ruby-gnome2_src_unpack() {
+       if [ ! -x /bin/install -a -x /usr/bin/install ]; then
+               cat <<END >${T}/mkmf.rb
+require 'mkmf'
+
+STDERR.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"

diff --git a/eclass/ruby.eclass b/eclass/ruby.eclass
index 660df3a39dcca16e88dfff8a265fe2db04031b60..8435feb4c585b97ac98fe57467db21365953ab6c 100644 (file)
--- a/eclass/ruby.eclass
+++ b/eclass/ruby.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.58 2007/01/21 07:38:43 pclouds Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby.eclass,v 1.59 2007/01/26 15:53:18 pclouds Exp $
 #
 # Author: Mamoru KOMACHI <usata@gentoo.org>
 #
@@ -61,6 +61,18 @@ fi
 
 ruby_src_unpack() {
 
+       if [ ! -x /bin/install -a -x /usr/bin/install ]; then
+               cat <<END >${T}/mkmf.rb
+require 'mkmf'
+
+STDERR.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