graaff 14/11/10 19:21:36 Modified: ChangeLog Added: ohai-6.22.0-r1.ebuild ohai-7.0.4-r1.ebuild Removed: ohai-7.0.4.ebuild Log: Add new revisions to allow slot 0 and slot 7.0 to be installed at the same time, fixing bug 527670. (Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
Revision Changes Path 1.24 dev-ruby/ohai/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ChangeLog?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ChangeLog?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ChangeLog?r1=1.23&r2=1.24 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ChangeLog 10 Nov 2014 19:09:33 -0000 1.23 +++ ChangeLog 10 Nov 2014 19:21:36 -0000 1.24 @@ -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 <[email protected]> +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 <[email protected]> -ohai-6.18.0.ebuild: Cleanup. 1.1 dev-ruby/ohai/ohai-6.22.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ohai-6.22.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ohai-6.22.0-r1.ebuild?rev=1.1&content-type=text/plain Index: ohai-6.22.0-r1.ebuild =================================================================== # 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 } 1.1 dev-ruby/ohai/ohai-7.0.4-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ohai-7.0.4-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ruby/ohai/ohai-7.0.4-r1.ebuild?rev=1.1&content-type=text/plain Index: ohai-7.0.4-r1.ebuild =================================================================== # 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-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" inherit ruby-fakegem versionator 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="$(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 dev-ruby/yajl-ruby dev-ruby/mixlib-cli >=dev-ruby/mixlib-config-2.0:2 dev-ruby/mixlib-log >=dev-ruby/mixlib-shellout-1.2:0 >=dev-ruby/systemu-2.5.2" 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 doman docs/man/man1/ohai.1 }
