Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
Date: Mon, 04 Oct 2021 00:12:08
Message-Id: 1633306308.b8f26837493d36eee145c656abfabf3d99581c19.sam@gentoo
1 commit: b8f26837493d36eee145c656abfabf3d99581c19
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 4 00:11:48 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 4 00:11:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f26837
7
8 media-libs/osl: fix MisplacedEclassVar
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-libs/osl/osl-1.10.13.ebuild | 4 ++--
13 media-libs/osl/osl-1.11.15.0.ebuild | 4 +---
14 media-libs/osl/osl-1.11.9.0-r1.ebuild | 2 +-
15 media-libs/osl/osl-1.11.9.0.ebuild | 6 +++---
16 media-libs/osl/osl-1.12.0.2-r1.ebuild | 2 +-
17 media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
18 6 files changed, 9 insertions(+), 11 deletions(-)
19
20 diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
21 index fdab29afa48..57d75feb4aa 100644
22 --- a/media-libs/osl/osl-1.10.13.ebuild
23 +++ b/media-libs/osl/osl-1.10.13.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2020 Gentoo Authors
26 +# Copyright 1999-2021 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=7
30 @@ -49,7 +49,7 @@ PATCHES=(
31 "${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
32 )
33
34 -# Restricting tests as Make file handles them differently
35 +# Restricting tests as Makefile handles them differently
36 RESTRICT="test"
37
38 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
39
40 diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
41 index 7b33287ed3f..2874e67dd89 100644
42 --- a/media-libs/osl/osl-1.11.15.0.ebuild
43 +++ b/media-libs/osl/osl-1.11.15.0.ebuild
44 @@ -60,9 +60,7 @@ PATCHES=(
45 "${FILESDIR}"/${P}-fix-cmake.patch
46 )
47
48 -CMAKE_REMOVE_MODULES_LIST=()
49 -
50 -# Restricting tests as Make file handles them differently
51 +# Restricting tests as Makefile handles them differently
52 RESTRICT="test"
53
54 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
55
56 diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
57 index 10bd18b8492..2c050efe222 100644
58 --- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
59 +++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
60 @@ -58,7 +58,7 @@ BDEPEND="
61
62 PATCHES=()
63
64 -# Restricting tests as Make file handles them differently
65 +# Restricting tests as Makefile handles them differently
66 RESTRICT="test"
67
68 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
69
70 diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
71 index ea80a949044..eafd2f78c74 100644
72 --- a/media-libs/osl/osl-1.11.9.0.ebuild
73 +++ b/media-libs/osl/osl-1.11.9.0.ebuild
74 @@ -7,6 +7,8 @@ inherit cmake llvm toolchain-funcs
75 # check this on updates
76 LLVM_MAX_SLOT=10
77
78 +CMAKE_REMOVE_MODULES_LIST=()
79 +
80 DESCRIPTION="Advanced shading language for production GI renderers"
81 HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
82 SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
83 @@ -51,9 +53,7 @@ BDEPEND="
84
85 PATCHES=()
86
87 -CMAKE_REMOVE_MODULES_LIST=()
88 -
89 -# Restricting tests as Make file handles them differently
90 +# Restricting tests as Makefile handles them differently
91 RESTRICT="test"
92
93 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
94
95 diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
96 index 8c235e4a108..11944da63f6 100644
97 --- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
98 +++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
99 @@ -60,7 +60,7 @@ PATCHES=(
100 ${FILESDIR}/${P}-llvm-12.patch
101 )
102
103 -# Restricting tests as Make file handles them differently
104 +# Restricting tests as Makefile handles them differently
105 RESTRICT="test"
106
107 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
108
109 diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
110 index 7532e89f4dd..155cb0665f2 100644
111 --- a/media-libs/osl/osl-1.12.0.2.ebuild
112 +++ b/media-libs/osl/osl-1.12.0.2.ebuild
113 @@ -51,7 +51,7 @@ PATCHES=(
114 ${FILESDIR}/${P}-llvm-12.patch
115 )
116
117 -# Restricting tests as Make file handles them differently
118 +# Restricting tests as Makefile handles them differently
119 RESTRICT="test"
120
121 S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"