Cleanup by removing deprecated gnuconfig, call autoconf explicitely, update dependencies, add -fno-strict-aliasing.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 34 insertions, 17 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/Manifest b/dev-lang/ruby/Manifest
index 2c71775dd8ba..6bfcb54ec5ec 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
@@ -27,18 +30,22 @@ EBUILD ruby-1.8.4.20060529.ebuild 4250 RMD160 5544ee91b599874f87e6dd63da24f503e6
 MD5 339ba65421bc1af295e084bd57212afb ruby-1.8.4.20060529.ebuild 4250
 RMD160 5544ee91b599874f87e6dd63da24f503e6dd5c17 ruby-1.8.4.20060529.ebuild 4250
 SHA256 2a60d7dd057bd22d8180819040bc433389a0239cbb6908cbe05d3d7a6f8c0f6a ruby-1.8.4.20060529.ebuild 4250
-EBUILD ruby-1.8.5_pre1.ebuild 4997 RMD160 aeab8121db4ef7342fad36067e4eef5b6d92418d SHA1 cb9292692abf08f9037ba0891280df021a99c768 SHA256 e893d7e57bb2a87bb9d6eac5e7d0fc141ae8f4be7eb53a26b609d619198d7af1
-MD5 b5442d42599719a88170166b5737c407 ruby-1.8.5_pre1.ebuild 4997
-RMD160 aeab8121db4ef7342fad36067e4eef5b6d92418d ruby-1.8.5_pre1.ebuild 4997
-SHA256 e893d7e57bb2a87bb9d6eac5e7d0fc141ae8f4be7eb53a26b609d619198d7af1 ruby-1.8.5_pre1.ebuild 4997
-MISC ChangeLog 29447 RMD160 bc7ac50c8a4d1d86391a369a671c7a2bef35b745 SHA1 9f6035941167baf528bd411b7e044b520aaa8fa1 SHA256 76b5351066c2944b278179ffc7a43dd31ea4974df5c029071ab9f637b9dbd099
-MD5 07579c7ded4ea554596923c5f8bd3357 ChangeLog 29447
-RMD160 bc7ac50c8a4d1d86391a369a671c7a2bef35b745 ChangeLog 29447
-SHA256 76b5351066c2944b278179ffc7a43dd31ea4974df5c029071ab9f637b9dbd099 ChangeLog 29447
+EBUILD ruby-1.8.5_pre1.ebuild 4892 RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d22 SHA1 4495d4178344b902809ee25c37772d95af83d1ac SHA256 bf476ecabda1fcff398a4ce36889eaed5994e57509013766fa70223f22a3b598
+MD5 dcc7c1423bbeb178cfdc7fb0d36ddaf4 ruby-1.8.5_pre1.ebuild 4892
+RMD160 89b32ba20510f7b3a15214341fdcdb3fe9d88d22 ruby-1.8.5_pre1.ebuild 4892
+SHA256 bf476ecabda1fcff398a4ce36889eaed5994e57509013766fa70223f22a3b598 ruby-1.8.5_pre1.ebuild 4892
+MISC ChangeLog 29649 RMD160 2b2e3a386c28077bd0f869a1af99925a565dde77 SHA1 da4a4eb50651a2e01650feb8148b66558967a9ad SHA256 f6df86759a8cfd2c8e91831fd82cdcd5e5663a982b29e88931343c942a674b9e
+MD5 a376d76bc8b929ce2dde6697affef477 ChangeLog 29649
+RMD160 2b2e3a386c28077bd0f869a1af99925a565dde77 ChangeLog 29649
+SHA256 f6df86759a8cfd2c8e91831fd82cdcd5e5663a982b29e88931343c942a674b9e ChangeLog 29649
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c metadata.xml 157
+MISC ruby-1.8.5_pre1.ebuild.orig 4997 RMD160 aeab8121db4ef7342fad36067e4eef5b6d92418d SHA1 cb9292692abf08f9037ba0891280df021a99c768 SHA256 e893d7e57bb2a87bb9d6eac5e7d0fc141ae8f4be7eb53a26b609d619198d7af1
+MD5 b5442d42599719a88170166b5737c407 ruby-1.8.5_pre1.ebuild.orig 4997
+RMD160 aeab8121db4ef7342fad36067e4eef5b6d92418d ruby-1.8.5_pre1.ebuild.orig 4997
+SHA256 e893d7e57bb2a87bb9d6eac5e7d0fc141ae8f4be7eb53a26b609d619198d7af1 ruby-1.8.5_pre1.ebuild.orig 4997
 MD5 a32bc6bfd54d82552c10f1c2d08036c9 files/digest-ruby-1.8.4-r1 467
 RMD160 fcb0337314f008813b4d06b081f652e1207a5117 files/digest-ruby-1.8.4-r1 467
 SHA256 cf0613bb6cfc3faba67afc36c8e1a4731b8b471b41942d48d7265c037c50ca78 files/digest-ruby-1.8.4-r1 467
@@ -51,3 +58,10 @@ SHA256 af7b7370ad332b22fd13b1374dafd9fb9218c95bc1786724ce665f7ccda139b7 files/di
 MD5 fa6b06ade11f050c73cb9dc8b68e6e57 files/digest-ruby-1.8.5_pre1 494
 RMD160 f69e17d7bab9c66499e81570b30fece67f8e763d files/digest-ruby-1.8.5_pre1 494
 SHA256 5e37b7f8403c803e74d559a3f5a1f4ad8181abd4c63df72c5df0ad2e9efd07ab files/digest-ruby-1.8.5_pre1 494
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEoE01AiZjviIA2XgRApucAJ94T9poSpIfnJzvVecABIV3sr9TVgCgmtEc
+hMkvnBJgGRZsB9xh8rOTmUk=
+=lhTY
+-----END PGP SIGNATURE-----
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