Fix color option for eselect on new installs to work with all eselect versions, fixing bug 554566.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

7 files changed, 26 insertions, 30 deletions

diff --git a/dev-ruby/rubygems/ChangeLog b/dev-ruby/rubygems/ChangeLog
index 196292eee72f..b3d90f43b1af 100644
--- a/dev-ruby/rubygems/ChangeLog
+++ b/dev-ruby/rubygems/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rubygems
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.273 2015/07/03 10:06:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/ChangeLog,v 1.274 2015/07/12 06:51:41 graaff Exp $
+
+  12 Jul 2015; Hans de Graaff <graaff@gentoo.org> rubygems-2.2.2.ebuild,
+  rubygems-2.2.5.ebuild, rubygems-2.2.5-r1.ebuild, rubygems-2.4.6.ebuild,
+  rubygems-2.4.8.ebuild:
+  Fix color option for eselect on new installs to work with all eselect
+  versions, fixing bug 554566.
 
   03 Jul 2015; Agostino Sarubbo <ago@gentoo.org> rubygems-2.2.5.ebuild:
   Stable for alpha, wrt bug #553298
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index cf336bc92640..ed5a501ca8bd 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -11,27 +11,17 @@ DIST rubygems-2.2.2.tgz 414111 SHA256 572dd13baa1dfb9756db9fbfeb629be1634efddb70
 DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
 DIST rubygems-2.4.6.tgz 447588 SHA256 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 SHA512 2cf5447e0de8e8f85916e91774eba1f2113397d3ed7147671b74443696574ba0478d8f2aec789d024eabcd5afc1c4910dbe71f389b30045fa50bde14d2bb1cb1 WHIRLPOOL e901f4354c706666b8f85cd0d345c8ad04eecb88914927e9b213bd7a83fd9be42c3d1082da87cafce0cc05deafa70436250a2fee92b62f91e6e113fbfa66c1b0
 DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
-EBUILD rubygems-2.2.2.ebuild 4466 SHA256 a19f0996d6b25737e0ebfba5bc5afbe5e6903a5ce0505bbe94edad2de477ee9e SHA512 158e021ef5504d086ec8ca88c5eafbf9d8bac60496fd7ee06083d4d177259701a09b55c1a0865432859747d9952c440ad5da72d69b7cb8ed7921b3bcd91cdf3b WHIRLPOOL bce0fc79b35ef9473a4c127dde66454aee484b46c17987a0b8cb33e07a75ab8aaa28069ecc88e4ca55a056f6560c43497a15da869700eb3556abce7543f59978
-EBUILD rubygems-2.2.5-r1.ebuild 4484 SHA256 c9352d1b05411197b70bccf214529b0c006b2bc77fe7a9e3f3aad2ea29dad49a SHA512 0327c531ca52e0a1ed62071ec819f6ec25a148d1201319517749e85c119584a90a76690b74bcff10409dd1b90b6758b75064883a56ddeced0c3434411ca7ad3a WHIRLPOOL 9261a8fb7a9300355dd51a213bc42c31d3a9a6ca40e7e8bce805621f376b4ce1e70db861e3dd979d1dd775fc0b001cc2404bdbafdaba225ed297bc0b2f6922c1
-EBUILD rubygems-2.2.5.ebuild 4465 SHA256 c3bb022c445eed98aee846dbb4d159f40b717770ff7039acea164d64590bfe44 SHA512 77121a227161b09a101e6dabce59bfcfb7a71ceb70c8c955a04e0698f2a3543156e54b01df446c3a339a6c35e64e31dd552c35b2035ab647909c2f0f89e7a556 WHIRLPOOL 5d2747687607245de455e928ad11443e1fcc29770ef765b3f711ef9d31625f44d89c22c7d35b72cd0f314933e65f0ec3dc9fbe6fad40a1e21811d95fff672449
-EBUILD rubygems-2.4.6.ebuild 4206 SHA256 ef516a70ffba455494fdbd6b30439832b7d4ef20639af461ae64e9cbdc3dd1e3 SHA512 78e47e7df9c8f05f900a954350c0f4ed31930da3e213c8067a5f803b4f61c1eda0fdc5020b5ad888aa5af89b3a7677e577d2e977887dd63e25b49ac67423a6f2 WHIRLPOOL 985ee3bfd8a6d9778ff8947f9a25ee3db8f54e9bcacd961068877f02604dcb278057bfe2e15a524559ee320f5ea6d51d5b45e5281b9f8dc1557110c88059e823
-EBUILD rubygems-2.4.8.ebuild 4206 SHA256 cd33034a0180a57786daba23f27b2c9406c97e3b38acaa16e710b898d5848d4b SHA512 d2aae1aae94d7a28d28788c16dcdfb5ed4bc6e995188c5a4d5ee27b4e99dfa5ce19a7ed98dc4cf3fa9364c82ea5091e1f04e127adbe0f7307718a51ad86c0e1b WHIRLPOOL 1ea5129732f8f3a3d71557d8a0523d2fff6bf8ab7312e72281b44c4710640c80b49c962299b6281bb2ee1c6a03e86934e00b6c75fd95de8b2747f939bc02cec7
-MISC ChangeLog 40768 SHA256 4b183dfc42b04a3f3d6cc85543ded6871d08dcd34a72041025b98ca9ce82ffce SHA512 f80b1e32ef5b0c6a1ac99623993e79e36049c5589f1928e57e29b3222c0b8f0ad079a209508efbeb693ccc47f9ab601bf5fad774f2dd13e3ec05bcd31eafa7de WHIRLPOOL b117d169451bdc18dc1b0bb8971d665b662191066db2de369b16978c167ae5c7b1034eccd55eb4682ac3c33bf90692939a693eee3d0f3abfd648d8fab282345e
+EBUILD rubygems-2.2.2.ebuild 4467 SHA256 bc5d58285f2d7814b763432e3849170e04daf62ce0756ff57a7bf6271c9281fb SHA512 f26b06c60a087882dc73f6f73699156569dff53615ad11b309b0fb019fc3b2bbf8c34e47a367ce224efbc12b96315cf8b49fbd50b7451551dfc9f83c2bb24a5a WHIRLPOOL c7971c313cb10419751eae3baf1a5dc78117395df9fd2c1cf7509ebc63cb2dc9269a13d725436afe23ab19752d14e5bc52b4cab9114faa310fb5697017a9befa
+EBUILD rubygems-2.2.5-r1.ebuild 4485 SHA256 e1f779c0d35c51f37f4e0f8d465e092f660702986c6ede4ad085fd6beca41e85 SHA512 a54a73127c0a78082b12417a4a6f41cd17004832fa6e1e2d7b4188363c61b70c443eca7b66dcde068bb9f778f7da791c74489e895886af527291f72eee7bcad2 WHIRLPOOL 212a61c50e46727ab07981d5553daff86edd94abf0b74912f46820c769c7aab74bbcde7d06d5dacdae3ce660449f7243ba0c62d4ed1f0d4f9640e71c011176eb
+EBUILD rubygems-2.2.5.ebuild 4469 SHA256 58755ed4de69726aafcdbeeafcc2d78f3e6763d33e5c03aa96d17bde6b941cb6 SHA512 6b55db8c81d3e18fde56247f591f0bc8fcf98a75ba92e9a02417ed523e0b95a796e730a2bd63076db6927ab2d0e0850296466222256e83c09d2c0d1e6462d641 WHIRLPOOL b804f340cdbea33e1e68ad132597dcdf54b92ddc7247322d084eb0132d1ebe1d16591f131ca7961b79be3a7b581a9ba15b0f2b7b897978f3533146a3332e1085
+EBUILD rubygems-2.4.6.ebuild 4207 SHA256 72cc98ba7296f1fd68d7bef0225119c11c98145227b21cd19f971ee2e4d79449 SHA512 3daa3263e746489d0ec459345288e65b6fab2406139a783403cacaa14c28262092fb8ee9158e99ddf2943ed5faa2e6fa1b75f68aa823c4814609d4e024f77ee5 WHIRLPOOL e1e3da3566921cc3a77d39c4a6a19e2f7b477d72866ea9441642c863f391727182d7f7db8c95d27930efc4b8b5233d55002cdb1a476a4514f6a20d8823fa55aa
+EBUILD rubygems-2.4.8.ebuild 4207 SHA256 cd6e49d1ca88159882fb816f5407f01252969f8949906c6d48c3fe2367130e77 SHA512 08a81614cacd16229697a7f475491f3ab624ca1157c895be5bc82dfc3927ab18c8db36334f1235b4768804a8d2e2e936cedf278ada6407ec0eb378a2d17a4e45 WHIRLPOOL 5deba511fd6a1711b0c0f64d88d4719d6230a143474be662afed64e8f5da72f6edb5220c32f53bba8f2cc44fe44dc21d8d8ad8c45b56f7dea2bc4ce66c805ee5
+MISC ChangeLog 41047 SHA256 5fa532bb7de7bf37822da0419007718589c8ed614fb45211bffbe07a36c1f57c SHA512 59227b74b8c9a170468b5d051d35e1bba1ca1d3b46983536785548847cadedbce27be024091b8dfaafbd2e2c349f178b525fe249261f99ef4eb4d60bdbb1bd49 WHIRLPOOL a6c2dddce60ef840ef2e5a370ad1b1a254cd43e7fbb5fae0747f5fdecb0d1b68e499daaf3e6fdfa4790349bd7187bff37bca1e272da66b1979e705eca2c1b749
 MISC metadata.xml 318 SHA256 6e5f2eec30e8b7f9b678daf799db43ea56cc4566ca70635677d2cf5f60ebd3dc SHA512 a8036da4d9fd5c22fd71ab1eee6de35c25737616e9cf443786f0a6d9c2ebf1e5f3791f19ebe7693635eeb0bc793931e935ed0f7011fd37b764f7b26c59fde8a4 WHIRLPOOL 4aa04bfa68b9ac28debd59f64629806e100583b05a80edab02f917e9bb7f3b5afd7f0b35b05731580f895a531dcabf8dedf6ce21c43dd1cf44df66a21be6ae26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVll6IAAoJELp701BxlEWfCsEP/jzNZ6cSewR5T0In2MQIOi0w
-41bsDEZmGOoG9F2sC4QnUq7EpzOgYcEgrPrv+YqSqpXgb4+9ymHft2aAKvzu1R1D
-J03GhbCXLN2bLmTAl1RTRs9iySrtIRjeO2645cOcqV/Ndj5NAdAbFdgfcTZ472se
-MOXvxmh1b5n+YdDArEzNeNw1veJstIkHPXCHIY6q/9xncL8AZ22/mcGce+b6Oc6x
-qBSVnn+h52vG9BGgN56Tro84i5Zlri5Y3GPR8kDVYp4PY14IHfx5giQ1+f0sk7n7
-F8WvN/Hm6BuCjidjHyObpaE8QijixGmeVnGuRKR6mPjz9QAf0Voc5c4VvreyaO4p
-mzrJq3OuiTuYYK3/lZoFXimt26JdSF0IKSA8FSBPN++fxfBjeWyYGifXFg3OQaXO
-PK2DTDG+56Z2CtQqRHdm8YuKcsIzD6ByqwuDVz0pCNNrJHhKk8EwfLAkOCtxuvEO
-RtULJM/v7w6KoWCedgoMYpFYQ2fv3wXHwpQ9cr4PttddwJhv1WwSqAZhkAYKFhsC
-r/Ety+zyN5tG3Qu9use8NDHHPYgCuDCnEwasEnI683tAWB1mAHSMSmcMuTXGOk/j
-VAgLiLjLZRroiyrp2LhYLU9TeJg7zDgdefzcMUNnpAc8DDycuwYJN5os/WbEaCJy
-DGmdJcbP13vS8LS7MH0Y
-=ZjkQ
+iF4EAREIAAYFAlWiDn8ACgkQiIP6VqMIqNfg9wD/dcBZtJ9Fws18e1jvEoFJFuVo
+8CjOZc7GdVp5elq86eYA/0PIGRxETpJaG9ojCVmP/jkzTymPRYffobKH8zTtyG12
+=ztsx
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/rubygems/rubygems-2.2.2.ebuild b/dev-ruby/rubygems/rubygems-2.2.2.ebuild
index 86c7373d1cfa..2f44c63d61bd 100644
--- a/dev-ruby/rubygems/rubygems-2.2.2.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.2.ebuild,v 1.13 2015/01/19 19:56:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.2.ebuild,v 1.14 2015/07/12 06:51:41 graaff Exp $
 
 EAPI=5
 
@@ -101,7 +101,7 @@ all_ruby_install() {
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
 	fi
 
 	ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild b/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
index fd440d19ecf8..e65d929a554e 100644
--- a/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild,v 1.1 2015/06/28 08:10:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild,v 1.2 2015/07/12 06:51:41 graaff Exp $
 
 EAPI=5
 
@@ -101,7 +101,7 @@ all_ruby_install() {
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
 	fi
 
 	ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.2.5.ebuild b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
index a5f4e10bfd05..d15483264855 100644
--- a/dev-ruby/rubygems/rubygems-2.2.5.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.8 2015/07/03 10:06:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.9 2015/07/12 06:51:41 graaff Exp $
 
 EAPI=5
 
@@ -101,7 +101,7 @@ all_ruby_install() {
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
 	fi
 
 	ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.4.6.ebuild b/dev-ruby/rubygems/rubygems-2.4.6.ebuild
index 07007934b595..b9baf06fb060 100644
--- a/dev-ruby/rubygems/rubygems-2.4.6.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.6.ebuild,v 1.2 2015/04/27 08:40:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.6.ebuild,v 1.3 2015/07/12 06:51:41 graaff Exp $
 
 EAPI=5
 
@@ -103,7 +103,7 @@ all_ruby_install() {
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
 	fi
 
 	ewarn
diff --git a/dev-ruby/rubygems/rubygems-2.4.8.ebuild b/dev-ruby/rubygems/rubygems-2.4.8.ebuild
index 4f7fe00ccdb5..668475120c71 100644
--- a/dev-ruby/rubygems/rubygems-2.4.8.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.8.ebuild,v 1.1 2015/06/11 05:37:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.8.ebuild,v 1.2 2015/07/12 06:51:41 graaff Exp $
 
 EAPI=5
 
@@ -103,7 +103,7 @@ all_ruby_install() {
 
 pkg_postinst() {
 	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
 	fi
 
 	ewarn