1 |
commit: d1442490653cf38e422983fbe89b23a27bd14993 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 10 03:34:39 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 10 03:34:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1442490 |
7 |
|
8 |
media-gfx/blender: add test distfile |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
media-gfx/blender/Manifest | 2 ++ |
13 |
media-gfx/blender/blender-2.83.15.ebuild | 13 +++++-------- |
14 |
media-gfx/blender/blender-2.93.0.ebuild | 10 +++++----- |
15 |
media-gfx/blender/blender-9999.ebuild | 10 ++++------ |
16 |
4 files changed, 16 insertions(+), 19 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest |
19 |
index a0063395f2e..cd0d802dee5 100644 |
20 |
--- a/media-gfx/blender/Manifest |
21 |
+++ b/media-gfx/blender/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
+DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6 SHA512 3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9 |
24 |
DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa SHA512 2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25 |
25 |
+DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513 SHA512 0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe |
26 |
DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3 SHA512 660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d |
27 |
|
28 |
diff --git a/media-gfx/blender/blender-2.83.15.ebuild b/media-gfx/blender/blender-2.83.15.ebuild |
29 |
index ebb25670c0d..28616ae54a1 100644 |
30 |
--- a/media-gfx/blender/blender-2.83.15.ebuild |
31 |
+++ b/media-gfx/blender/blender-2.83.15.ebuild |
32 |
@@ -5,8 +5,6 @@ EAPI=7 |
33 |
|
34 |
PYTHON_COMPAT=( python3_{7,8,9} ) |
35 |
|
36 |
-# TODO: restore subversion later |
37 |
-# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672 |
38 |
inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils |
39 |
|
40 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
41 |
@@ -17,6 +15,7 @@ if [[ ${PV} = *9999* ]] ; then |
42 |
EGIT_REPO_URI="https://git.blender.org/blender.git" |
43 |
else |
44 |
SRC_URI="https://download.blender.org/source/${P}.tar.xz" |
45 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2 )" |
46 |
KEYWORDS="~amd64 ~x86" |
47 |
fi |
48 |
|
49 |
@@ -93,7 +92,6 @@ RDEPEND="${PYTHON_DEPS} |
50 |
sdl? ( media-libs/libsdl2[sound,joystick] ) |
51 |
sndfile? ( media-libs/libsndfile ) |
52 |
tbb? ( dev-cpp/tbb ) |
53 |
- test? ( dev-vcs/subversion ) |
54 |
tiff? ( media-libs/tiff ) |
55 |
valgrind? ( dev-util/valgrind ) |
56 |
" |
57 |
@@ -149,16 +147,15 @@ pkg_setup() { |
58 |
|
59 |
src_unpack() { |
60 |
if [[ ${PV} = *9999* ]] ; then |
61 |
- TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests |
62 |
git-r3_src_unpack |
63 |
else |
64 |
default |
65 |
- TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests |
66 |
fi |
67 |
|
68 |
- #if use test; then |
69 |
- # subversion_fetch ${TESTS_SVN_URL} ../lib/tests |
70 |
- #fi |
71 |
+ if use test; then |
72 |
+ mkdir -p lib/tests || die |
73 |
+ mv "${WORKDIR}"/blender*tests* lib/tests || die |
74 |
+ fi |
75 |
} |
76 |
|
77 |
src_prepare() { |
78 |
|
79 |
diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild |
80 |
index 3f44583e7df..a3689a00f3d 100644 |
81 |
--- a/media-gfx/blender/blender-2.93.0.ebuild |
82 |
+++ b/media-gfx/blender/blender-2.93.0.ebuild |
83 |
@@ -17,6 +17,7 @@ if [[ ${PV} = *9999* ]] ; then |
84 |
EGIT_REPO_URI="https://git.blender.org/blender.git" |
85 |
else |
86 |
SRC_URI="https://download.blender.org/source/${P}.tar.xz" |
87 |
+ SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2 )" |
88 |
KEYWORDS="~amd64" |
89 |
fi |
90 |
|
91 |
@@ -154,16 +155,15 @@ pkg_setup() { |
92 |
|
93 |
src_unpack() { |
94 |
if [[ ${PV} = *9999* ]] ; then |
95 |
- TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests |
96 |
git-r3_src_unpack |
97 |
else |
98 |
default |
99 |
- TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests |
100 |
fi |
101 |
|
102 |
- #if use test; then |
103 |
- # subversion_fetch ${TESTS_SVN_URL} ../lib/tests |
104 |
- #fi |
105 |
+ if use test; then |
106 |
+ mkdir -p lib/tests || die |
107 |
+ mv "${WORKDIR}"/blender*tests* lib/tests || die |
108 |
+ fi |
109 |
} |
110 |
|
111 |
src_prepare() { |
112 |
|
113 |
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild |
114 |
index ab73c944ca8..9595d28c855 100644 |
115 |
--- a/media-gfx/blender/blender-9999.ebuild |
116 |
+++ b/media-gfx/blender/blender-9999.ebuild |
117 |
@@ -5,9 +5,7 @@ EAPI=7 |
118 |
|
119 |
PYTHON_COMPAT=( python3_9 ) |
120 |
|
121 |
-# TODO: subversion commented out for tests for now |
122 |
-# restoring shortly, see https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672 |
123 |
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils |
124 |
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs subversion xdg-utils |
125 |
|
126 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
127 |
HOMEPAGE="https://www.blender.org" |
128 |
@@ -161,9 +159,9 @@ src_unpack() { |
129 |
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests |
130 |
fi |
131 |
|
132 |
- #if use test; then |
133 |
- # subversion_fetch ${TESTS_SVN_URL} ../lib/tests |
134 |
- #fi |
135 |
+ if use test; then |
136 |
+ subversion_fetch ${TESTS_SVN_URL} ../lib/tests |
137 |
+ fi |
138 |
} |
139 |
|
140 |
src_prepare() { |