Fixing bugs 239101 and 260760, thanks to matsuu and Tom. Migrating 1.9.1 to EAPI-2 and other minor fixes

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

9 files changed, 103 insertions, 23 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index ae32b4785e42..12435a7e97c0 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.390 2009/03/21 10:12:08 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.391 2009/04/03 12:26:26 a3li Exp $
+
+*ruby-1.9.1-r1 (03 Apr 2009)
+*ruby-1.8.7_p72-r11 (03 Apr 2009)
+*ruby-1.8.6_p287-r13 (03 Apr 2009)
+
+  03 Apr 2009; Alex Legler <a3li@gentoo.org>
+  +files/ruby-1.8.6-uclibc-udp.patch, +files/auto_gem.rb,
+  +files/ruby18-mkmf-parallel-install.patch,
+  +files/ruby19-mkmf-parallel-install.patch, -ruby-1.8.6_p287-r12.ebuild,
+  +ruby-1.8.6_p287-r13.ebuild, -ruby-1.8.7_p72-r10.ebuild,
+  +ruby-1.8.7_p72-r11.ebuild, -ruby-1.9.1.ebuild, +ruby-1.9.1-r1.ebuild:
+  Revbumps fixing bugs 239101 (thanks to matsuu) and 260760 (thanks to Tom
+  Lloyd), ruby-1.9.1 is now EAPI-2. Removing old versions. Adding fake
+  auto_gem.rb for Ruby 1.9.1. Removing redundant WANT_AUTO* to make repoman
+  happy.
 
 *ruby-1.9.1 (21 Mar 2009)
 
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index eb0011264454..fc83614b0f31 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,13 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX auto_gem.rb 509 RMD160 f8ffc36e384592956e6508b952ea80110f73efe3 SHA1 498f8963c27cad7e8334b2e797c51f6ac2101b1b SHA256 f0f7f61b110955325be52d278fcc1d3f3ea395cd9523dba33af37a44fd59666d
 AUX ruby-1.8.6-memory-leak.diff 1351 RMD160 cba1335fcd52df26b4b2884dea14e0c74852b67a SHA1 184c1743592684abfc1cce8ffa38ae749fe0a1b1 SHA256 90dbc7b444ed936ed8a1fadb443240ec494a6c748d38ff089af423e50bdd9528
 AUX ruby-1.8.6-openssl.patch 4892 RMD160 7ffca1f0d339c60f3a4d1cd452c78eace3bd1f62 SHA1 d5279868d614cfeb2e0eba984096096515baafe0 SHA256 ad98b05dc7a2ba9ac5fac21094660c919a987222db19ff5f8bad8e16ae1a6f49
 AUX ruby-1.8.6-shortname_constants.patch 1390 RMD160 0920bf92ddccf7f01626f705ddba65258531fd29 SHA1 ad3e0ec4867d86a2b94cbd483ea621ef9ca5359e SHA256 c9ba2a01c622017d6863b8ccbf68211d3b691099e0f3cd75b66949bc2b6896fe
+AUX ruby-1.8.6-uclibc-udp.patch 572 RMD160 7f460b16cbb1385aa9be62bd5df5e4f8fa919af3 SHA1 e119dabbf9654be3eaa1e944f71eb334ef207ffb SHA256 520994dcff6873d089213cf07342b419472a762be44247daebcfe0e853d32e37
 AUX ruby-1.8.6_p111-r13657.patch 1915 RMD160 9c135a4e779095127bf7e5d47d2ae3b703e8b41e SHA1 47428434aaa61b5fd11684d8faa8c7db4886b680 SHA256 0856f5987b74be29562e16b3dafc62cb6b874e5536bd73ba2c7fb1e4a4630e24
 AUX ruby-1.8.6_p287-entity_expansion_limit.diff 3423 RMD160 a3a48a3fdc3f5923e436e054625d25f7f10ba13c SHA1 642f90e45cb50413ef0ce3b31a5f8f712c55372f SHA256 a3d32bade6bfceb14b67bbc54744801c7ecf6c9e3f6a1204c46bea4a32012e37
 AUX ruby-mkconfig.patch 407 RMD160 8fdec98672ce845a94c1b28a17747c1e9dd7ec72 SHA1 1e2b97282f4fa55d213dd0b4e7c75fc53367ce7f SHA256 b1ca3500ac50fa49fa1f478aa34f318cff8d92abcd75edfc80fd96338a59e2f4
 AUX ruby-ossl_ocsp-verification.patch 1235 RMD160 73f221edff140dca5227adb693b562ec81401f83 SHA1 37a15d77b845cdb5a86fe049c069f1804efc18a8 SHA256 940f6db6f1bc58c6f4ac42439f908fd07e9711bc2522f043bf639ee2fced2856
+AUX ruby18-mkmf-parallel-install.patch 527 RMD160 1cb49132c4b1e6d9d9870b69a2fde79749faa5fe SHA1 8783e18b41563055d7f14cc42b3e30ac65bd6790 SHA256 3d24d95eb33ccb44413859fc6f731f01f8b7b59d8d4d9d6d6cd59e09d046eb78
+AUX ruby19-mkmf-parallel-install.patch 541 RMD160 c780d1900a0286c9ab66ac1b4c545e15950b7cff SHA1 b7fcf1a6bfc91f3aaacbf4ce600cace31bd5e9a9 SHA256 335087b90053a675e9c3dd2dde050078ae451feabbd38bc1966fa59055f04c0a
 AUX ruby19-rubygems-gentoo.patch 1914 RMD160 9668808eb50ac0e96265d8756d6751f625c396dd SHA1 621918bcba23dbf2fdd1343ffd73b791bc94d996 SHA256 aeacba7ef60e7dee601303470bdc41216f2b5c9d3da88369849568bc95359512
 AUX ruby19-rubygems-proxy.patch 407 RMD160 0bfedce42f4879d729b8de650f99a345faaa7ec4 SHA1 aa23a497f0c581374f687690b0b1035092b4b488 SHA256 3cadd23dfbb128e7029ecc01aab3f00f1aaf011e50492c3a967812a2395e1a59
 DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SHA1 41ca5b916ae1d3b1675fcc45181a0ed04e8726b7 SHA256 b24df7c0fa6fc72ce37fd1e203f378359f29f739a3f4c5b6bdd40ca5f7d25db0
@@ -16,16 +20,16 @@ DIST ruby-1.8.6-p287.tar.bz2 3956902 RMD160 df0950f1cdf9ea26b6d2f04756d9db89ae29
 DIST ruby-1.8.7-p72.tar.bz2 4127450 RMD160 07bf0d6987ba111aed988093c569fb66ba54891b SHA1 462e990a724580e4dfeeac5a271b93f6cfcbf5c7 SHA256 a8f8a28e286dd76747d8e97ea5cfe7a315eb896906ab8c8606d687d9f6f6146e
 DIST ruby-1.9.1-p0.tar.bz2 7190271 RMD160 a6b1b2451dfa82742762e4aeb54c78e831369e46 SHA1 59511d75112ccbe1b27b288c6bde6ad02930dd9c SHA256 de7d33aeabdba123404c21230142299ac1de88c944c9f3215b816e824dd33321
 EBUILD ruby-1.8.6_p114.ebuild 4931 RMD160 2c4ebea5ed7e80ca3473397cdd126a987bdfe9ba SHA1 78d7d83667ae9abb46d4dc120c9dee6f2ceb485e SHA256 e20313c71ed6a2647af33d8f1164bf939a33741381fd7cceb8f7eb7d9ae5c182
-EBUILD ruby-1.8.6_p287-r12.ebuild 5362 RMD160 3a8a31685e0f332679384c0941f18e3508e6b059 SHA1 7e1c2016c8caefcf628e87f08cdfe3a0684ee1de SHA256 2d3b652d23b9057bf5f519630fde665acd52561e919613336198f1232ac52661
+EBUILD ruby-1.8.6_p287-r13.ebuild 5574 RMD160 68876ccefd9d359bc58ef19567ab925321c636dc SHA1 7c4594762acd38dd6cc356db1d8766c5f9ba45ee SHA256 c4a7ffc0a09b252a04e3891748c665cc8724d4cbdddf38cbe342b3ed36e7efa2
 EBUILD ruby-1.8.6_p287-r5.ebuild 5316 RMD160 8acdec45346fe85939549cc649aac8e00aef7633 SHA1 7bdb8386d10459dcb53d4d965b1603baec66704d SHA256 995ba553e3a6bf73fe8b021c07073f0682260d3a8b393b621165f0eea5d3933c
-EBUILD ruby-1.8.7_p72-r10.ebuild 5687 RMD160 e87a34a29dcd94162db1fcedb3bd3730ba3aacd2 SHA1 022a7ca26aa9819f3e89c9169bd199aa0e0b6ee1 SHA256 74ff325e7f56e1a01507e091774a3539b1b07675fd1338d9dc5a26a07dbe91ea
-EBUILD ruby-1.9.1.ebuild 5477 RMD160 8b26c1245bc601344f6a31bf166e7adabcde4266 SHA1 bd0d3867f9f200425fa290c42e0b2df34140ac7e SHA256 592f32824c0e506ba5e0f981af90b44991f4670b4dc5630f51a397c19937a66d
-MISC ChangeLog 58631 RMD160 050a2c106f77c3304e2c5b3f98f5e5666bb96d9e SHA1 87303ca237f5ab65bfd4569e620ec42d80a38c96 SHA256 6e08f7da84f7f869cbfd0219c96c0a8430e0002df72fa96da9dd37d0d426c95a
+EBUILD ruby-1.8.7_p72-r11.ebuild 5707 RMD160 b143e7660b43db8e524f6e9b3a637ce7f96a45e7 SHA1 ac7e19c60cbc0fe620d80e8859daf421bc14ca49 SHA256 5365eba7215847b59129950853fc3aba49fb65297684125bfee03c1f339e9ebd
+EBUILD ruby-1.9.1-r1.ebuild 5572 RMD160 3ba2cdccbab8901980566733d4fe50d7b26d6e72 SHA1 6df66bfd0180bb7f12922ba4e428feaf87f7e9b4 SHA256 9b61b6817b5b0eebdf299a5b70d78572b1a8867d256d200cdcea2f4e92094713
+MISC ChangeLog 59316 RMD160 d4f27e858915b9a948f41f2726c4db9b970a1989 SHA1 31b9b3769484ea37f8806b85b5659c7d5b5bafd3 SHA256 25c8c4d798ebd258dc8afbef2a243d1a8645482ed3323ddfdfefa77872a8ee0f
 MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknEvX8ACgkQk3qunHEll7P+BgCfTRhq+FF9Q2rzKjD2pqOj+v0p
-YpoAn2yL6YiWG0PWQmm7nbmKn9nDKCYF
-=54fD
+iEYEARECAAYFAknWAHoACgkQk3qunHEll7O9JQCfc7NOszL2K2I2/pHMFzWsmygw
+AO8AoKE8tQjIHqDjLB8TPFNhtIteIN7E
+=/sji
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/files/auto_gem.rb b/dev-lang/ruby/files/auto_gem.rb
new file mode 100644
index 000000000000..e7d564264d68
--- /dev/null
+++ b/dev-lang/ruby/files/auto_gem.rb
@@ -0,0 +1,10 @@
+# DO NOT USE THIS FILE!
+# ---------------------
+# This file is a placebo for Ruby 1.9 to work with a legacy feature, Gentoo
+# added to Ruby 1.8 and earlier, loading rubygems automatically (auto_gem).
+# It is no longer needed, but ruby19 needs this file to operate properly on
+# a system containing older versions of Ruby and thus the legacy feature.
+#
+# REMOVAL NOTE:
+# You may remove this file if you are running a Ruby >=1.9.1 *only* system
+# or have disabled the Gentoo auto_gem.rb/RUBYOPT=auto_gem magic.
diff --git a/dev-lang/ruby/files/ruby-1.8.6-uclibc-udp.patch b/dev-lang/ruby/files/ruby-1.8.6-uclibc-udp.patch
new file mode 100644
index 000000000000..07919d273d9d
--- /dev/null
+++ b/dev-lang/ruby/files/ruby-1.8.6-uclibc-udp.patch
@@ -0,0 +1,21 @@
+Patch for bug 260760. Fixes UDP sockets on uClibc systems.
+
+diff --exclude '*~' -uNr ruby-1.8.6-p36.orig/configure.in ruby-1.8.6-p36/configure.in
+--- configure.in.orig	2007-05-22 19:19:07.000000000 +0100
++++ configure.in	2007-08-29 09:42:47.000000000 +0100
+@@ -707,6 +707,7 @@
+      __ptr	dnl
+      bufpos	dnl
+      _p	dnl
++     __bufpos	dnl
+ ; do
+     AC_TRY_COMPILE([#include <stdio.h>
+ ],
+@@ -726,6 +727,7 @@
+     [for frend in	dnl
+          _IO_read_end	dnl
+          bufread 	dnl
++         __bufread 	dnl
+     ; do
+         AC_TRY_COMPILE([#include <stdio.h>
+     ],
diff --git a/dev-lang/ruby/files/ruby18-mkmf-parallel-install.patch b/dev-lang/ruby/files/ruby18-mkmf-parallel-install.patch
new file mode 100644
index 000000000000..26c05bbde378
--- /dev/null
+++ b/dev-lang/ruby/files/ruby18-mkmf-parallel-install.patch
@@ -0,0 +1,14 @@
+ Patch for bug 239101 by Matsuu Takuto, via Redmine issue 1337 (yes, really).
+ Backported for 1.8.* by Alex Legler.
+
+--- lib/mkmf.orig	2009-04-03 13:04:17.000000000 +0200
++++ lib/mkmf.rb	2009-04-03 13:04:30.000000000 +0200
+@@ -1500,7 +1500,7 @@
+     dest = "#{dir}/#{f}"
+     mfile.puts dir, "install-so: #{dest}"
+     unless $extout
+-      mfile.print "#{dest}: #{f}\n"
++      mfile.print "#{dest}: #{dir} #{f}\n"
+       if (sep = config_string('BUILD_FILE_SEPARATOR'))
+         f.gsub!("/", sep)
+         dir.gsub!("/", sep)
diff --git a/dev-lang/ruby/files/ruby19-mkmf-parallel-install.patch b/dev-lang/ruby/files/ruby19-mkmf-parallel-install.patch
new file mode 100644
index 000000000000..d0652484dbe4
--- /dev/null
+++ b/dev-lang/ruby/files/ruby19-mkmf-parallel-install.patch
@@ -0,0 +1,13 @@
+Patch for bug 239101 by Matsuu Takuto, via Redmine issue 1337 (yes, really).
+
+--- lib/mkmf.rb	(revision 23101)
++++ lib/mkmf.rb	(working copy)
+@@ -1710,7 +1710,7 @@
+       mfile.print "\t@-$(RM) #{fseprepl[dest]}\n"
+       mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}\n"
+     else
+-      mfile.print "#{dest}: #{f}\n"
++      mfile.print "#{dest}: #{dir} #{f}\n"
+       mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} #{fseprepl[dir]}\n"
+       if defined?($installed_list)
+ 	mfile.print "\t@echo #{dir}/#{File.basename(f)}>>$(INSTALLED_LIST)\n"
diff --git a/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild b/dev-lang/ruby/ruby-1.8.6_p287-r13.ebuild
index ede691caf179..22755c1e010c 100644
--- a/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p287-r13.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r12.ebuild,v 1.4 2009/03/20 05:00:41 josejx Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r13.ebuild,v 1.1 2009/04/03 12:26:26 a3li Exp $
 
 ONIGURUMA="onigd2_5_9"
 
@@ -42,6 +39,8 @@ PROVIDE="virtual/ruby"
 pkg_setup() {
 	use tk || return
 
+	# Note for EAPI-2 lovers: We'd like to show that custom message.
+	# *If* you can make USE dependencies show that, too, feel free to migrate.
 	if (use threads && ! built_with_use dev-lang/tk threads) \
 		|| (! use threads && built_with_use dev-lang/tk threads) ; then
 		eerror
@@ -67,6 +66,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.8.6-openssl.patch"
 	epatch "${FILESDIR}/${PN}-mkconfig.patch"
 	epatch "${FILESDIR}/${PN}-ossl_ocsp-verification.patch"
+	epatch "${FILESDIR}/${PN}${MY_SUFFIX}-mkmf-parallel-install.patch"
+	epatch "${FILESDIR}/${PN}-1.8.6-uclibc-udp.patch"
 
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
diff --git a/dev-lang/ruby/ruby-1.8.7_p72-r10.ebuild b/dev-lang/ruby/ruby-1.8.7_p72-r11.ebuild
index a8fd9bce0326..0f55df7d109a 100644
--- a/dev-lang/ruby/ruby-1.8.7_p72-r10.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p72-r11.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r10.ebuild,v 1.3 2009/03/20 04:58:23 josejx Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r11.ebuild,v 1.1 2009/04/03 12:26:26 a3li Exp $
 
 #PATCHES APPLY, DOESN'T COMPILE THOUGH
 #ONIGURUMA="onigd2_5_9"
@@ -74,6 +71,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-1.8.6-shortname_constants.patch"
 	epatch "${FILESDIR}/${PN}-mkconfig.patch"
 	epatch "${FILESDIR}/${PN}-ossl_ocsp-verification.patch"
+	epatch "${FILESDIR}/${PN}${MY_SUFFIX}-mkmf-parallel-install.patch"
+
 
 	# Fix a hardcoded lib path in configure script
 	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
diff --git a/dev-lang/ruby/ruby-1.9.1.ebuild b/dev-lang/ruby/ruby-1.9.1-r1.ebuild
index 43dc77cc6e6f..aac3cf73e399 100644
--- a/dev-lang/ruby/ruby-1.9.1.ebuild
+++ b/dev-lang/ruby/ruby-1.9.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1.ebuild,v 1.1 2009/03/21 10:12:08 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.1-r1.ebuild,v 1.1 2009/04/03 12:26:26 a3li Exp $
+
+EAPI=2
 
 inherit autotools eutils flag-o-matic multilib versionator
 
@@ -29,7 +31,7 @@ RDEPEND="
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk[threads] )
 	>=app-admin/eselect-ruby-20080921
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
@@ -51,9 +53,7 @@ pkg_setup() {
 	epause 5
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	cd "${S}"
 
 	# Patch wrt bug #238061
@@ -62,6 +62,7 @@ src_unpack() {
 	epatch "${FILESDIR}/ruby19-rubygems-gentoo.patch"
 
 	epatch "${FILESDIR}/${PN}-ossl_ocsp-verification.patch"
+	epatch "${FILESDIR}/${PN}${MY_SUFFIX}-mkmf-parallel-install.patch"
 
 	# Strip rake
 	rm "bin/rake"
@@ -75,7 +76,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
@@ -107,7 +108,9 @@ src_compile() {
 		${myconf} \
 		--enable-option-checking=no \
 		|| die "econf failed"
+}
 
+src_compile() {
 	emake EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
 }