[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/

[Sam James]

commit:     0a3a03453658305cf00633b5b241b61d4fefd29e
Author:     Marco Sirabella <marco <AT> sirabella <DOT> org>
AuthorDate: Sun Jan 22 22:48:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 04:27:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a3a0345

media-sound/mixxx: fix(disable) doc generation

Signed-off-by: Marco Sirabella <marco <AT> sirabella.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/mixxx/files/mixxx-9999-docs.patch | 18 +++++++++++++-----
 media-sound/mixxx/mixxx-9999.ebuild           |  3 ++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch 
b/media-sound/mixxx/files/mixxx-9999-docs.patch
index d1de4e6e9443..0ac74959df2e 100644
--- a/media-sound/mixxx/files/mixxx-9999-docs.patch
+++ b/media-sound/mixxx/files/mixxx-9999-docs.patch
@@ -1,19 +1,27 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cc5b3a7ba..63f18bfda4 100644
+index e35d8dd4e1..798179955c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1142,15 +1142,6 @@ install(
+@@ -1504,23 +1504,6 @@ install(
      "${MIXXX_INSTALL_LICENSEDIR}"
  )
- 
+
 -# Documentation
 -install(
 -  FILES
--    "${CMAKE_CURRENT_SOURCE_DIR}/README"
--    "${CMAKE_CURRENT_SOURCE_DIR}/Mixxx-Manual.pdf"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
+-    "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Keyboard-Shortcuts.pdf"
 -  DESTINATION
 -    "${MIXXX_INSTALL_DOCDIR}"
 -)
+-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf")
+-  install(
+-    FILES
+-      "${CMAKE_CURRENT_SOURCE_DIR}/res/Mixxx-Manual.pdf"
+-    DESTINATION
+-      "${MIXXX_INSTALL_DOCDIR}"
+-  )
+-endif()
 -
  # Additional Linux-only files
  if(UNIX AND NOT APPLE)

diff --git a/media-sound/mixxx/mixxx-9999.ebuild 
b/media-sound/mixxx/mixxx-9999.ebuild
index 5348bd3d18a5..72ed63ef7744 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -105,6 +105,7 @@ src_configure() {
                -DWAVPACK="$(usex wavpack on off)"
                -DQTKEYCHAIN="$(usex qtkeychain on off)"
                -DKEYFINDER="$(usex keyfinder on off)"
+               -DDOWNLOAD_MANUAL=OFF
        )
 
        if [[ "${PV}" == 9999 ]] ; then
@@ -125,7 +126,7 @@ src_install() {
        udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 
69-mixxx-usb-uaccess.rules
 
        if use doc ; then
-               dodoc README Mixxx-Manual.pdf
+               dodoc README res/Mixxx-Keyboard-Shortcuts.pdf
        fi
 }