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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 601C01382C5 for ; Thu, 10 Jun 2021 03:35:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8312DE0801; Thu, 10 Jun 2021 03:35:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B22FAE0801 for ; Thu, 10 Jun 2021 03:35:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 07AFB335D60 for ; Thu, 10 Jun 2021 03:35:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7374579A for ; Thu, 10 Jun 2021 03:35:03 +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: <1623296079.d1442490653cf38e422983fbe89b23a27bd14993.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/Manifest media-gfx/blender/blender-2.83.15.ebuild media-gfx/blender/blender-2.93.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: d1442490653cf38e422983fbe89b23a27bd14993 X-VCS-Branch: master Date: Thu, 10 Jun 2021 03:35:03 +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: fb4837a6-56bd-47e0-9ebc-61cf3d26e4af X-Archives-Hash: 1d7e56029e8dd536cd24b22d97698f93 commit: d1442490653cf38e422983fbe89b23a27bd14993 Author: Sam James gentoo org> AuthorDate: Thu Jun 10 03:34:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 10 03:34:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1442490 media-gfx/blender: add test distfile Signed-off-by: Sam James gentoo.org> media-gfx/blender/Manifest | 2 ++ media-gfx/blender/blender-2.83.15.ebuild | 13 +++++-------- media-gfx/blender/blender-2.93.0.ebuild | 10 +++++----- media-gfx/blender/blender-9999.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index a0063395f2e..cd0d802dee5 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,2 +1,4 @@ +DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9 DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25 +DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d diff --git a/media-gfx/blender/blender-2.83.15.ebuild b/media-gfx/blender/blender-2.83.15.ebuild index ebb25670c0d..28616ae54a1 100644 --- a/media-gfx/blender/blender-2.83.15.ebuild +++ b/media-gfx/blender/blender-2.83.15.ebuild @@ -5,8 +5,6 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -# TODO: restore subversion later -# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils DESCRIPTION="3D Creation/Animation/Publishing System" @@ -17,6 +15,7 @@ if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2 )" KEYWORDS="~amd64 ~x86" fi @@ -93,7 +92,6 @@ RDEPEND="${PYTHON_DEPS} sdl? ( media-libs/libsdl2[sound,joystick] ) sndfile? ( media-libs/libsndfile ) tbb? ( dev-cpp/tbb ) - test? ( dev-vcs/subversion ) tiff? ( media-libs/tiff ) valgrind? ( dev-util/valgrind ) " @@ -149,16 +147,15 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests git-r3_src_unpack else default - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests fi - #if use test; then - # subversion_fetch ${TESTS_SVN_URL} ../lib/tests - #fi + if use test; then + mkdir -p lib/tests || die + mv "${WORKDIR}"/blender*tests* lib/tests || die + fi } src_prepare() { diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild index 3f44583e7df..a3689a00f3d 100644 --- a/media-gfx/blender/blender-2.93.0.ebuild +++ b/media-gfx/blender/blender-2.93.0.ebuild @@ -17,6 +17,7 @@ if [[ ${PV} = *9999* ]] ; then EGIT_REPO_URI="https://git.blender.org/blender.git" else SRC_URI="https://download.blender.org/source/${P}.tar.xz" + SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2 )" KEYWORDS="~amd64" fi @@ -154,16 +155,15 @@ pkg_setup() { src_unpack() { if [[ ${PV} = *9999* ]] ; then - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests git-r3_src_unpack else default - TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests fi - #if use test; then - # subversion_fetch ${TESTS_SVN_URL} ../lib/tests - #fi + if use test; then + mkdir -p lib/tests || die + mv "${WORKDIR}"/blender*tests* lib/tests || die + fi } src_prepare() { diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index ab73c944ca8..9595d28c855 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -5,9 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_9 ) -# TODO: subversion commented out for tests for now -# restoring shortly, see https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672 -inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils DESCRIPTION="3D Creation/Animation/Publishing System" HOMEPAGE="https://www.blender.org" @@ -161,9 +159,9 @@ src_unpack() { TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests fi - #if use test; then - # subversion_fetch ${TESTS_SVN_URL} ../lib/tests - #fi + if use test; then + subversion_fetch ${TESTS_SVN_URL} ../lib/tests + fi } src_prepare() {