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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 112DB158018 for ; Mon, 4 Oct 2021 00:12:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBAFDE0809; Mon, 4 Oct 2021 00:12:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7C4BBE0809 for ; Mon, 4 Oct 2021 00:12:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A5C342ED5 for ; Mon, 4 Oct 2021 00:12:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A515DDC for ; Mon, 4 Oct 2021 00:12:02 +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: <1633306308.b8f26837493d36eee145c656abfabf3d99581c19.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/osl-1.10.13.ebuild media-libs/osl/osl-1.11.15.0.ebuild media-libs/osl/osl-1.11.9.0-r1.ebuild media-libs/osl/osl-1.11.9.0.ebuild media-libs/osl/osl-1.12.0.2-r1.ebuild media-libs/osl/osl-1.12.0.2.ebuild X-VCS-Directories: media-libs/osl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b8f26837493d36eee145c656abfabf3d99581c19 X-VCS-Branch: master Date: Mon, 4 Oct 2021 00:12:02 +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: 14bfcfc4-14df-4fc0-9e6a-3c0e2f5837b8 X-Archives-Hash: 4ba87457835f5277f2b3837ad3f5a8f0 commit: b8f26837493d36eee145c656abfabf3d99581c19 Author: Sam James gentoo org> AuthorDate: Mon Oct 4 00:11:48 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 4 00:11:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f26837 media-libs/osl: fix MisplacedEclassVar Signed-off-by: Sam James gentoo.org> media-libs/osl/osl-1.10.13.ebuild | 4 ++-- media-libs/osl/osl-1.11.15.0.ebuild | 4 +--- media-libs/osl/osl-1.11.9.0-r1.ebuild | 2 +- media-libs/osl/osl-1.11.9.0.ebuild | 6 +++--- media-libs/osl/osl-1.12.0.2-r1.ebuild | 2 +- media-libs/osl/osl-1.12.0.2.ebuild | 2 +- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild index fdab29afa48..57d75feb4aa 100644 --- a/media-libs/osl/osl-1.10.13.ebuild +++ b/media-libs/osl/osl-1.10.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,7 +49,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch" ) -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild index 7b33287ed3f..2874e67dd89 100644 --- a/media-libs/osl/osl-1.11.15.0.ebuild +++ b/media-libs/osl/osl-1.11.15.0.ebuild @@ -60,9 +60,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-cmake.patch ) -CMAKE_REMOVE_MODULES_LIST=() - -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild index 10bd18b8492..2c050efe222 100644 --- a/media-libs/osl/osl-1.11.9.0-r1.ebuild +++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild @@ -58,7 +58,7 @@ BDEPEND=" PATCHES=() -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild index ea80a949044..eafd2f78c74 100644 --- a/media-libs/osl/osl-1.11.9.0.ebuild +++ b/media-libs/osl/osl-1.11.9.0.ebuild @@ -7,6 +7,8 @@ inherit cmake llvm toolchain-funcs # check this on updates LLVM_MAX_SLOT=10 +CMAKE_REMOVE_MODULES_LIST=() + DESCRIPTION="Advanced shading language for production GI renderers" HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage" SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" @@ -51,9 +53,7 @@ BDEPEND=" PATCHES=() -CMAKE_REMOVE_MODULES_LIST=() - -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}" diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild index 8c235e4a108..11944da63f6 100644 --- a/media-libs/osl/osl-1.12.0.2-r1.ebuild +++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild @@ -60,7 +60,7 @@ PATCHES=( ${FILESDIR}/${P}-llvm-12.patch ) -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev" diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild index 7532e89f4dd..155cb0665f2 100644 --- a/media-libs/osl/osl-1.12.0.2.ebuild +++ b/media-libs/osl/osl-1.12.0.2.ebuild @@ -51,7 +51,7 @@ PATCHES=( ${FILESDIR}/${P}-llvm-12.patch ) -# Restricting tests as Make file handles them differently +# Restricting tests as Makefile handles them differently RESTRICT="test" S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"