commit: 8195b19643e21a018164da8d4c86c4d16727551f
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon Jun 28 15:21:45 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 4 02:14:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8195b196
media-gfx/blender: Bump to latest LTS point releases
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/blender/Manifest | 2 ++
media-gfx/blender/blender-2.83.15.ebuild | 17 +++++++++--------
.../{blender-2.83.15.ebuild => blender-2.83.16.ebuild} | 17 +++++++++--------
media-gfx/blender/blender-2.93.0.ebuild | 17 +++++++++--------
.../{blender-2.93.0.ebuild => blender-2.93.1.ebuild} | 17 +++++++++--------
media-gfx/blender/blender-9999.ebuild | 10 +++++-----
media-gfx/blender/metadata.xml | 4 ++++
7 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index cd0d802dee5..3e0430a8d59 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,6 @@
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.83.16.tar.xz 39135184 BLAKE2B
2515822373f6a9343c760ad656de732094ee58a9354423e0f3d7bf1042220fc54af7e1d9f5b59a170a23e8b1b57a4b7f09867a000a57a6e4e820ff5c6cdd47b6
SHA512
ef78278387ae981972942ee4724abcb11ca19da2b88a3c8bbe1e9aafb93f28d84d4c79d01542e11218bd58bfec80fcfdbffdfd28896d146edd34181a7439dbd5
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
+DIST blender-2.93.1.tar.xz 42960100 BLAKE2B
eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8
SHA512
b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1
diff --git a/media-gfx/blender/blender-2.83.15.ebuild
b/media-gfx/blender/blender-2.83.15.ebuild
index 2ff2e748e7b..f7382f1c719 100644
--- a/media-gfx/blender/blender-2.83.15.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -15,7 +15,8 @@ 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
)"
+ TEST_TARBALL_VERSION=2.83.1
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="~amd64 ~x86"
fi
@@ -153,8 +154,8 @@ src_unpack() {
fi
if use test; then
- mkdir -p lib/tests || die
- mv "${WORKDIR}"/blender*tests* lib/tests || die
+ mkdir -p lib || die
+ mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib
|| die
fi
}
@@ -321,19 +322,19 @@ src_install() {
cmake_src_install
if use man; then
- #Slot the man page
+ # Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
fi
- # fix doc installdir
- docinto "html"
+ # Fix doc installdir
+ docinto html
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+ mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
pkg_postinst() {
@@ -373,7 +374,7 @@ pkg_postrm() {
ewarn ""
ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/<blender version>/cache/"
+ ewarn "~/.config/${PN}/${SLOT}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}
diff --git a/media-gfx/blender/blender-2.83.15.ebuild
b/media-gfx/blender/blender-2.83.16.ebuild
similarity index 97%
copy from media-gfx/blender/blender-2.83.15.ebuild
copy to media-gfx/blender/blender-2.83.16.ebuild
index 2ff2e748e7b..f7382f1c719 100644
--- a/media-gfx/blender/blender-2.83.15.ebuild
+++ b/media-gfx/blender/blender-2.83.16.ebuild
@@ -15,7 +15,8 @@ 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
)"
+ TEST_TARBALL_VERSION=2.83.1
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="~amd64 ~x86"
fi
@@ -153,8 +154,8 @@ src_unpack() {
fi
if use test; then
- mkdir -p lib/tests || die
- mv "${WORKDIR}"/blender*tests* lib/tests || die
+ mkdir -p lib || die
+ mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib
|| die
fi
}
@@ -321,19 +322,19 @@ src_install() {
cmake_src_install
if use man; then
- #Slot the man page
+ # Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
fi
- # fix doc installdir
- docinto "html"
+ # Fix doc installdir
+ docinto html
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+ mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
pkg_postinst() {
@@ -373,7 +374,7 @@ pkg_postrm() {
ewarn ""
ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/<blender version>/cache/"
+ ewarn "~/.config/${PN}/${SLOT}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}
diff --git a/media-gfx/blender/blender-2.93.0.ebuild
b/media-gfx/blender/blender-2.93.0.ebuild
index 316c84c4f64..56fe343c940 100644
--- a/media-gfx/blender/blender-2.93.0.ebuild
+++ b/media-gfx/blender/blender-2.93.0.ebuild
@@ -15,7 +15,8 @@ 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
)"
+ TEST_TARBALL_VERSION=2.93.0
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="~amd64"
fi
@@ -159,8 +160,8 @@ src_unpack() {
fi
if use test; then
- mkdir -p lib/tests || die
- mv "${WORKDIR}"/blender*tests* lib/tests || die
+ mkdir -p lib || die
+ mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib
|| die
fi
}
@@ -329,19 +330,19 @@ src_install() {
cmake_src_install
if use man; then
- #Slot the man page
+ # Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
fi
- # fix doc installdir
- docinto "html"
+ # Fix doc installdir
+ docinto html
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+ mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
pkg_postinst() {
@@ -383,7 +384,7 @@ pkg_postrm() {
ewarn ""
ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/<blender version>/cache/"
+ ewarn "~/.config/${PN}/${SLOT}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}
diff --git a/media-gfx/blender/blender-2.93.0.ebuild
b/media-gfx/blender/blender-2.93.1.ebuild
similarity index 97%
copy from media-gfx/blender/blender-2.93.0.ebuild
copy to media-gfx/blender/blender-2.93.1.ebuild
index 316c84c4f64..56fe343c940 100644
--- a/media-gfx/blender/blender-2.93.0.ebuild
+++ b/media-gfx/blender/blender-2.93.1.ebuild
@@ -15,7 +15,8 @@ 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
)"
+ TEST_TARBALL_VERSION=2.93.0
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
)"
KEYWORDS="~amd64"
fi
@@ -159,8 +160,8 @@ src_unpack() {
fi
if use test; then
- mkdir -p lib/tests || die
- mv "${WORKDIR}"/blender*tests* lib/tests || die
+ mkdir -p lib || die
+ mv "${WORKDIR}"/blender-${TEST_TARBALL_VERSION}-tests/tests lib
|| die
fi
}
@@ -329,19 +330,19 @@ src_install() {
cmake_src_install
if use man; then
- #Slot the man page
+ # Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
fi
- # fix doc installdir
- docinto "html"
+ # Fix doc installdir
+ docinto html
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+ mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
pkg_postinst() {
@@ -383,7 +384,7 @@ pkg_postrm() {
ewarn ""
ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/<blender version>/cache/"
+ ewarn "~/.config/${PN}/${SLOT}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-9999.ebuild
index 330bdd8d4ad..7b72a280eb4 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -329,19 +329,19 @@ src_install() {
cmake_src_install
if use man; then
- #Slot the man page
+ # Slot the man page
mv "${ED}/usr/share/man/man1/blender.1"
"${ED}/usr/share/man/man1/blender-${BV}.1" || die
fi
- # fix doc installdir
- docinto "html"
+ # Fix doc installdir
+ docinto html
dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
rm -r "${ED}"/usr/share/doc/blender || die
python_fix_shebang "${ED}/usr/bin/blender-${BV}-thumbnailer.py"
python_optimize "${ED}/usr/share/blender/${BV}/scripts"
- mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}"
+ mv "${ED}/usr/bin/blender" "${ED}/usr/bin/blender-${BV}" || die
}
pkg_postinst() {
@@ -383,7 +383,7 @@ pkg_postrm() {
ewarn ""
ewarn "You may want to remove the following directory."
- ewarn "~/.config/${PN}/<blender version>/cache/"
+ ewarn "~/.config/${PN}/${SLOT}/cache/"
ewarn "It may contain extra render kernels not tracked by portage"
ewarn ""
}
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 16d447e5634..d127b9a256e 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -5,6 +5,10 @@
<email>[email protected]</email>
<name>Adrian Grigo</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>[email protected]</email>
+ <name>Sebastian Parborg</name>
+ </maintainer>
<maintainer type="project" proxied="proxy">
<email>[email protected]</email>
<name>Proxy Maintainers</name>
