[gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/

[Denis Reva]

commit:     9bddb4cfb5587a2b091b782f33f7f10234fe45e5
Author:     Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Thu Feb 23 13:44:44 2023 +0000
Commit:     Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Thu Feb 23 13:44:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9bddb4cf

media-libs/amdvlk: Small fixes of layout

https://github.com/gentoo/guru/commit/baeafbaeb18524d51b4b7910179fa8a8ebcc2c7e#diff-
06ce37edf43c00e6441b3fe6f7d2fd52b971cb73b3d3d491c0bcb8d774ca3593R106

Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>

 media-libs/amdvlk/amdvlk-2023.1.1.ebuild | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild 
b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
index a1cf34afa..174b51f9b 100644
--- a/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
+++ b/media-libs/amdvlk/amdvlk-2023.1.1.ebuild
@@ -88,17 +88,16 @@ pkg_pretend(){
 
 src_prepare() {
        einfo "moving src to proper directories"
-       mkdir -p "${S}"
-       mkdir -p "${S}/third_party"
-       mv xgl-${XGL_COMMIT}/ "${S}/xgl"
-       mv pal-${PAL_COMMIT}/ "${S}/pal"
-       mv llpc-${LLPC_COMMIT}/ "${S}/llpc"
-       mv gpurt-${GPURT_COMMIT}/ "${S}/gpurt"
-       mv llvm-project-${LLVM_PROJECT_COMMIT}/ "${S}/llvm-project"
-       rm -d "${S}"/llpc/imported/llvm-dialects/ || die
-       mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ 
"${S}"/llpc/imported/llvm-dialects/
-       mv MetroHash-${METROHASH_COMMIT}/ "${S}/third_party/metrohash"
-       mv CWPack-${CWPACK_COMMIT}/ "${S}/third_party/cwpack"
+       mkdir third_party || die
+       mv xgl-${XGL_COMMIT}/ xgl || die
+       mv pal-${PAL_COMMIT}/ /pal || die
+       mv llpc-${LLPC_COMMIT}/ llpc || die
+       mv gpurt-${GPURT_COMMIT}/ gpurt || die
+       mv llvm-project-${LLVM_PROJECT_COMMIT}/ llvm-project || die
+       rm -d llpc/imported/llvm-dialects/ || die
+       mv llvm-dialects-${LLVM_DIALECTS_COMMIT}/ llpc/imported/llvm-dialects/ 
|| die
+       mv MetroHash-${METROHASH_COMMIT}/ third_party/metrohash || die
+       mv CWPack-${CWPACK_COMMIT}/ third_party/cwpack || die
        cmake_src_prepare
 }
 
@@ -128,9 +127,9 @@ multilib_check_headers() {
 multilib_src_install_all() {
        default
        einfo "Removing unused LLVM parts…"
-       rm "${D}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
-       rm "${D}"/usr/lib/libRemarks* || die "Can't remove unused LLVM 
libRemarks library"
-       rm -r "${D}"/usr/lib/cmake || die "Can't remove unused LLVM cmake 
folder"
+       rm "${ED}"/usr/lib/libLTO* || die "Can't remove unused LLVM lto library"
+       rm "${ED}"/usr/lib/libRemarks* || die "Can't remove unused LLVM 
libRemarks library"
+       rm -r "${ED}"/usr/lib/cmake || die "Can't remove unused LLVM cmake 
folder"
        einfo "Removal done"
 }