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

[Sam James]

commit:     e8b52f663a5dca9a397a7d5cc225da5fb5fb7a87
Author:     Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon Apr  3 16:01:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 02:45:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b52f66

media-gfx/blender: Update live ebuild

Addons have moved to be a non submodule
Asset libraries have been introduced and Blender bundles a
few default assets per default.

Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/blender-9999.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/blender/blender-9999.ebuild 
b/media-gfx/blender/blender-9999.ebuild
index 11870198acb9..73275c6a9326 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -14,8 +14,9 @@ if [[ ${PV} = *9999* ]] ; then
        # Subversion is needed for downloading unit test files
        inherit git-r3 subversion
        EGIT_REPO_URI="https://projects.blender.org/blender/blender.git";
+       
ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git";
 else
-       
SRC_URI="https://projects.blender.org/blender/blender/archive/v${PV}.tar.gz";
+       SRC_URI="https://download.blender.org/source/${P}.tar.xz";
        # Update these between major releases.
        TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
        SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
@@ -168,10 +169,16 @@ pkg_setup() {
 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
+
                if use test; then
                        
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
                        subversion_fetch ${TESTS_SVN_URL} ../lib/tests
                fi
+               
ASSETS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/assets
+               subversion_fetch ${ASSETS_SVN_URL} ../lib/assets
        else
                default
                if use test; then