summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-13 21:33:55 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2012-08-13 21:33:55 +0000
commit6b173f122c6e5108ecfd9b57f52dc83eba814723 (patch)
treed11ef4b3c787b3dceb65a74301dea87b9b185a35 /dev-ruby/ohai
parentFix mask on all revisions. (diff)
downloadhistorical-6b173f122c6e5108ecfd9b57f52dc83eba814723.tar.gz
historical-6b173f122c6e5108ecfd9b57f52dc83eba814723.tar.bz2
historical-6b173f122c6e5108ecfd9b57f52dc83eba814723.zip
Revision bump to remove the patch that does not work; drop ruby19 support as tests blatantly fail expecting Ruby 1.8 instead.
Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
Diffstat (limited to 'dev-ruby/ohai')
-rw-r--r--dev-ruby/ohai/ChangeLog11
-rw-r--r--dev-ruby/ohai/Manifest21
-rw-r--r--dev-ruby/ohai/files/ohai-6.14.0-multiple-ruby.patch17
-rw-r--r--dev-ruby/ohai/ohai-0.6.12.ebuild4
-rw-r--r--dev-ruby/ohai/ohai-6.14.0-r1.ebuild (renamed from dev-ruby/ohai/ohai-6.14.0.ebuild)10
5 files changed, 31 insertions, 32 deletions
diff --git a/dev-ruby/ohai/ChangeLog b/dev-ruby/ohai/ChangeLog
index abb9d7a7f771..3bc7776690db 100644
--- a/dev-ruby/ohai/ChangeLog
+++ b/dev-ruby/ohai/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-ruby/ohai
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.13 2012/08/11 16:17:12 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ChangeLog,v 1.14 2012/08/13 21:33:55 flameeyes Exp $
+
+*ohai-6.14.0-r1 (13 Aug 2012)
+
+ 13 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> +ohai-6.14.0-r1.ebuild,
+ -files/ohai-6.14.0-multiple-ruby.patch, -ohai-6.14.0.ebuild,
+ ohai-0.6.12.ebuild:
+ Revision bump to remove the patch that does not work; drop ruby19 support as
+ tests blatantly fail expecting Ruby 1.8 instead.
11 Aug 2012; Benedikt Böhm <hollow@gentoo.org> ohai-0.6.12.ebuild:
add ruby19 support
@@ -66,4 +74,3 @@
03 Jul 2010; Benedikt Böhm <hollow@gentoo.org> +ohai-0.5.6.ebuild,
+files/ohai-lsb-release.patch, +metadata.xml:
initial ebuild, thanks to Gábor Vészi
-
diff --git a/dev-ruby/ohai/Manifest b/dev-ruby/ohai/Manifest
index 4226ffc3dc0f..fe07a4b0b53a 100644
--- a/dev-ruby/ohai/Manifest
+++ b/dev-ruby/ohai/Manifest
@@ -1,7 +1,20 @@
-AUX ohai-6.14.0-multiple-ruby.patch 586 SHA256 62f90a24c8f8a9336ec33610f6f30b0bd5fa2960da1afcb09c5002c9e3a4b161 SHA512 bbc7130cab27357d6c883a1affe3470eea296ed28dc9651f80f43340826bcae41b78ca80ecab503f87221a57893f8ddffb3f0b3e09a890ce0183d4cc1d546e65 WHIRLPOOL f05aafa1c0a6df4574418673e68f3228184232e28d1b8c73b8d6288f195c4c50d77d82ca554d307cc6ce1e4ba6d1f594e1ca80c7e5c7634db18b6913feb69e28
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST ohai-0.6.12.tgz 97463 SHA256 fc65fcbfb4cdeb186562481ea5a4e73a35db7101f642cbfcdc0a839a607599af SHA512 adeb611af5e7a08c2b1ffaaf4a348535a7d301eb0836b99558298c3eae32d2d2b27e2ea97f243cec49254f888981ba5f6d3cbd5460f34bea425bd2a11bf3d6a6 WHIRLPOOL f670ed10d7c3d31f3e2b04f7b06261a3ff2c7a726091857ff00b7f7242b2ebdd2e70d3948c06b62a980630aced975d7111434015b32115eaa8b8c3fecea17d0f
DIST ohai-6.14.0.tgz 110618 SHA256 beb8bdee164bdcbc8eb3887c9272dc333a562aa297df760a42d778bf09b740ff SHA512 85eb788680a08cb84349dbbdccf313e24c86c799914ff43296e7d11d022e4fbe3e209afcbd0ca3c333f53b14b4de2696fc6429381a6901d793542bb4d3155704 WHIRLPOOL aaf56edbcb0081d673afc4fb2e221c3e810b55965bd17a049cae13fdae70ea0700d2dabc6dbfa9a390dcfc490abdcb0643fd437f7c47c51d4c2ce750f74add8f
-EBUILD ohai-0.6.12.ebuild 1104 SHA256 272cec3b014577fa72ad6cec35403fcacaae670c08b0ada33a5e583f7a7f2036 SHA512 90fc9999f41b6aba277485d73f38dcb2e08315a9f9edf1a362e98dc3f0f2e4a52d7dc9b3796dfe0b37aec6e29de0fe35b6bad6c926b6c64414085e75226ecd96 WHIRLPOOL d4c10c32e21d36c907c34c56f36872fb55b576457355c20ff8f7b7df5b3153d9bafbff678b16e5463d81bcf228587b1963120757ee19cc794d7413b6ca48612e
-EBUILD ohai-6.14.0.ebuild 1010 SHA256 d4ec4c88dbdec41dde4d13c9d8581a3b5e7101feb314105aee8023dd65ea8b6a SHA512 bf696f214b15dd1dc401bc1b208e88b01b6e11683302b5939fbba1d298c1475cbe7df0d07f0e863dc4c5daad7063775301ac3e08ab7724df8af036f59bbd790d WHIRLPOOL 2528d73fbc76a2fa8db83f2e169e97b249e090c9d997618769c802aeed21af6aebddcbe8203a6b43af1d8889f7953d2818af47d0835fc939d6ec29d9f91770cd
-MISC ChangeLog 2252 SHA256 171859012af690b4756e83e5f3cede7e3961332db382f442f2f8c1af16e79a13 SHA512 69a714d23375a1e36a1f0244a477ff7c1c2d7504f0e8f88d6a5d7ba9325e81a0e6bc5f5ecda10ad9549af5c18f337652ac5238a6d01ada5846ee2c356c4481c4 WHIRLPOOL 8118e28c868a3470fac16a9820385c0452c2ddcd0d6837968041d36a1b75fac44a6970855e5449e127bc64770406de6012441b975c8eecbfcb47d04969e004e0
+EBUILD ohai-0.6.12.ebuild 1100 SHA256 b4f0a43d56a95c448472abf928920a891d14831ab5cffc87c06b27e21cf6988b SHA512 52630319d3e8c50ced7ebfc0958ae31f97d03401fe667dcf3a86053ee3f8cb9c9daff7428955498159c11189e8887788d995a5be744f7ab1e4199ebb05835e34 WHIRLPOOL b122cbc93f3f3480b9200d600e0c24612d17fb079c87f8e8223a6c8d7d671d12fa2b3f743ae7f278b9bf77f4140e485e7643e93a955332f4f9280568a3d6921d
+EBUILD ohai-6.14.0-r1.ebuild 901 SHA256 29af2839ab34caf2bb500ff90f6c35ebf85ef4ec8ef40829c2829a03826cd2cb SHA512 059439ef2fb5964bd8b71437cc45519a4fa5df3c05de4418befeca13b236f4b1507ac18aa9ab0f819d2de1581fcfff50c1b92615ca43675d5a16e651fb8b3425 WHIRLPOOL 0b0abeeda717bd89f80e7b85d8e65deffc4e4324d15399d6db41ba54e82d3b98fdce0c70b382c4385b12f98dcc71ffa6bd6a09b116232b43aa650c9ea2969db1
+MISC ChangeLog 2581 SHA256 babeab7080d99461f824aab91b587bd8742eeb45ef1c2ccab31fb18418de34a4 SHA512 27a5d2b341a07bee4ba8ccf206c4990e63c9af70e3b6229cd1c40b394942f119f3ca660821d96e840b69f0dea695faa08adfe7930a32443ad89fbb574b670a13 WHIRLPOOL 426b02ae2206c803f65df02b484ab4b27e9fa5f9ad04b23c1d81d4868a4d7765471b9d5f37e5690397e11bc767dc40596274bbe5e94752e13ab3a0f738ad31ca
MISC metadata.xml 158 SHA256 70b396ab3c7a63a81cb895b7728bd9eccdc9770afdb9919f2c54694b685f7032 SHA512 a9ab7b665b00f8a0619ffb3cf5260438a6f47fe997bc9cfbd5410d074b92e473dd1484d79a4afd736f52dc1277af42f6439953c696c35a92c75d94f4eb591baa WHIRLPOOL e8e518ad3cc7f0230aa7a43b82e730310527bd3b22033f13563a7c0630668bb0fa935ce64a3345c84b3fa2623fd14697c2ae0289266ae1fbc97bf032133a4aa6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQKXOEAAoJEBzRPIrUMBNCFBgH/irppC4tD1N+L2aH+VKB+vEm
+yFAmKlPtw0uT+jg6vW8GGQ+46KoOdhakRgpv/J1DiB/6gG/JaHJTTKqyk6nO4yDt
+mOR1Qi1v6yGls/ehi+TXnRh54vr4xgDrgZELYH7zsz6uk5M9n/iGMUe7RqaklU/G
+JoqaXcdORUERuT9qw0+liflpYYewSc6j2AS3n9hD6Tx4LhsqPIWRmmZ3iH/Ey1hd
+OOTfC8Z0N2fWyTYC8tbfv6HwXkdytCaRBUMPSuAr8L5mJWJponQxes/2L7Bjqn1W
+q9qSUVsjhsiJ6nnrV0HoOZsLgWqYGJBIyDdobLq/eEX/MHwHS0ETmKRFWenBq1w=
+=Wjc7
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/ohai/files/ohai-6.14.0-multiple-ruby.patch b/dev-ruby/ohai/files/ohai-6.14.0-multiple-ruby.patch
deleted file mode 100644
index 6b69d4f85253..000000000000
--- a/dev-ruby/ohai/files/ohai-6.14.0-multiple-ruby.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/lib/ohai/plugins/ruby.rb b/lib/ohai/plugins/ruby.rb
-index a54de8e..67591d0 100644
---- a/lib/ohai/plugins/ruby.rb
-+++ b/lib/ohai/plugins/ruby.rb
-@@ -20,9 +20,11 @@ provides "languages/ruby"
-
- require_plugin "languages"
-
-+require 'rbconfig'
-
- def run_ruby(command)
-- cmd = "ruby -e \"require 'rbconfig'; #{command}\""
-+ ruby = ::File.join(::RbConfig::CONFIG['bindir'], ::RbConfig::CONFIG['ruby_install_name'])
-+ cmd = %{#{ruby} -e "require 'rbconfig'; #{command}"}
- status, stdout, stderr = run_command(:no_status_check => true, :command => cmd)
- stdout.strip
- end
diff --git a/dev-ruby/ohai/ohai-0.6.12.ebuild b/dev-ruby/ohai/ohai-0.6.12.ebuild
index f073f9bda597..947be7a17bd3 100644
--- a/dev-ruby/ohai/ohai-0.6.12.ebuild
+++ b/dev-ruby/ohai/ohai-0.6.12.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-0.6.12.ebuild,v 1.2 2012/08/11 16:17:12 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-0.6.12.ebuild,v 1.3 2012/08/13 21:33:55 flameeyes Exp $
EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
diff --git a/dev-ruby/ohai/ohai-6.14.0.ebuild b/dev-ruby/ohai/ohai-6.14.0-r1.ebuild
index c387271735fe..e791532db10d 100644
--- a/dev-ruby/ohai/ohai-6.14.0.ebuild
+++ b/dev-ruby/ohai/ohai-6.14.0-r1.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.14.0.ebuild,v 1.1 2012/08/11 09:14:47 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ohai/ohai-6.14.0-r1.ebuild,v 1.1 2012/08/13 21:33:55 flameeyes Exp $
EAPI=4
-USE_RUBY="ruby18 ruby19"
+USE_RUBY="ruby18"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit ruby-fakegem
@@ -22,10 +22,6 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RUBY_PATCHES=( "${FILESDIR}/ohai-6.14.0-multiple-ruby.patch" )
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
-
ruby_add_rdepend "
dev-ruby/ipaddress
dev-ruby/mixlib-cli