From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50DE515800F for ; Mon, 23 Jan 2023 04:29:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40194E0824; Mon, 23 Jan 2023 04:29:00 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 274E5E0824 for ; Mon, 23 Jan 2023 04:29:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F357E340E6B for ; Mon, 23 Jan 2023 04:28:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B92A83C for ; Mon, 23 Jan 2023 04:28:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1674448075.0a3a03453658305cf00633b5b241b61d4fefd29e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/, media-sound/mixxx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mixxx/files/mixxx-9999-docs.patch media-sound/mixxx/mixxx-9999.ebuild X-VCS-Directories: media-sound/mixxx/files/ media-sound/mixxx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0a3a03453658305cf00633b5b241b61d4fefd29e X-VCS-Branch: master Date: Mon, 23 Jan 2023 04:28:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 538cbeb1-23c6-495b-b998-c524581043c9 X-Archives-Hash: c31c97ae92ae5f96360e70c235a856cc commit: 0a3a03453658305cf00633b5b241b61d4fefd29e Author: Marco Sirabella sirabella org> AuthorDate: Sun Jan 22 22:48:58 2023 +0000 Commit: Sam James gentoo 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 sirabella.org> Signed-off-by: Sam James 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 }