[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/

Thu, 26 Oct 2023 19:35:06 -0700 

commit:     cb351207522b67d82b4b7346a4daf3d119c20830
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 15:35:08 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:31:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb351207

media-gfx/blender: add quotes around variables containing whitespaces

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/blender-3.3.6-r1.ebuild | 10 +++++-----
 media-gfx/blender/blender-3.3.8.ebuild    | 18 +++++++++---------
 media-gfx/blender/blender-3.4.1-r3.ebuild | 14 +++++++-------
 media-gfx/blender/blender-3.5.1-r1.ebuild | 14 +++++++-------
 media-gfx/blender/blender-3.6.0.ebuild    | 14 +++++++-------
 media-gfx/blender/blender-9999.ebuild     | 14 +++++++-------
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild 
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 849e211f77de..b1c434b9c585 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-       
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-       
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
-       "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
-       "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+       "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+       
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+       
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+       "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+       "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/blender-3.3.8.ebuild 
b/media-gfx/blender/blender-3.3.8.ebuild
index a312ee90f65b..1f5d50885c97 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -129,11 +129,11 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
-       
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
-       
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
-       "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
-       "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+       "${FILESDIR}/${PN}-3.2.2-support-building-with-musl-libc.patch"
+       
"${FILESDIR}/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch"
+       
"${FILESDIR}/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch"
+       "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+       "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
 )
 
 blender_check_requirements() {
@@ -177,7 +177,7 @@ src_unpack() {
                if use test; then
                        #The tests are downloaded from: 
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
                        mkdir -p lib || die
-                       mv 
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+                       mv 
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
                fi
        fi
 
@@ -202,9 +202,9 @@ src_prepare() {
        sed -e "s|Exec=blender|Exec=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
        sed -e "s|Icon=blender|Icon=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
 
-       mv release/freedesktop/icons/scalable/apps/blender.svg 
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-       mv release/freedesktop/blender.desktop 
release/freedesktop/blender-${BV}.desktop || die
+       mv release/freedesktop/icons/scalable/apps/blender.svg 
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+       mv release/freedesktop/blender.desktop 
"release/freedesktop/blender-${BV}.desktop" || die
 
        if use test; then
                # Without this the tests will try to use /usr/bin/blender and 
/usr/share/blender/ to run the tests.

diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild 
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 99c65802bed3..91dc3e3014ed 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -139,8 +139,8 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
-       "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
+       "${FILESDIR}/${PN}-3.3.0-fix-build-with-boost-1.81.patch"
+       "${FILESDIR}/${PN}-3.3.6-cycles-gcc13.patch"
 )
 
 blender_check_requirements() {
@@ -184,7 +184,7 @@ src_unpack() {
                if use test; then
                        #The tests are downloaded from: 
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
                        mkdir -p lib || die
-                       mv 
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+                       mv 
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
                fi
        fi
 
@@ -209,9 +209,9 @@ src_prepare() {
        sed -e "s|Exec=blender|Exec=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
        sed -e "s|Icon=blender|Icon=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
 
-       mv release/freedesktop/icons/scalable/apps/blender.svg 
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-       mv release/freedesktop/blender.desktop 
release/freedesktop/blender-${BV}.desktop || die
+       mv release/freedesktop/icons/scalable/apps/blender.svg 
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+       mv release/freedesktop/blender.desktop 
"release/freedesktop/blender-${BV}.desktop" || die
 
        if use test; then
                # Without this the tests will try to use /usr/bin/blender and 
/usr/share/blender/ to run the tests.
@@ -247,7 +247,7 @@ src_configure() {
                -DWITH_DOC_MANPAGE=$(usex man)
                -DWITH_FFTW3=$(usex fftw)
                -DWITH_GHOST_WAYLAND=$(usex wayland)
-               -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV}
+               -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
                -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
                -DWITH_GHOST_WAYLAND_DYNLOAD=OFF
                -DWITH_GHOST_WAYLAND_LIBDECOR=OFF

diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild 
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 5b87057fa22c..15d278172bfc 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -173,8 +173,8 @@ src_unpack() {
        if [[ ${PV} = *9999* ]] ; then
                git-r3_src_unpack
 
-               git-r3_fetch ${ADDONS_EGIT_REPO_URI}
-               git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons
+               git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+               git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 
                if use test; then
                        
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
@@ -187,7 +187,7 @@ src_unpack() {
                if use test; then
                        #The tests are downloaded from: 
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
                        mkdir -p lib || die
-                       mv 
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+                       mv 
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
                fi
        fi
 
@@ -212,9 +212,9 @@ src_prepare() {
        sed -e "s|Exec=blender|Exec=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
        sed -e "s|Icon=blender|Icon=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
 
-       mv release/freedesktop/icons/scalable/apps/blender.svg 
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-       mv release/freedesktop/blender.desktop 
release/freedesktop/blender-${BV}.desktop || die
+       mv release/freedesktop/icons/scalable/apps/blender.svg 
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+       mv release/freedesktop/blender.desktop 
"release/freedesktop/blender-${BV}.desktop" || die
 
        if use test; then
                # Without this the tests will try to use /usr/bin/blender and 
/usr/share/blender/ to run the tests.
@@ -251,7 +251,7 @@ src_configure() {
                -DWITH_DOC_MANPAGE=$(usex man)
                -DWITH_FFTW3=$(usex fftw)
                -DWITH_GHOST_WAYLAND=$(usex wayland)
-               -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV}
+               -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
                -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
                -DWITH_GHOST_WAYLAND_DYNLOAD=OFF
                -DWITH_GHOST_WAYLAND_LIBDECOR=OFF

diff --git a/media-gfx/blender/blender-3.6.0.ebuild 
b/media-gfx/blender/blender-3.6.0.ebuild
index 5b87057fa22c..15d278172bfc 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -173,8 +173,8 @@ src_unpack() {
        if [[ ${PV} = *9999* ]] ; then
                git-r3_src_unpack
 
-               git-r3_fetch ${ADDONS_EGIT_REPO_URI}
-               git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons
+               git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+               git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 
                if use test; then
                        
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
@@ -187,7 +187,7 @@ src_unpack() {
                if use test; then
                        #The tests are downloaded from: 
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
                        mkdir -p lib || die
-                       mv 
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+                       mv 
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
                fi
        fi
 
@@ -212,9 +212,9 @@ src_prepare() {
        sed -e "s|Exec=blender|Exec=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
        sed -e "s|Icon=blender|Icon=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
 
-       mv release/freedesktop/icons/scalable/apps/blender.svg 
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-       mv release/freedesktop/blender.desktop 
release/freedesktop/blender-${BV}.desktop || die
+       mv release/freedesktop/icons/scalable/apps/blender.svg 
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+       mv release/freedesktop/blender.desktop 
"release/freedesktop/blender-${BV}.desktop" || die
 
        if use test; then
                # Without this the tests will try to use /usr/bin/blender and 
/usr/share/blender/ to run the tests.
@@ -251,7 +251,7 @@ src_configure() {
                -DWITH_DOC_MANPAGE=$(usex man)
                -DWITH_FFTW3=$(usex fftw)
                -DWITH_GHOST_WAYLAND=$(usex wayland)
-               -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV}
+               -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
                -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
                -DWITH_GHOST_WAYLAND_DYNLOAD=OFF
                -DWITH_GHOST_WAYLAND_LIBDECOR=OFF

diff --git a/media-gfx/blender/blender-9999.ebuild 
b/media-gfx/blender/blender-9999.ebuild
index c65f24e793ef..a637534483c4 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -173,8 +173,8 @@ src_unpack() {
        if [[ ${PV} = *9999* ]] ; then
                git-r3_src_unpack
 
-               git-r3_fetch ${ADDONS_EGIT_REPO_URI}
-               git-r3_checkout ${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons
+               git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
+               git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons"
 
                if use test; then
                        
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
@@ -187,7 +187,7 @@ src_unpack() {
                if use test; then
                        #The tests are downloaded from: 
https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
                        mkdir -p lib || die
-                       mv 
"${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib || die
+                       mv 
"${WORKDIR}/blender-${TEST_TARBALL_VERSION}-tests/tests" lib || die
                fi
        fi
 
@@ -212,9 +212,9 @@ src_prepare() {
        sed -e "s|Exec=blender|Exec=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
        sed -e "s|Icon=blender|Icon=blender-${BV}|" -i 
release/freedesktop/blender.desktop || die
 
-       mv release/freedesktop/icons/scalable/apps/blender.svg 
release/freedesktop/icons/scalable/apps/blender-${BV}.svg || die
-       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg || die
-       mv release/freedesktop/blender.desktop 
release/freedesktop/blender-${BV}.desktop || die
+       mv release/freedesktop/icons/scalable/apps/blender.svg 
"release/freedesktop/icons/scalable/apps/blender-${BV}.svg" || die
+       mv release/freedesktop/icons/symbolic/apps/blender-symbolic.svg 
"release/freedesktop/icons/symbolic/apps/blender-${BV}-symbolic.svg" || die
+       mv release/freedesktop/blender.desktop 
"release/freedesktop/blender-${BV}.desktop" || die
 
        if use test; then
                # Without this the tests will try to use /usr/bin/blender and 
/usr/share/blender/ to run the tests.
@@ -251,7 +251,7 @@ src_configure() {
                -DWITH_DOC_MANPAGE=$(usex man)
                -DWITH_FFTW3=$(usex fftw)
                -DWITH_GHOST_WAYLAND=$(usex wayland)
-               -DWITH_GHOST_WAYLAND_APP_ID=blender-${BV}
+               -DWITH_GHOST_WAYLAND_APP_ID="blender-${BV}"
                -DWITH_GHOST_WAYLAND_DBUS=$(usex wayland)
                -DWITH_GHOST_WAYLAND_DYNLOAD=OFF
                -DWITH_GHOST_WAYLAND_LIBDECOR=OFF

Reply via email to