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 3AEA8158089 for ; Fri, 27 Oct 2023 02:59:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D51B2BC0B4; Fri, 27 Oct 2023 02:59:23 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD9DE2BC0BC for ; Fri, 27 Oct 2023 02:59:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC9D3335C7E for ; Fri, 27 Oct 2023 02:59:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7839F12D6 for ; Fri, 27 Oct 2023 02:59:17 +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: <1698375485.260517c66ab9c9a62c189fd7407c01f3501e552c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-3.3.6-r1.ebuild media-gfx/blender/blender-3.3.8.ebuild media-gfx/blender/blender-3.4.1-r3.ebuild media-gfx/blender/blender-3.5.1-r1.ebuild media-gfx/blender/blender-3.6.0.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 260517c66ab9c9a62c189fd7407c01f3501e552c X-VCS-Branch: master Date: Fri, 27 Oct 2023 02:59:17 +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: 58053962-974e-4c00-9fd7-d19119698158 X-Archives-Hash: 39f0e051c9f48f60991fb7cb226841b1 commit: 260517c66ab9c9a62c189fd7407c01f3501e552c Author: Sam James gentoo org> AuthorDate: Fri Oct 27 02:58:05 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Oct 27 02:58:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=260517c6 Revert "media-gfx/blender: add quotes around variables containing whitespaces" This reverts commit cb351207522b67d82b4b7346a4daf3d119c20830. Signed-off-by: Sam James 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 b1c434b9c585..849e211f77de 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 1f5d50885c97..a312ee90f65b 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 91dc3e3014ed..99c65802bed3 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 15d278172bfc..5b87057fa22c 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 15d278172bfc..5b87057fa22c 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 a637534483c4..c65f24e793ef 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