summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-08-30 18:16:52 +0000
committerHans de Graaff <graaff@gentoo.org>2013-08-30 18:16:52 +0000
commit91840f711f45d2ee2c1507d701a07df64b63b1ac (patch)
tree92dd934f9fe47183f9e6940074f6af771bd62642 /dev-ruby
parentHonor .conf files only, bug#482974, thanks to Steev Klimaszewski (diff)
downloadhistorical-91840f711f45d2ee2c1507d701a07df64b63b1ac.tar.gz
historical-91840f711f45d2ee2c1507d701a07df64b63b1ac.tar.bz2
historical-91840f711f45d2ee2c1507d701a07df64b63b1ac.zip
Add rspec constraint because puppet monkey patches are incompatible with rspec 2.14.
Package-Manager: portage-2.1.12.2/cvs/Linux x86_64 Manifest-Sign-Key: 0x8883FA56A308A8D7!
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/facter/ChangeLog6
-rw-r--r--dev-ruby/facter/Manifest22
-rw-r--r--dev-ruby/facter/facter-1.7.2.ebuild4
3 files changed, 13 insertions, 19 deletions
diff --git a/dev-ruby/facter/ChangeLog b/dev-ruby/facter/ChangeLog
index 927a7c8d8728..e133ecd6bc24 100644
--- a/dev-ruby/facter/ChangeLog
+++ b/dev-ruby/facter/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-ruby/facter
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.82 2013/08/03 07:41:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/ChangeLog,v 1.83 2013/08/30 18:16:45 graaff Exp $
+
+ 30 Aug 2013; Hans de Graaff <graaff@gentoo.org> facter-1.7.2.ebuild:
+ Add rspec constraint because puppet monkey patches are incompatible with
+ rspec 2.14.
03 Aug 2013; Agostino Sarubbo <ago@gentoo.org> facter-1.7.1-r1.ebuild:
Stable for sparc, wrt bug #477012
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 52871fc84a45..38661c1212a5 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX facter-1.6.16-ifconfig-path.patch 5253 SHA256 f3b62a255d6c46b7c537a0b0a1c1673cdb485a951d453ae14238c12fdf482b3b SHA512 0aa4cdef4359f4e75ef5348342208327b587df782f7b9220b87c89a5d4f93bd5fb0d872c77928dd2e7b2e72f245b355af86f5a61d2690948b0d8a84f1d4287c4 WHIRLPOOL 0d1f1969aef374eb8a088d1f94a14945dde70381f863e834d2a13d83a3942cd2f1f94a63807ff4cf4958b4f21ec8b5db171cc80068877d1bcd67c8d28f639bee
AUX facter-1.6.17-ifconfig-path.patch 5218 SHA256 d6ee06a72fe66d972a4d77927d62f257593eea7262ae8d08d871ebbf87c89f03 SHA512 cb35937623dcdfbce88f1a16297a4c6d5405af2456f271aa175ea20e009aeef8ffc03a374e8e8766be5c6324bc32233e7a16ff59a48845b50abd5039423d3c04 WHIRLPOOL 7b129d18cf36ea3c2c0a44e081de3590401787fc5b0ffd554cd90dd0a44eadbf4f3fff686c935f375ff21e2877953be04e2e1fcabe68b7479e7c8645fdbcadcf
@@ -11,23 +11,13 @@ DIST facter-1.7.2.gem 195072 SHA256 e0ebeece898c4302cffeb19d755cd537c907e8ccdb34
EBUILD facter-1.6.16.ebuild 930 SHA256 f0d90f6acd940807ec034acdfc821be234f5b27d48bf4ba5fe57fdb14b2de4dd SHA512 72cd1cf9eb27638b04c657369805e051b856b27fb01610738be461ed930a82413477e392d5b59d548b5efc317c6f23327e3f97c0910e8e7edd076bb1148a4aab WHIRLPOOL f8f8c01f12336b93f16790de060e18481d507b56a1f837f4c16af52408b0ebe8ec404ba21cb896e2e3dd127fa1bf5c6734d33d1f94f917e8049ea25212ad39a5
EBUILD facter-1.6.17.ebuild 1104 SHA256 90af42936fa9923484e64526e4e75f63f2c0a9901f4eb59f1d9316d42b8d323c SHA512 4004a098f94bb1b00b885c4ede739969b31fd44ba74af30d71e377aa36d7f0e8be286975cc18955c0a5f4af7de3953c8c5a31c5f9382b13998eef2e9b4e7eece WHIRLPOOL 9ae97d4e5acc615ea5bced8e1e17d38a2509e795744c9ff6bd871b325871fdf37d2b10f5078091df2a6de1dfaf5bcd96f65154c1fd7d032022db070dbbfe2b35
EBUILD facter-1.7.1-r1.ebuild 1270 SHA256 bfec5d5d9e70c9515e985b353aede2a10d726ae86d108f4e03d71be919b53fa4 SHA512 ae027f057dbca495055b839161480c96f726f35b0d6bbc4f1631c43d1e0e9a24b36661da85e390a8fcb3510eb59f051e3bd5e21100e755b1123a32bbf4deb2fc WHIRLPOOL fa2fc928d755bec163d131d41f532b24ffcb23f8511740c4f7115577036d57a2e2f7a30bf708ebf8ed26b4880c2fbbf9ecaa00d2a745bf75f71828750b62c471
-EBUILD facter-1.7.2.ebuild 1393 SHA256 d010e484875f20113cff1671f0486e270d2a06f612c19c89649d5284e0a76176 SHA512 4af4cd05abe68cc8c13247c5ff674e987f1ec64b106c6ddbd8152e08e0abb38c1f55d1e8aa03375a1b4dd61cc9094c2adbf194b74f8f9663140d4fca9519ee94 WHIRLPOOL 2862c0b701036b1d45ca2c201ba37971626daa8467e77799042bcc0a193e85c0dcb9c29d2817a98f4b29c0cae8718670aac356037050dd85572f6908ab4a2f17
-MISC ChangeLog 11607 SHA256 39f4881fa04119dc06306bed41e5426c73e112bd036b4f5d6a828cfce294ab84 SHA512 59d51932e1e0a466b31d06727c93ea241d467730b8065c42d4afa32c414de51bd06b91d2976a641ef60ddbe3b3ddcd262b93d9dacc3cffcf7b4f4648e7d3f3f4 WHIRLPOOL cd0c16dbcb34606803bb2865f9ef7311e2100b98677c568b6ed327ea1d803253eb62ebc75594fb132ae4c536574c75f3a96bed80f85ccd02954c43a465d0337a
+EBUILD facter-1.7.2.ebuild 1416 SHA256 0a55bdd84c0872443ad3cd66377cd533a3b4b755ae53838216de65b2ba55e457 SHA512 d76949439b722d3c68f56e00d89866701df48ca83515acb1c31669ac138b3400b56f2b5724dae121828c2b34c0b6ba9bcec65f91a1f938c92ffd21fc365d5eec WHIRLPOOL 17cbbc3653d7a051b7372ec9a9e5a4d9a215019b7a986652b185f2010202e240d0d8a7c1cf43e340aebc2616aa0a3e5c51ee166c46fbebe1c6b1ef5e6119bc48
+MISC ChangeLog 11771 SHA256 eeac400051cf6d9df619117ea97146cffb62dd1e8a89161562c2767264fa7b88 SHA512 269b55aba62243d7c91b24a61550577f9cf2ab1791ca03847596ad673724928148ed53312ed90dcf0b10ea1a51f6bbd21d5eb0faeb1daea62e54eff426e16187 WHIRLPOOL f851b3250e185654205934ab420e86e2d33c769045e427afc0c9c0eae37c0fcffb034244d7ecd08b7e0b2e4d66c9c593dbb9b2c686015bd8135807a82db0e96f
MISC metadata.xml 472 SHA256 a0e8e0c5f3128ced8ac0832e506fc66957c1bdda89b4d14f1ae92d1947193e65 SHA512 42c87465448566dbd54cb9614d8498d3448e8c2e8fbe690a07ca4a52fcbe6a7eefacc6312ee8edc867c1bbcf786bbe25cd7438f87a9b17cc8c0328334cdd9f06 WHIRLPOOL 167559e7faaf9f608da0b2c0225965afe8ce14b12cefe6dfa819c78ebc7cd42bb239a4f26c365586b1ca3acdde66a579d9703695eafc2504db15ded244348543
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCgAGBQJR/LNQAAoJELp701BxlEWfUBgQAJX+HLZVo5S3uKXKzTqTozOe
-KL3pvww4TS9ZrJIM9kUnFX3qIrGsbNECAYhbeXKXltLq6WM5Ef2PLcEhUY+XFclT
-wo+SKAXFWQMxY2GOzIHbd9LkE/eqpfFcSUsnifATGOa2UuQCJLitQvsvTSGttp4M
-r93pkRr4b0v8wBnMrp+iSWhkk8nyi07yQ+MRyZ1CyoeU86D1BGWDdI20mq5kR2D1
-VZ3oT+chykY7LkVJnwajEJGCpYhooJubdmzdsrykWjWxiLBtwVzyb3OQnHrSCZ4z
-+NMPJwE5rb/5T7PGH/pxZTDp+1mjmekIM6J3HnjbWKLrE5lS0GTANPoE6Zrp8YVX
-DHYgcIOP9isLZ9xxdpQiAfKMfKth0iiWno3xu5+80g8DFw7m1x3PgJVtL5karzVX
-4XQhZtAF7ub4IBRTcb8vCsSvi7myXsASoCeTdFHrfRs4Un8dauEzPlmQeJkJRjTT
-/fnXSPlaRqOHtYENB3yDwYKsQNV2q9kWp4gvNG861z627qbm87CCEH5HZI4aEuef
-IttB2o6l+PdF/VZvNixceeoq5LWCqgIp1sc/hFa9i238vd/7y3vCOPqYiuSDeTcv
-Q6muwP/lzxmeAPJc59KBLqlVAjX2J92byKXoDrsSdjb5TGo0iYCJT/r4ToRUIeNh
-LMYzrPUgsM27vf63K/F3
-=cqI/
+iF4EAREIAAYFAlIg4ZMACgkQiIP6VqMIqNeFTAD+PEPesLKYMK1iX50TdkKjC2Ud
+BpadUE36Y9nqnEiX41gA/3LFjHyw15vDBApLfp3rImFHc1oeoho2aubY4Gj90TNl
+=YnKy
-----END PGP SIGNATURE-----
diff --git a/dev-ruby/facter/facter-1.7.2.ebuild b/dev-ruby/facter/facter-1.7.2.ebuild
index 6c6e5ee16c87..502739678c48 100644
--- a/dev-ruby/facter/facter-1.7.2.ebuild
+++ b/dev-ruby/facter/facter-1.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.2.ebuild,v 1.1 2013/07/16 05:32:44 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.2.ebuild,v 1.2 2013/08/30 18:16:45 graaff Exp $
EAPI=5
@@ -31,7 +31,7 @@ DEPEND+=" test? ( ${CDEPEND} )"
#RUBY_PATCHES=( ${P}-fix-proc-self-status.patch )
-ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 )"
+ruby_add_bdepend "test? ( >=dev-ruby/mocha-0.10.5:0.10 <dev-ruby/rspec-2.14:2 )"
all_ruby_prepare() {
# Provide explicit path since /sbin is not in the default PATH on