dev-ruby/facter: fix 3.14.8 patch
authorMatthew Thode <prometheanfire@gentoo.org>
Tue, 18 Feb 2020 16:39:22 +0000 (10:39 -0600)
committerMatthew Thode <prometheanfire@gentoo.org>
Tue, 18 Feb 2020 16:39:55 +0000 (10:39 -0600)
Closes: https://bugs.gentoo.org/710066
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
dev-ruby/facter/facter-3.14.8.ebuild
dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch [new file with mode: 0644]

index 9eddae0a3f54055114ddc677fded32a1c9c21b95..dbf805620b4aaed62549d6b80c93fb67b81b1f97 100644 (file)
@@ -45,7 +45,7 @@ S="${WORKDIR}/${P}"
 PATCHES=(
        "${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
        # be explicit about the version of rspec we test with
-       "${FILESDIR}"/${PN}-3.14.6-explicit-rspec-2.patch
+       "${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
 )
 
 pkg_setup() {
diff --git a/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
new file mode 100644 (file)
index 0000000..bca424b
--- /dev/null
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -205,7 +205,7 @@
+     if (BUNDLER_PATH)
+         message(STATUS "Bundler found, installing dependencies for Ruby tests...")
+         execute_process(COMMAND ${BUNDLER_PATH} install --retry 2 --path=vendor/bundle WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
+-        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
++        add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib")
+     endif()
+ endif()