Add new revisions to allow slot 0 and slot 7.0 to be installed at the same time, fixing bug 527670.

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

4 files changed, 70 insertions, 7 deletions

diff --git a/dev-ruby/ohai/ChangeLog b/dev-ruby/ohai/ChangeLog
index cfa5bc33242c..fa4f336fc611 100644
--- a/dev-ruby/ohai/ChangeLog
+++ b/dev-ruby/ohai/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-ruby/ohai
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.23 2014/11/10 19:09:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.24 2014/11/10 19:21:36 graaff Exp $
+
+*ohai-7.0.4-r1 (10 Nov 2014)
+*ohai-6.22.0-r1 (10 Nov 2014)
+
+  10 Nov 2014; Hans de Graaff <graaff@gentoo.org> +ohai-6.22.0-r1.ebuild,
+  -ohai-7.0.4.ebuild, +ohai-7.0.4-r1.ebuild:
+  Add new revisions to allow slot 0 and slot 7.0 to be installed at the same
+  time, fixing bug 527670.
 
   10 Nov 2014; Hans de Graaff <graaff@gentoo.org> -ohai-6.18.0.ebuild:
   Cleanup.
diff --git a/dev-ruby/ohai/Manifest b/dev-ruby/ohai/Manifest
index d55a19d7156a..60a174e03e1a 100644
--- a/dev-ruby/ohai/Manifest
+++ b/dev-ruby/ohai/Manifest
@@ -3,14 +3,15 @@ Hash: SHA256
 
 DIST ohai-6.22.0.tgz 385237 SHA256 4a725c21880882f9538589a93def7ea12082cb5009e2579c93eb8e8df8feb0b0 SHA512 53e03874af03c15e00cfce693299d49671c77d2883059f37f1e1618749cff120e681e181cbfd47a4146715d54b082ac61377566cadf6f51e622ff31e181b8283 WHIRLPOOL 2896838ccf1bb0d338eab5c9369056f1f42f9dfd2a06937fcb26968ff2e8d468bd94c17d3999c643346c53393fad5d609e03e8764faa8c0a7a923e54888ba21b
 DIST ohai-7.0.4.tgz 432284 SHA256 e22ff1df32334dcba8b5536e27b98febb633e2f89a875610d928912349af8131 SHA512 94479e0767715f230b481df7b3a52390f497fa560d966a2f784f289f724e5f586fe12b874404a4192272a4211f8cd9f13b1cd7ac995b92d40a3886749487b431 WHIRLPOOL 71cfe8bf954d154e7252a4451aef32e7d03ad192f9a998d7d828018c9e076715b9d91e91c9b53e8c3b6a7d604bd561f5e4fd11acecf7b7474dbfc646284dbfd5
+EBUILD ohai-6.22.0-r1.ebuild 1330 SHA256 07a0443b1bcd7d5a8cbaaa07ff15facf4cb7f39b806285cf1e59d672d8f8fae1 SHA512 b8bb9ee1ea8e135150a649bc66fa35f64ef60247dae467bc69c88bf08f5c66d31901f3ce976075ed721c845ad9d85f15ed64a11f4783d7ef425bbcc2e4a2235d WHIRLPOOL ffa6dd8a5d5ce58bb29262728a38d6cb74e2a19ea209cc78359183ef16f48100266fe86e2fded3c557ab6049bf7516051c44e7805c318873ed3567e867631294
 EBUILD ohai-6.22.0.ebuild 1331 SHA256 56c470fc9967b01f7619856a775b44713c76da1a4002add72b443d78e8de45d8 SHA512 9603f4695cdca3ecd647c6028061528fd7084c880f52f029be5328efe6a74f0c6a420aa67a6503f8cd4dfc57115e4cb88bda2a0a52abe659ce5f3a6c65f4d876 WHIRLPOOL 9fe55ab7b416bd4efcbd921568c22bd47f6ecae0879a004f330d21e4530cd701d5fda8927128360116247df25f9d5d8946e041fce825689cc3b49343d39ab440
-EBUILD ohai-7.0.4.ebuild 1421 SHA256 b928d207ca65bd6e4a2d3d01ee5aae5e2f4bcca7339dbe4c6a5f29a8d767cf60 SHA512 192db689fa05630d5f2880ada1091d007d69a3527576a4251ffd71d5f404b9878b59c3f57fb848a98230309d5b2736d66d1a6ba0d23db9e2ccb5be055fb67081 WHIRLPOOL c4495dfae4a59ea17b345d9e1dbb83d7cf96852ad3084f15e1c334f5095eb96a0f4efd5f592e42b6d68b52e0576f165baadbc8991b7c6d1b3a2d990b61042191
-MISC ChangeLog 3781 SHA256 576acba47729adfad8f5cb1fd18a80fc273d245f86c12c8976382b2768e89bc2 SHA512 eda09fc3683626e8329cf436cf3f3f1a8fe5732847cf5f883afcd5bc85a9086dedf2531ad88a11a7d5e5ba14fe114c6d446b125589b7563ce6066618a4fff48c WHIRLPOOL 77f82dc21b1387fced1c0eb75d4e1f59b4072c018893dece0b98afbbd1ea852fc45bba6554bb42ef973e033b66bb7d5ee700b6badfd1ed6283ff90f1b95b05b8
+EBUILD ohai-7.0.4-r1.ebuild 1463 SHA256 afb1da1680f13eb74b349f0b3a0e14e9bda1edc24387d64b74ecde18e1ba352e SHA512 be517fb78a1243cac41f841c200f9f3fac4f1a54b60a57c0f28f24e5adde7452b01a896c6e539cb3c578c739f75c5000fefccb2bcbb2767fb25a179ea7d2f2ff WHIRLPOOL 85aa799410dea13ea0abe92040acc3cc53e0d66d4193995b2fd0ae812dbdeb9aef93a09ccc657f7685185a08835bb84202403f3e907fef2306b9ec2d75f5adbd
+MISC ChangeLog 4065 SHA256 a66bf9fe3d4f1bdf878799c7e04817cde7d247a0cefc594991e5fbbf60e14e80 SHA512 abcb54c951cf713e6d4daf72514bb520cdedfb4757a8251997c4cf37977d8e22789606e9e0a6f17386a2262d88d813e1257ee4d8b424eb995aa662ec55ae0aaa WHIRLPOOL f7a6b66d60649c928fbae5fbe0ca3d186dc29261ed55077a22d7ea8182cfc7b6aeb41e89551c97ab1a9aeacece3a76dcef4a2d5d06dc3083f7872422d3d9dc40
 MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRhDW4ACgkQiIP6VqMIqNe0jgD/Z+nZ205I45LPPX4Y7V5oH0pa
-fpwh85e0rT8a4FaoYAIA+wUB1gfFP0NgVsSMcyFvMHnqIZG0xBUfThTFeftnOKei
-=Ui5C
+iF4EAREIAAYFAlRhEEEACgkQiIP6VqMIqNcPjQEAjLGv3Xt0S0FJOWNAu4mGsMPB
+MCPLNZgyt2ACr3aqGJQA/2+pa6lE11mlWrXkWj0R3ErVp+uWdmLJM/zFxbj1bFUC
+=rrUc
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/ohai/ohai-6.22.0-r1.ebuild b/dev-ruby/ohai/ohai-6.22.0-r1.ebuild
new file mode 100644
index 000000000000..6ad27a4a8d47
--- /dev/null
+++ b/dev-ruby/ohai/ohai-6.22.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.22.0-r1.ebuild,v 1.1 2014/11/10 19:21:36 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ohai profiles your system and emits JSON"
+HOMEPAGE="http://wiki.opscode.com/display/chef/Ohai"
+SRC_URI="https://github.com/opscode/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/ipaddress
+	dev-ruby/yajl-ruby
+	dev-ruby/mixlib-cli
+	dev-ruby/mixlib-config
+	dev-ruby/mixlib-log
+	dev-ruby/mixlib-shellout
+	>=dev-ruby/systemu-2.5.0"
+
+all_ruby_prepare() {
+	rm Gemfile .rspec || die
+	# Be more lenient to work with versions of systemu that we have in
+	# the tree.
+	sed -i -e 's/~> 2.5.2/>= 2.5.2/' ohai.gemspec || die
+
+	# Remove the Darwin-specific tests that require additional
+	# dependencies.
+	rm -rf spec/unit/plugins/darwin || die
+
+	# Avoid the ruby plugin tests because these always execute the
+	# system ruby, rather than the current ruby.
+	rm -rf spec/unit/plugins/ruby_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+}
diff --git a/dev-ruby/ohai/ohai-7.0.4.ebuild b/dev-ruby/ohai/ohai-7.0.4-r1.ebuild
index 55f81f43f64d..46bc11361bee 100644
--- a/dev-ruby/ohai/ohai-7.0.4.ebuild
+++ b/dev-ruby/ohai/ohai-7.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-7.0.4.ebuild,v 1.1 2014/07/22 06:20:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-7.0.4-r1.ebuild,v 1.1 2014/11/10 19:21:36 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19"
@@ -21,6 +21,8 @@ SLOT="$(get_version_component_range 1-2)"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RDEPEND+="!!<dev-ruby/ohai-6.22.0-r1"
+
 ruby_add_rdepend "
 	>=dev-ruby/mime-types-1.16:0
 	dev-ruby/ipaddress