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 66F66158089 for ; Sun, 29 Oct 2023 20:52:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84E7B2BC01D; Sun, 29 Oct 2023 20:52:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 67B5F2BC01D for ; Sun, 29 Oct 2023 20:52:58 +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 634EE335C2E for ; Sun, 29 Oct 2023 20:52:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 78B7AE49 for ; Sun, 29 Oct 2023 20:52:55 +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: <1698612740.260ed766f76f29d71baec07f0af7eea431f436f5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/opencolorio-2.2.1.ebuild media-libs/opencolorio/opencolorio-2.3.0.ebuild X-VCS-Directories: media-libs/opencolorio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 260ed766f76f29d71baec07f0af7eea431f436f5 X-VCS-Branch: master Date: Sun, 29 Oct 2023 20:52:55 +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: cb53bdb5-d877-4565-b04e-bd83ee4d10eb X-Archives-Hash: f02afbb9f254497c66e92d68d86f124d commit: 260ed766f76f29d71baec07f0af7eea431f436f5 Author: Paul Zander gmail com> AuthorDate: Sun Oct 29 12:46:18 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 29 20:52:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260ed766 media-libs/opencolorio: fix USE="-doc" `/usr/share/doc/OpenColorIO/html` only exists when `USE=doc` is set. So make the move conditional. Closes: https://bugs.gentoo.org/916474 Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33577 Signed-off-by: Sam James gentoo.org> media-libs/opencolorio/opencolorio-2.2.1.ebuild | 8 +++++--- media-libs/opencolorio/opencolorio-2.3.0.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild index 638a4d840676..540fa6334bae 100644 --- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild +++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild @@ -129,9 +129,11 @@ src_configure() { src_install() { cmake_src_install - # there are already files in ${ED}/usr/share/doc/${PF} - mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die - rmdir "${ED}/usr/share/doc/OpenColorIO" || die + if use doc; then + # there are already files in ${ED}/usr/share/doc/${PF} + mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die + rmdir "${ED}/usr/share/doc/OpenColorIO" || die + fi } src_test() { diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild b/media-libs/opencolorio/opencolorio-2.3.0.ebuild index 0ea5f92ccd4a..b73c81444be6 100644 --- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild +++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild @@ -158,9 +158,11 @@ src_configure() { src_install() { cmake_src_install - # there are already files in ${ED}/usr/share/doc/${PF} - mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die - rmdir "${ED}/usr/share/doc/OpenColorIO" || die + if use doc; then + # there are already files in ${ED}/usr/share/doc/${PF} + mv "${ED}/usr/share/doc/OpenColorIO/"* "${ED}/usr/share/doc/${PF}" || die + rmdir "${ED}/usr/share/doc/OpenColorIO" || die + fi } src_test() {