Bug # 8290

3 files changed, 12 insertions, 16 deletions

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d34b6e2f534f..95bea97aeb83 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,7 +1,5 @@
 MD5 50136e25f45ce291b1366e3f2799d634 ChangeLog 1736
-MD5 40c12769d61373419a71791c2f5e2ede ruby-1.6.7.ebuild 759
-MD5 02f985745482d318ef1286554c5b213a ruby-1.6.8.ebuild 744
-MD5 1ec0567aa9872f21e85564c27d8f043f ruby-1.8.0_pre2.ebuild 815
-MD5 b4fce5c2bad7530c4d941d78c0ce4fc6 files/digest-ruby-1.6.7 62
+MD5 6b8b427926b1c04859b945698ac96ff5 ruby-1.6.8.ebuild 741
+MD5 557fc0b69af82ee16ef65e0be0cffb2b ruby-1.8.0_pre2.ebuild 810
 MD5 11702b3cb52c88daf5d3934e3a0c2e2a files/digest-ruby-1.6.8 63
 MD5 2da205db4c1f8df1e100067e6c188543 files/digest-ruby-1.8.0_pre2 137
diff --git a/dev-lang/ruby/ruby-1.6.8.ebuild b/dev-lang/ruby/ruby-1.6.8.ebuild
index 0d894fa445ff..53f389736a6f 100644
--- a/dev-lang/ruby/ruby-1.6.8.ebuild
+++ b/dev-lang/ruby/ruby-1.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8.ebuild,v 1.8 2003/03/16 11:57:32 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.6.8.ebuild,v 1.9 2003/05/11 10:41:52 twp Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An object-oriented scripting language"
@@ -10,21 +10,20 @@ LICENSE="Ruby"
 KEYWORDS="x86 alpha sparc hppa"
 SLOT="0"
 
+inherit flag-o-matic
+filter-flags -fomit-frame-pointer
+
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/gdbm-1.8.0
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2"
 
 src_compile() {
-	CFLAGS=${CFLAGS/-fomit-frame-pointer/} ./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die
-
+	econf
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-
 	dodoc COPYING* ChangeLog MANIFEST README* ToDo
 }
diff --git a/dev-lang/ruby/ruby-1.8.0_pre2.ebuild b/dev-lang/ruby/ruby-1.8.0_pre2.ebuild
index 761d83717bce..356f61fe7fa8 100644
--- a/dev-lang/ruby/ruby-1.8.0_pre2.ebuild
+++ b/dev-lang/ruby/ruby-1.8.0_pre2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0_pre2.ebuild,v 1.2 2003/04/10 22:24:17 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.0_pre2.ebuild,v 1.3 2003/05/11 10:41:52 twp Exp $
 
 S=${WORKDIR}/${PN}-`echo ${PV} | sed 's/_pre[0-9]*//'`
 DESCRIPTION="An object-oriented scripting language"
@@ -15,16 +15,15 @@ DEPEND=">=sys-libs/glibc-2.1.3
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2"
 
-src_compile() {
-	CFLAGS=${CFLAGS/-fomit-frame-pointer/} ./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die
+inherit flag-o-matic
+filter-flags -fomit-frame-pointer
 
+src_compile() {
+	econf
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
-
 	dodoc COPYING* ChangeLog MANIFEST README* ToDo
 }