Revert the ruby-config changes

Package-Manager: portage-2.1.6.2/cvs/Linux 2.6.26-gentoo-r2 x86_64

6 files changed, 87 insertions, 13 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index b5645c524d48..9609b5b2045d 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.360 2008/12/22 21:17:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.361 2008/12/23 20:20:12 graaff Exp $
+
+  23 Dec 2008; Hans de Graaff <graaff@gentoo.org> ruby-1.8.6_p114.ebuild,
+  ruby-1.8.6_p287-r1.ebuild, ruby-1.8.6_p287-r3.ebuild:
+  Revert the ruby-config changes. We can't remove them until we provide an
+  alternative outside the ebuilds, and eselect-ruby isn't stable yet. Apologies
+  for breaking things as mentioned in bug #251833.
 
   22 Dec 2008; Hans de Graaff <graaff@gentoo.org> ruby-1.8.6_p114.ebuild,
   ruby-1.8.6_p287-r1.ebuild, ruby-1.8.6_p287-r3.ebuild,
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index cf8d2952c080..4e09a4768447 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -9,16 +9,16 @@ DIST onigd2_5_9.tar.gz 221355 RMD160 ceeee9a0221d431d6576a566621ba9badab6423d SH
 DIST ruby-1.8.6-p114.tar.bz2 3920921 RMD160 332d6e98ef79ad8175ce699ed5293407763f769f SHA1 9929782935ebb77d040593a010b8d65b03ce6e23 SHA256 4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63
 DIST ruby-1.8.6-p287.tar.bz2 3956902 RMD160 df0950f1cdf9ea26b6d2f04756d9db89ae295de4 SHA1 29b02ccab3c1d6b4a71148ad960e65b5f892fe17 SHA256 ac15a1cb78c50ec9cc7e831616a143586bdd566bc865c6b769a0c47b3b3936ce
 DIST ruby-1.8.7-p72.tar.bz2 4127450 RMD160 07bf0d6987ba111aed988093c569fb66ba54891b SHA1 462e990a724580e4dfeeac5a271b93f6cfcbf5c7 SHA256 a8f8a28e286dd76747d8e97ea5cfe7a315eb896906ab8c8606d687d9f6f6146e
-EBUILD ruby-1.8.6_p114.ebuild 4553 RMD160 b83caae838482da959e565884afc792028002511 SHA1 409c59a11b1bec9b75eb597a1f7e45790d6af368 SHA256 504fb6a3c630a1fe56b82dc4dcbd557aaa70a792c2e845037c417b53b651420d
-EBUILD ruby-1.8.6_p287-r1.ebuild 4268 RMD160 74538fce5f88d47e9f5ce7263cd533fe7184c128 SHA1 856a3edc1d90108136d53b27a571bcea04923ec3 SHA256 0835a249d2ffdc762d139b4daf3664695c104f3eb2527cdbc732e111e21c6659
-EBUILD ruby-1.8.6_p287-r3.ebuild 4338 RMD160 f6f95b502b26eb32b4e57b5a9ab16eb814d0e701 SHA1 88d653ffb9e5cbd31d4d5ede6adb9b8a76e3e2bf SHA256 8bb2caf2fd36152308d934f7702cac0cd26321953e80684cf34b9d3fd41b6333
-EBUILD ruby-1.8.7_p72-r1.ebuild 4618 RMD160 c9ac23b4d5f53772f126b64a086ed70e7d98501b SHA1 0fe1afd67ebab3a0083798db8c3e2a654f1ad93a SHA256 7ced4e9525db7ad77508d2ee0ee9e4018c544d7958e541e30f757fbb40798ba2
-MISC ChangeLog 53979 RMD160 d85c59c5cfcef2d3163814827efa7756f1a6100b SHA1 37920abaa8ceb4c12ac5d9abd4a0bfe8f868516c SHA256 b5a363a28bcfca5ea9c0b5fadb1efbe5390ba986d4f4d38c856140d52b019d74
+EBUILD ruby-1.8.6_p114.ebuild 4931 RMD160 2c4ebea5ed7e80ca3473397cdd126a987bdfe9ba SHA1 78d7d83667ae9abb46d4dc120c9dee6f2ceb485e SHA256 e20313c71ed6a2647af33d8f1164bf939a33741381fd7cceb8f7eb7d9ae5c182
+EBUILD ruby-1.8.6_p287-r1.ebuild 4646 RMD160 39915495b9f14fa349360553ef26b405fade5a4a SHA1 70861c23eed9eeabd4b1b1353c5258a1d0a832c9 SHA256 ad5cc4a5320fb83349b14e98cf8cd6f2e791cb4bc82919e21f562bd5ac4b044e
+EBUILD ruby-1.8.6_p287-r3.ebuild 4716 RMD160 bd81fadaeacb6fd6e2186b6620fd5f7771de7279 SHA1 200d8db91cf95b5aee62d50c44c1e84a7340319d SHA256 e6a082b15adfb9f713eff21e97a40b435e167d4ce37a3fd47272b26ae4507dc4
+EBUILD ruby-1.8.7_p72-r1.ebuild 4996 RMD160 fbb788ad0a6e6084843954bc4d26d18d6e3084f2 SHA1 30e2c7f785fa3ec124baa41476e0642005e366cb SHA256 dacdfba23768e420afdf3331072bc47247aa0049cd3e913a3d3e76e9f72ea46e
+MISC ChangeLog 54316 RMD160 a415459be6fa488cbba4e341d34a960fef1dcc38 SHA1 93a75d31499bb8b3d9a886bba8bffc703496bfb0 SHA256 1d7e047064fd5b6b67b27da1b258c8b2a2e0ddcd4bc61b62c88fa705a8d74f7b
 MISC metadata.xml 262 RMD160 f8642aa78425fe09dc0e0660cb20a5bd4233d5bb SHA1 64def0369477ecf76b9285fb9c1cf0e6a4f334e5 SHA256 5ee3c0cfedcb966505e4fafcfc5321a8ee20c128da9bbcafff5aa268df588d59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklQBAgACgkQqj4ysMWt/vufwQCfQOHQfVyETHjmrK/8CaZtUOWb
-ynEAoMMv94oRzMLt/rIEUnGuuXzkmxOw
-=B7bh
+iEYEARECAAYFAklRSAoACgkQqj4ysMWt/vumzgCeKdhdoItE/t2RES0nodrc6DEZ
+kdoAnAkK3H617kKY7ESMl9vtj59TwEOp
+=9Xvp
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.6_p114.ebuild b/dev-lang/ruby/ruby-1.8.6_p114.ebuild
index b4a0d787618e..0b45de6ee654 100644
--- a/dev-lang/ruby/ruby-1.8.6_p114.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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_p114.ebuild,v 1.12 2008/12/22 21:17:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p114.ebuild,v 1.13 2008/12/23 20:20:12 graaff Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -30,6 +30,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
@@ -151,3 +152,19 @@ src_install() {
 		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.6_p287-r1.ebuild b/dev-lang/ruby/ruby-1.8.6_p287-r1.ebuild
index 903bd252b3ba..6b36c74a0acf 100644
--- a/dev-lang/ruby/ruby-1.8.6_p287-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p287-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.11 2008/12/22 21:17:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r1.ebuild,v 1.12 2008/12/23 20:20:12 graaff Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,6 +29,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
@@ -142,3 +143,19 @@ src_install() {
 		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.6_p287-r3.ebuild b/dev-lang/ruby/ruby-1.8.6_p287-r3.ebuild
index 3a04e0558b0a..7ceda889a1b2 100644
--- a/dev-lang/ruby/ruby-1.8.6_p287-r3.ebuild
+++ b/dev-lang/ruby/ruby-1.8.6_p287-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r3.ebuild,v 1.4 2008/12/22 21:17:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r3.ebuild,v 1.5 2008/12/23 20:20:12 graaff Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -29,6 +29,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
@@ -143,3 +144,19 @@ src_install() {
 		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}
diff --git a/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild b/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild
index 20e360d2fa62..c5e91f91e442 100644
--- a/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild
+++ b/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.3 2008/12/22 21:17:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.7_p72-r1.ebuild,v 1.4 2008/12/23 20:20:12 graaff Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -31,6 +31,7 @@ RDEPEND="
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	tk? ( dev-lang/tk )
+	>=dev-ruby/ruby-config-0.3.1
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
 	!dev-ruby/rexml"
@@ -151,3 +152,19 @@ src_install() {
 		cp -pPR test "${D}/usr/share/${PN}-${SLOT}"
 	fi
 }
+
+pkg_postinst() {
+
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+	elog
+	elog "You can change the default ruby interpreter by ${ROOT}usr/sbin/ruby-config"
+	elog
+}
+
+pkg_postrm() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+		"${ROOT}usr/sbin/ruby-config" ruby$MY_SUFFIX
+	fi
+}