gentoo resync : 25.04.2020

3 files changed, 36 insertions, 44 deletions

diff --git a/dev-games/freecell-solver/files/freecell-solver-5.20.1-cmake.patch b/dev-games/freecell-solver/files/freecell-solver-5.20.1-cmake.patch
deleted file mode 100644
index ad90727b60f4..000000000000
--- a/dev-games/freecell-solver/files/freecell-solver-5.20.1-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Package wants to install all kinds of doc files. It does not help us.
-
---- a/CMakeLists.txt	2019-09-12 23:04:19.628187073 +0200
-+++ b/CMakeLists.txt	2019-09-12 23:06:38.928231282 +0200
-@@ -858,14 +858,6 @@
-     INSTALL_MAN ("${fc_solve_manpage}" 6)
- ENDIF ()
- 
--INSTALL(
--    FILES
--        ${docs_to_install}
--        "README.win32.txt"
--    DESTINATION
--        "share/doc/freecell-solver-5.20.1"
--)
--
- SET (dest "include/freecell-solver")
- INSTALL(
-     FILES
diff --git a/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch b/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch
deleted file mode 100644
index 967cd1139e9d..000000000000
--- a/dev-games/freecell-solver/files/freecell-solver-5.20.1-pkgconfig.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f5801e70d0ade110e23595d00c62221f6dcd8845 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 26 Mar 2020 13:28:29 +0100
-Subject: [PATCH] Fix pkgconfig libdir path
-
-Needs to respect LIB_SUFFIX to work.
----
- libfreecell-solver.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libfreecell-solver.pc.in b/libfreecell-solver.pc.in
-index 2eb1fe68f..4fc3c7fbb 100644
---- a/libfreecell-solver.pc.in
-+++ b/libfreecell-solver.pc.in
-@@ -1,6 +1,6 @@
- prefix="@CMAKE_INSTALL_PREFIX@"
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/lib@LIB_SUFFIX@
- includedir=${prefix}/include
- 
- Name:  Freecell Solver
--- 
-2.26.0
-
diff --git a/dev-games/freecell-solver/files/freecell-solver-5.22.1-no-docs.patch b/dev-games/freecell-solver/files/freecell-solver-5.22.1-no-docs.patch
new file mode 100644
index 000000000000..b2e8164ef586
--- /dev/null
+++ b/dev-games/freecell-solver/files/freecell-solver-5.22.1-no-docs.patch
@@ -0,0 +1,36 @@
+From dd29e95954712c8de4454e0bdbdd973ddfd917b1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 14 Apr 2020 19:54:30 +0200
+Subject: [PATCH] We'll install docs manually, thanks
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c550764f..59c1defb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1274,12 +1274,12 @@ IF (WIN32 AND NOT UNIX)
+     LIST(APPEND docs_to_install "README.win32.txt")
+ ENDIF ()
+ 
+-INSTALL(
+-    FILES
+-        ${docs_to_install}
+-    DESTINATION
+-        "${CMAKE_INSTALL_DOCDIR}"
+-)
++# INSTALL(
++#     FILES
++#         ${docs_to_install}
++#     DESTINATION
++#         "${CMAKE_INSTALL_DOCDIR}"
++# )
+ 
+ INCLUDE_DIRECTORIES(AFTER "${CMAKE_CURRENT_SOURCE_DIR}/${patsolve_dir}/include" "${CMAKE_CURRENT_SOURCE_DIR}/${patsolve_dir}")
+ INCLUDE("${private_mod_path}/xxhash_wrapper_bootstrap.cmake")
+-- 
+2.26.0
+