summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-26 21:09:55 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-06-26 21:09:55 +0000
commit5802a26bbedb1257820bf36e562cacf76b3e5ca8 (patch)
tree1b3e4c0771efd6b9a1d2e2aaebbd3b9d3add57d5 /dev-lang
parentVersion bump #138070 by H. Meissner. (diff)
downloadgentoo-2-5802a26bbedb1257820bf36e562cacf76b3e5ca8.tar.gz
gentoo-2-5802a26bbedb1257820bf36e562cacf76b3e5ca8.tar.bz2
gentoo-2-5802a26bbedb1257820bf36e562cacf76b3e5ca8.zip
Cleanup by removing deprecated gnuconfig, call autoconf explicitely, update dependencies, add -fno-strict-aliasing.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ruby/ChangeLog6
-rw-r--r--dev-lang/ruby/ruby-1.8.5_pre1.ebuild15
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index bf095898c25b..9932d1d442dc 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/ruby
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.201 2006/06/26 20:00:35 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.202 2006/06/26 21:09:55 flameeyes Exp $
+
+ 26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> ruby-1.8.5_pre1.ebuild:
+ Cleanup by removing deprecated gnuconfig, call autoconf explicitely, update
+ dependencies, add -fno-strict-aliasing.
*ruby-1.8.5_pre1 (26 Jun 2006)
diff --git a/dev-lang/ruby/ruby-1.8.5_pre1.ebuild b/dev-lang/ruby/ruby-1.8.5_pre1.ebuild
index cd6dfdbc510a..008ccd116487 100644
--- a/dev-lang/ruby/ruby-1.8.5_pre1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.5_pre1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_pre1.ebuild,v 1.1 2006/06/26 20:00:35 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5_pre1.ebuild,v 1.2 2006/06/26 21:09:55 flameeyes Exp $
ONIGURUMA="onigd2_5_4"
-inherit flag-o-matic alternatives eutils gnuconfig multilib
+inherit flag-o-matic alternatives eutils multilib autotools
DESCRIPTION="An object-oriented scripting language"
HOMEPAGE="http://www.ruby-lang.org/"
@@ -28,8 +28,6 @@ RDEPEND="virtual/libc
!dev-ruby/rdoc
!dev-ruby/rexml"
-DEPEND="sys-devel/autoconf
- ${RDEPEND}"
PROVIDE="virtual/ruby"
S="${WORKDIR}/ruby-${PV/_pre*/}"
@@ -42,18 +40,17 @@ src_unpack() {
pushd "${WORKDIR}/oniguruma"
# epatch ${FILESDIR}/oniguruma-2.3.1-gentoo.patch
econf --with-rubydir="${S}" || die "econf failed"
- make ${SLOT/./}
+ emake ${SLOT/./}
popd
fi
- # Enable build on alpha EV67 (but run gnuconfig_update everywhere)
- gnuconfig_update || die "gnuconfig_update failed"
-
cd "${S}"
# Fix a hardcoded lib path in configure script
sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
configure.in || die "sed failed"
+
+ eautoreconf
}
src_compile() {
@@ -64,6 +61,8 @@ src_compile() {
filter-ldflags -Wl,-Bdirect
filter-ldflags -Bdirect
+ append-flags -fno-strict-aliasing
+
# Socks support via dante
if use socks5; then
# Socks support can't be disabled as long as SOCKS_SERVER is