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 6459215ACFB for ; Sun, 16 Apr 2023 03:30:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86A8AE08E5; Sun, 16 Apr 2023 03:30:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A507E08DD for ; Sun, 16 Apr 2023 03:30:14 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57ADC340BE0 for ; Sun, 16 Apr 2023 03:30:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B718FA39 for ; Sun, 16 Apr 2023 03:30:11 +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: <1681613158.e8b52f663a5dca9a397a7d5cc225da5fb5fb7a87.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-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e8b52f663a5dca9a397a7d5cc225da5fb5fb7a87 X-VCS-Branch: master Date: Sun, 16 Apr 2023 03:30:11 +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: 64e05321-e405-4508-a324-6cfefd7285ea X-Archives-Hash: 9fe0ae0a27a950f20358c11eba93d590 commit: e8b52f663a5dca9a397a7d5cc225da5fb5fb7a87 Author: Sebastian Parborg gmail com> AuthorDate: Mon Apr 3 16:01:36 2023 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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