From 2f51c9978dda4c6e8debca43e4235ecc86914032 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 25 Dec 2017 17:37:52 +0000
Subject: gentoo resync : 25.12.2017

---
 dev-ruby/facter/Manifest            |  2 +-
 dev-ruby/facter/facter-3.9.3.ebuild | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'dev-ruby/facter')

diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index 29fd594985d4..c7a67dbb324a 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -25,6 +25,6 @@ EBUILD facter-3.8.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca663696374
 EBUILD facter-3.9.0.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.1.ebuild 2105 BLAKE2B 01ca6da63a7b7d3c679fef5d47732ca66369637414087ef5144edd8b4d3d69d052ffff1590bd7c781111f5246a547e5eee689963ed2fa091a59ab513cf5d7959 SHA512 ab626767328201b102fe8d678296c0132d5b695c69649064421dc42d52f911a8fab75343c7c348b46e09ae52c2ba5ba3a0edc98eb9658951988db5cf2fe9cc74
 EBUILD facter-3.9.2.ebuild 2108 BLAKE2B f5ff96477d41f3c85555e15cafc455d5fc571a27594d5fe9fe38525c6ee083e0cd59435031ca81bfb7666632a683ea24d0e9c4b55eadeebd17dad6bb8a241f4b SHA512 67fb489f027193816d966aa4132873e73892c3ef36146abd6c069746c6a807e7ad1aa1f2b3b14f0aa7c97236018882be37a71f5daa95a27491110e6375b5040c
-EBUILD facter-3.9.3.ebuild 2206 BLAKE2B 1d853115e8cda2714e3fa784bb3fa9cf6f45e07250504bd17f5b741b451c2e22f8efdf69ce0f2583f1575f345f03d23959928ddbf3d956cb2d82f648fd065e32 SHA512 286af8cb418bfaa7408059779f1a31229ee9bb6df045c6061d141b58c35ada569ae5d4181f82f5cce0210a4ece4f7f82ca55f351dfd1722898d77cbe306413b7
+EBUILD facter-3.9.3.ebuild 2676 BLAKE2B b99a93367d4e27afe75602238ba9da2a8a90b6661dc0388797b86f214156b6c420c6bc26fe0f77a0f1c860c38b13f9f612463c75123ee55c21636e7b20257443 SHA512 04f7d0bedecbfc814fdedfb31c9d7ee11bdc5f345967dfff93d1cdd2697a4bc02731fa7b4b289c521636ff37226310df62ab4876972e57d034a6c05ea10a65ae
 EBUILD facter-9999.ebuild 2164 BLAKE2B d546a830062cfce1a81c24b5d36f9e6cb5226d1c001ea6e6ef1587766ef48afac5b32c4cab7179f8939f1598cdd4d866837a217f5e70b8b16b3f8c35f67382ea SHA512 122bd623d94b61dea09049514f2178a38e018702bb3f977ee1a876daf6f6d91d31dec586387c8efa255cdb6037da569801768a6487f40628cf66c3fd6b757a00
 MISC metadata.xml 854 BLAKE2B 51b94622bf8ce34658bf34bf266effc445fdbee52fb22e70c9a645c36b7ac28db73793f185b2dfa791d8459a56ea66eccc6a3f4da56db4fe4ee171ee607366ea SHA512 27e7e17a15ad80544fb121b050f0f5c39d3e27a53ade89063a894569472618b29649b5a737011b8d6597594d9bc94a49cf52c9df857d577a098d6c770b4a9639
diff --git a/dev-ruby/facter/facter-3.9.3.ebuild b/dev-ruby/facter/facter-3.9.3.ebuild
index ab465a65a855..d15e9288ae66 100644
--- a/dev-ruby/facter/facter-3.9.3.ebuild
+++ b/dev-ruby/facter/facter-3.9.3.ebuild
@@ -30,6 +30,8 @@ CDEPEND="
 	>=dev-cpp/yaml-cpp-0.5.1
 	!<app-admin/puppet-4.0.0"
 
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
 RDEPEND="${CDEPEND}"
 DEPEND="${BDEPEND}
 	${CDEPEND}"
@@ -43,6 +45,14 @@ src_prepare() {
 	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
 	# make the require work
 	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
+	# be explicit about the version of rspec we test with and use the
+	# correct lib directory for tests
+	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
+		-e '/libfacter.*specs/ s/lib64/lib/' CMakeLists.txt || die
+	# be more lenient for software versions for tests
+	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
+		-e '/rspec/ s/2.11.0/2.11/' \
+		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
 	# patches
 	default
 	cmake-utils_src_prepare
-- 
cgit v1.2.3