summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2020-02-18 10:39:22 -0600
committerMatthew Thode <prometheanfire@gentoo.org>2020-02-18 10:39:55 -0600
commit5624d85c41eb5d8db26a56d521702ea5d56710dd (patch)
treefdb4ef60f4deb23ce78967ec49cf3a488997058b
parentdev-util/schroot: amd64 stable wrt bug #710012 (diff)
downloadgentoo-5624d85c41eb5d8db26a56d521702ea5d56710dd.tar.gz
gentoo-5624d85c41eb5d8db26a56d521702ea5d56710dd.tar.bz2
gentoo-5624d85c41eb5d8db26a56d521702ea5d56710dd.zip
dev-ruby/facter: fix 3.14.8 patch
Closes: https://bugs.gentoo.org/710066 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
-rw-r--r--dev-ruby/facter/facter-3.14.8.ebuild2
-rw-r--r--dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch10
2 files changed, 11 insertions, 1 deletions
diff --git a/dev-ruby/facter/facter-3.14.8.ebuild b/dev-ruby/facter/facter-3.14.8.ebuild
index 9eddae0a3f5..dbf805620b4 100644
--- a/dev-ruby/facter/facter-3.14.8.ebuild
+++ b/dev-ruby/facter/facter-3.14.8.ebuild
@@ -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
index 00000000000..bca424be1b8
--- /dev/null
+++ b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch
@@ -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()