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 37A8315802F for ; Thu, 23 Feb 2023 13:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79FB9E070D; Thu, 23 Feb 2023 13:44:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5DB9FE070D for ; Thu, 23 Feb 2023 13:44:59 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39E76340C58 for ; Thu, 23 Feb 2023 13:44:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A58A57D0 for ; Thu, 23 Feb 2023 13:44:56 +0000 (UTC) From: "Denis Reva" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Denis Reva" Message-ID: <1677159884.9bddb4cfb5587a2b091b782f33f7f10234fe45e5.RarogCmex@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-libs/amdvlk/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-libs/amdvlk/amdvlk-2023.1.1.ebuild X-VCS-Directories: media-libs/amdvlk/ X-VCS-Committer: RarogCmex X-VCS-Committer-Name: Denis Reva X-VCS-Revision: 9bddb4cfb5587a2b091b782f33f7f10234fe45e5 X-VCS-Branch: dev Date: Thu, 23 Feb 2023 13:44:56 +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: 0b1b1633-3271-4671-847a-304967b54610 X-Archives-Hash: b14e521459270c9bf3570e497dbdb6b6 commit: 9bddb4cfb5587a2b091b782f33f7f10234fe45e5 Author: Denis Reva gmail com> AuthorDate: Thu Feb 23 13:44:44 2023 +0000 Commit: Denis Reva gmail 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 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" }