| 1 |
commit: 5624d85c41eb5d8db26a56d521702ea5d56710dd |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 18 16:39:22 2020 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 18 16:39:55 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5624d85c |
| 7 |
|
| 8 |
dev-ruby/facter: fix 3.14.8 patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/710066 |
| 11 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 12 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ruby/facter/facter-3.14.8.ebuild | 2 +- |
| 15 |
dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch | 10 ++++++++++ |
| 16 |
2 files changed, 11 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-ruby/facter/facter-3.14.8.ebuild b/dev-ruby/facter/facter-3.14.8.ebuild |
| 19 |
index 9eddae0a3f5..dbf805620b4 100644 |
| 20 |
--- a/dev-ruby/facter/facter-3.14.8.ebuild |
| 21 |
+++ b/dev-ruby/facter/facter-3.14.8.ebuild |
| 22 |
@@ -45,7 +45,7 @@ S="${WORKDIR}/${P}" |
| 23 |
PATCHES=( |
| 24 |
"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch |
| 25 |
# be explicit about the version of rspec we test with |
| 26 |
- "${FILESDIR}"/${PN}-3.14.6-explicit-rspec-2.patch |
| 27 |
+ "${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch |
| 28 |
) |
| 29 |
|
| 30 |
pkg_setup() { |
| 31 |
|
| 32 |
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 |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..bca424be1b8 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-ruby/facter/files/facter-3.14.8-explicit-rspec-2.patch |
| 37 |
@@ -0,0 +1,10 @@ |
| 38 |
+--- a/CMakeLists.txt |
| 39 |
++++ b/CMakeLists.txt |
| 40 |
+@@ -205,7 +205,7 @@ |
| 41 |
+ if (BUNDLER_PATH) |
| 42 |
+ message(STATUS "Bundler found, installing dependencies for Ruby tests...") |
| 43 |
+ execute_process(COMMAND ${BUNDLER_PATH} install --retry 2 --path=vendor/bundle WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") |
| 44 |
+- add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") |
| 45 |
++ add_test(NAME "libfacter\\ specs" COMMAND ${BUNDLER_PATH} exec rspec-2 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/lib") |
| 46 |
+ endif() |
| 47 |
+ endif() |
Archives