uhh new amdvlk i forgot to check in?

app-emulation/box64: add other platform flags
amdvlk files oops
2024-07-21 15:55:10 -07:00 · 2024-07-21 15:54:22 -07:00 · 2024-05-08 12:57:42 -07:00 · 2024-05-08 12:56:35 -07:00
16 changed files with 1017 additions and 6 deletions
--- a/app-emulation/box64/box64-9999.ebuild
+++ b/app-emulation/box64/box64-9999.ebuild
@ -14,8 +14,40 @@ EGIT_REPO_URI="https://github.com/ptitSeb/box64.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~arm64 ~ppc64"
-IUSE="aot"
-REQUIRED_USE="aot? ( arm64 )"
+IUSE="
+	+aot
+	adlink
+	android termux
+	apple-m1
+	lx2160a
+	odroid-n2
+	phytium
+	rk3326 rk3399 rk3588
+	rpi3 rpi4 rpi5
+	snapdragon-845 snapdragon-888 snapdragon-8g2
+	tegra-x1 tegra-t194 tegra-t234
+"
+REQUIRED_USE="
+	aot? ( || ( arm64 loong riscv ) )
+	termux? ( android )
+	?? ( adlink apple-m1 lx2160a odroid-n2 phytium rk3326 rk3399 rk3588 rpi3 rpi4 rpi5 snapdragon-845 snapdragon-888 snapdragon-8g2 tegra-x1 tegra-t194 tegra-t234 )
+	apple-m1? ( arm64 )
+	lx2160a? ( arm64 )
+	odroid-n2? ( arm64 )
+	phytium? ( arm64 )
+	rk3326? ( arm64 )
+	rk3399? ( arm64 )
+	rk3588? ( arm64 )
+	rpi3? ( arm64 )
+	rpi4? ( arm64 )
+	rpi5? ( arm64 )
+	snapdragon-845? ( arm64 )
+	snapdragon-888? ( arm64 )
+	snapdragon-8g2? ( arm64 )
+	tegra-x1? ( arm64 )
+	tegra-t194? ( arm64 )
+	tegra-t234? ( arm64 )
+"

 DEPEND=""
 RDEPEND="${DEPEND}"
@ -24,13 +56,39 @@ BDEPEND=""
 src_configure() {
 	local -a mycmakeargs=(
 		-DNOGIT=1
-		-DARM_DYNAREC=$(usex aot)
-		-DADLINK=ON
+		-DANDROID=$(usex android)
+		-DTERMUX=$(usex termux)
 	)

+	# not technically alpha, but this patch suggests it may also be applicable
+	# https://github.com/ptitSeb/box64/pull/382/files
+	use alpha && mycmakeargs+=( -DSW64=1 )
+	if use arm64; then
+		mycmakeargs+=(
+			-DARM64=1
+			-DARM_DYNAREC=$(usex aot)
+			-DADLINK=$(usex adlink)
+			-DM1=$(usex apple-m1)
+			-DLX2160A=$(usex lx2160a)
+			-DODROIDN2=$(usex odroid-n2)
+			-DPHYTIUM=$(usex phytium)
+			-DRK3326=$(usex rk3326)
+			-DRK3399=$(usex rk3399)
+			-DRK3588=$(usex rk3588)
+			-DRPI3ARM64=$(usex rpi3)
+			-DRPI4ARM64=$(usex rpi4)
+			-DRPI5ARM64=$(usex rpi5)
+			-DSD845=$(usex snapdragon-845)
+			-DSD888=$(usex snapdragon-888)
+			-DSD8G2=$(usex snapdragon-8g2)
+			-DTEGRAX1=$(usex tegra-x1)
+			-DTEGRA_T194=$(usex tegra-t194)
+			-DTEGRA_T234=$(usex tegra-t234)
+		)
+	fi
 	use ppc64 && mycmakeargs+=( -DPPC64LE=1 )
-	use riscv && mycmakeargs+=( -DRV64=1 )
-	use loong && mycmakeargs+=( -DLARCH64=1 )
+	use riscv && mycmakeargs+=( -DRV64=1 -DRV64_DYNAREC=$(usex aot) )
+	use loong && mycmakeargs+=( -DLARCH64=1 -DLARCH64_DYNAREC=$(usex aot) )
 	use amd64 && mycmakeargs+=( -DLD80BITS=1 -DNOALIGN=1 )

 	cmake_src_configure
--- a/media-libs/amdvlk/Manifest
+++ b/media-libs/amdvlk/Manifest
@ -1,14 +1,20 @@
 DIST amdvlk-CWPack-4f8cf0584442a91d829d269158567d7ed926f026.tar.gz 39633 BLAKE2B d5b2a88f0d563eef5beb42a8304cf6cdd825e75242c22acc360c5bb9cbd1d02a4f891b6b2f3a4803e1e6b48a4d176aad40f8bdeca92847f2fbf53674dedeaff3 SHA512 06d56baaba1f1224a5266f4a63c1abf70edba7cc16cc4e62f2f5b1ec94fc2c1cfc4c6f11a9c6ef42c23b29be8d07921caad5e919357c0bd82cf714783eee0bcc
 DIST amdvlk-CWPack-7387247eb9889ddcabbc1053b9c2052e253b088e.tar.gz 24538 BLAKE2B 76c4da32ea06df355f7e8f77a14c185b2ccab2ce2762988f04a04d65b674e089d4fc27206e744f89b4bd84c9d7226d324414a31941303290e7f574e9d64756cf SHA512 38378ef325e42a7356511c2fc06b6c896581968079e85c4b924a1768d895feecaf1eb8fd65afb59bed0f66e0547104d67c2deb9f82a86f4b9fa65b36e57cd47d
 DIST amdvlk-LLVM-dialects-17aafecff46b68206a0ed82d58f5e2fc358367a1.tar.gz 44441 BLAKE2B a94eb01ae3a2a868a1613e17573c5326252fa163d8e336b8c3292d0e3e349e3df98b124d300bbe42870bc2d60d18afe2c566e4484b45beb84a7087c0d58291e4 SHA512 4a6b2484f0fbb63f2cf987184a12f8a4a344ebfbfe5c1f37423fbda88c171f2eee0f7af4d0b066a9a87c3b22e0c92b7f7f1f5536b4c5d59fb2ca10b963cb8e62
+DIST amdvlk-LLVM-dialects-ed4b46e8425066a96a5e79afc29bce3d82eecf71.tar.gz 105582 BLAKE2B e5455047e429ef672c903936ce2ad677dc60ba4246c134ec81421e4eab1263e3fa64f97faee98576b5fbff0c095715e5f6c9512b39a044030e5e6c8bf1d20c55 SHA512 e57af709bcac6402d1232e49dff9cccde61441befb1df369198b5d1bb76adfd47ac04b859a555b50bb51692dd49cbf124420a88464d768d2a56157997946bed8
 DIST amdvlk-MetroHash-18893fb28601bb9af1154cd1a671a121fff6d8d3.tar.gz 11729 BLAKE2B b0e3de885e50c317141d62c885b421c7fd2e1ac783733704342bbed3109bff36a9209ab276f534a2231531483539221bbb1014bd39528a91124161bafc5646eb SHA512 8f12f95e80d594c8bd87a852c67a2d6777ce89d1a13e1a87ee17bbb876a0702c14ffe7a7fd65a244620f2043ad5d22ae8eb863d69f1dc5494d985733bbfb7bf9
 DIST amdvlk-MetroHash-3c566dd9cda44ca7fd97659e0b53ac953f9037d2.tar.gz 11804 BLAKE2B 683ca8a9e4b93a945dc455c5cb78a2c6dd9dbdf22432ea9f447a6d2d1b05399cc57b621d1e304dc5695ab936a212a2df110e47ec9141764f4eaa2b184a01f4ba SHA512 ae4fcf09a097ceddfcc9f0b721cae0018fff8a0360d8fbbb195d2a8c2809cf8f3c01090ba8129593d89fe1c041224e42a49e7a1c66f20e60958a5373f6d9027f
+DIST amdvlk-gpurt-6ca06bbba1c0e4bbb82f10e93423e607b2227985.tar.gz 350981 BLAKE2B 427b79142ec117962bd05a08fb1ba48353995fa69f72fe9cd1cade3046fc0b829f7fc2fb100c81ccb1e1e976b1f0ad6643260547dc5ad99f4b17b4a47db45995 SHA512 edd5d826ceb70d00aeb9b6699f0df1ecee36448cb9e79b0aa94df075d0837be95b7372cda273f7d836d2c8fc2be74e1fb2a8aa8409d4e4186972cbd259b38f07
 DIST amdvlk-gpurt-714a028e920c502520011fc4f4556f58ec897424.tar.gz 308297 BLAKE2B aeb699332b76cd6d0ac0dcc47a410e8a6ad0b6b073ca2521b3e6c06b4307ee74b79ae9f7767f43e863b8070f664ffd9ffcbacab5f0b12576069e5469b8f5251e SHA512 8044de6555dd2c73ff75d059bda1bba3ef6960c46bb6a92b4ff77e3ced3a8100380ec3d27e5e8ad49fae2fe6994d548494535aa5023412033a2ed9b9236b52bc
 DIST amdvlk-llpc-1ecd9997579b962be571162931c9e38bd86bafad.tar.gz 2618677 BLAKE2B 5849ce333bc52ea1bba47f253834c10974fdc2089ba41fa41a89d9a9fe0249f6e4286985e092c5aaaa52b2e9aff3704dde01ac09fad82d43556b67786156092e SHA512 11f69a6f31a282acc410d1ddd6a8996842e1076cdd49db8f08378ab1401acac1d4eba48788b7f78fb5d5297dda52fd1ceaeec6e68986168c0a92b49222bda3b5
 DIST amdvlk-llpc-c89f405e3632f0b639faafe61cd03cb851492f4e.tar.gz 2176219 BLAKE2B b04c159b48e0ba48f5ac283ac9640eab67d4d938e7b181184161372f49aaa4d27f279e6895102db2fb2f59dc37ec7abe27093fe9de2b990a89c8b0ca5e3038da SHA512 24eb4732bbfe98bb65677ffcaced7790d427299e167b6c3dd6cbcf1ceaf26fe7441f672651bba9cac260381e65a3a198c80ccbf7c740e079029a902e56178245
+DIST amdvlk-llpc-f64d106c023e7bed59bfb441ffb258c127e500c1.tar.gz 2873142 BLAKE2B 0c088b0ed70cb6d97d39e56c5814b9f09f61495d38a8543f92544b129d03a78cf47022d2ba2c0a91d1fc49eed60ca371caef2d8bb81829d7a4d3780ef071a9fe SHA512 8b924740ad6c66abfc2d589c610dd37f04e81f971e8204bf1b9aaac66b76d24f363c854aebf67e184c223c9380c03f52a5df5d242d3948d76cf4cc53b7bd1142
+DIST amdvlk-llvm-project-72a6d2843ca05fa8d18a789664a642b4d0c9e069.tar.gz 212138676 BLAKE2B 53083670209de9073d163b84a8156253adacd90f91404d1fcaeba4d98ea0de51ac1d68f5df47c9649fa1fbc3731385a0dc7dd8d9e1eddd5b6d52262be11f27b6 SHA512 c4e42fb1f4faf422a4f79515e2eedbe6e4f1892305c33f99ebe3509ead60b02a9b87274b1a6abae5ac078a605088ed3c0064169d6c15ba86638bfdaeda155bf0
 DIST amdvlk-llvm-project-a85ea7baf89016f72d7cb7c94db4c996d70d9898.tar.gz 144442498 BLAKE2B 2e93f4b15ef5934f06380802b01333c7195fb611c5c51b64a4d4055c4a05bf764d546d70254d6e7b25869f60bd429d7abcf38ba1e68c92adab50f855bccce20c SHA512 90357c05230e0653968ecb6e57d816278a30a136ed38aea0c067cd1add6b062a94da22e85e4e2c994c5eaaa4e94c290b31761c519b405f86b3f03b6e3a09cb45
 DIST amdvlk-llvm-project-fdc6165b081b7b5e5ba245f4283fcb23d6d9f167.tar.gz 179654477 BLAKE2B 4a09ad5d194525365106b44627693f6eef49b9bd9c38c9eb690ea0288593e7a72467e0f2da757e728b40ee11a26ae3e5305aefe0744965dc7b0166f348539116 SHA512 e8603930e389cbcd0433d48bd72763b0d3ac3acd4f6fadaa3ac68f5148881723863f2816fa6ae34b4cb87538f77a70eb318b31d5ef9c085cc72a5dc9ca83fcb2
 DIST amdvlk-pal-02ac99ba650afb3aebff3eb8006862ce93d31968.tar.gz 8285204 BLAKE2B 586611d50f39e8567e2774cb6a418627b6b5582b83de1f108b6f02b46a9dfd4d84bbdf2b03f18a671e0c3f58fa49d3ac24708826dd7e3afbf268366382dc1a55 SHA512 dd47365b4717ac808034ae8a61f6bb05b5d43308562134edb2374231549f1f4a0f8a476fd4dc0e38dc8501f840aeaf2cdbc9da25b686eb0b05b79e72a236df2c
 DIST amdvlk-pal-4640888b579bc9b0951c586b08a4552f71780d0d.tar.gz 12404946 BLAKE2B a348bce089766ac86539df1f9297df61d94d5db7993f95d86e8967e8641090949d177e9f6d9c1b257404eac8a0a05836c7f0dd6964b8bfc1946a21c47d7f19e0 SHA512 3b43ff0a86f66a238a02a7c71a0fe957deb63968abf2f48b1222ffd048d8fd3e864240a956fb013ab6336eebebb7a76538f748c0c93fbda9ab110e1d33547ef3
+DIST amdvlk-pal-695337aa8131913d883ff15787cd75f6fcb11229.tar.gz 9263956 BLAKE2B f3a7ebce3e4e3345527acac9e92ceaa149e416583545c0e2426a0af1383a5f7e8bc9f1936961fde010010d372aaf0efbdcfec4b6fd1f7684f74ed485f0f5c841 SHA512 0d58fb3fbf981f676bfed3c50fa960cbd9e65b4d3a40cc8dc1ef32b27f3ba663ffcccb5be517454634c1092d7da0df0cc6dbf99712009d7e7809c893f44d3244
 DIST amdvlk-xgl-14397c77fbc0c760397dd3162482407b2721a825.tar.gz 898003 BLAKE2B a0f663a36a9d54b9f9d2600534907bb953f0eb8480de4b5edca4efcca62426044ab0ccaf710e73a41dfb25ece9c9d042db73f524348df680c36718ec1c001234 SHA512 1b697bac073297738e118ce315909cb3aa42f1d10c40c6835dc901ea0729cb36bb5d55bde0b8f7da447931396814681682db8b093ca2fdb775ab8f9a890da666
+DIST amdvlk-xgl-5dd432ade87244461b8cf357b5cb641e7ee7ff15.tar.gz 1349681 BLAKE2B b211a924690eac8351fb1def799f2ac5c9f83fd1e86a646f3b2e9d291c8b10795904c20766f9eca725ddd63062f8734c8bcd3a49b51bd0e001f7096be7dc822a SHA512 c6a5874f6dcf9204b8d34d08ef400c44ac0588cc47989bdc0fab41b642383a19cf204976e87fc28daeceacb831889bb61cbed164c82f9e700582c200b3236bda
 DIST amdvlk-xgl-997225355d7fce7392a9e32fe9f0a515f5736d0f.tar.gz 1247401 BLAKE2B 5381474b3e8eb1783ab5b6a6059204fdd1fc6215a4bdc724bef874908d860f3f306773235325c725bddbc1c7e416a00a865e7b11e5218c3bca9fccd09e6bda95 SHA512 4217567268525f934dbde112e4a3b7703576d63cd49776dc1d991897bce406533d5954196cface6c31663d9ae073ec74ea0b084e55dfa91314aca350b9effa47
--- a/media-libs/amdvlk/amdvlk-2024.2.3.ebuild
+++ b/media-libs/amdvlk/amdvlk-2024.2.3.ebuild
@ -0,0 +1,148 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# MULTILIB_COMPAT=( abi_x86_{32,64} )
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit check-reqs python-any-r1 cmake-multilib
+
+DESCRIPTION="AMD Open Source Driver for Vulkan"
+HOMEPAGE="https://github.com/GPUOpen-Drivers/AMDVLK"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wayland +raytracing"
+# REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
+
+BUNDLED_LLVM_DEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]"
+DEPEND="wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	${BUNDLED_LLVM_DEPEND}
+	>=dev-util/vulkan-headers-1.3.224
+	raytracing? ( dev-util/DirectXShaderCompiler )
+	dev-util/glslang[${MULTILIB_USEDEP}]"
+BDEPEND="${BUNDLED_LLVM_DEPEND}
+	${PYTHON_DEPS}
+	dev-python/ruamel-yaml
+	virtual/linux-sources"
+RDEPEND=" ${DEPEND}
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr[${MULTILIB_USEDEP}]
+	x11-libs/libxcb[${MULTILIB_USEDEP}]
+	x11-libs/libxshmfence[${MULTILIB_USEDEP}]
+	>=media-libs/vulkan-loader-1.3.224[${MULTILIB_USEDEP}]
+	dev-util/glslang[${MULTILIB_USEDEP}]
+	dev-libs/openssl[${MULTILIB_USEDEP}]" #890449
+
+CHECKREQS_MEMORY="7G"
+CHECKREQS_DISK_BUILD="4G"
+S="${WORKDIR}"
+CMAKE_USE_DIR="${S}/xgl"
+CMAKE_MAKEFILE_GENERATOR=ninja
+
+### SOURCE CODE PER_VERSION VARIABLES
+FETCH_URI="https://github.com/GPUOpen-Drivers"
+## For those who wants update ebuild: check https://github.com/GPUOpen-Drivers/AMDVLK/blob/${VERSION}/default.xml
+## e.g. https://github.com/GPUOpen-Drivers/AMDVLK/blob/v-2022.Q3.5/default.xml
+## and place commits in the desired variables
+## EXAMPLE: XGL_COMMIT="80e5a4b11ad2058097e77746772ddc9ab2118e07"
+## SRC_URI="... ${FETCH_URI}/$PART/archive/$COMMIT.zip -> $PART-$COMMIT.zip ..."
+XGL_COMMIT="5dd432ade87244461b8cf357b5cb641e7ee7ff15"
+PAL_COMMIT="695337aa8131913d883ff15787cd75f6fcb11229"
+LLPC_COMMIT="f64d106c023e7bed59bfb441ffb258c127e500c1"
+GPURT_COMMIT="6ca06bbba1c0e4bbb82f10e93423e607b2227985"
+LLVM_PROJECT_COMMIT="72a6d2843ca05fa8d18a789664a642b4d0c9e069"
+METROHASH_COMMIT="18893fb28601bb9af1154cd1a671a121fff6d8d3"
+CWPACK_COMMIT="4f8cf0584442a91d829d269158567d7ed926f026"
+# Submodule of LLPC, also updates often. Grab commit version from
+# https://github.com/GPUOpen-Drivers/llpc/tree/${LLPC_COMMIT}/imported
+LLVM_DIALECTS_COMMIT="ed4b46e8425066a96a5e79afc29bce3d82eecf71"
+### end of variables
+SRC_URI="${FETCH_URI}/xgl/archive/${XGL_COMMIT}.tar.gz -> amdvlk-xgl-${XGL_COMMIT}.tar.gz
+${FETCH_URI}/pal/archive/${PAL_COMMIT}.tar.gz -> amdvlk-pal-${PAL_COMMIT}.tar.gz
+${FETCH_URI}/llpc/archive/${LLPC_COMMIT}.tar.gz -> amdvlk-llpc-${LLPC_COMMIT}.tar.gz
+${FETCH_URI}/gpurt/archive/${GPURT_COMMIT}.tar.gz -> amdvlk-gpurt-${GPURT_COMMIT}.tar.gz
+${FETCH_URI}/llvm-project/archive/${LLVM_PROJECT_COMMIT}.tar.gz -> amdvlk-llvm-project-${LLVM_PROJECT_COMMIT}.tar.gz
+${FETCH_URI}/MetroHash/archive/${METROHASH_COMMIT}.tar.gz -> amdvlk-MetroHash-${METROHASH_COMMIT}.tar.gz
+${FETCH_URI}/CWPack/archive/${CWPACK_COMMIT}.tar.gz -> amdvlk-CWPack-${CWPACK_COMMIT}.tar.gz
+${FETCH_URI}/llvm-dialects/archive/${LLVM_DIALECTS_COMMIT}.tar.gz -> amdvlk-LLVM-dialects-${LLVM_DIALECTS_COMMIT}.tar.gz"
+
+PATCHES=(
+	"${FILESDIR}/amdvlk-2022.3.5-no-compiler-presets.patch" #875821
+	"${FILESDIR}/amdvlk-2022.4.1-proper-libdir.patch"
+	"${FILESDIR}/amdvlk-2022.4.2-license-path.patch" #878803
+	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations.patch"
+	#"${FILESDIR}/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch"
+	#"${FILESDIR}/amdvlk-2022.4.4-r1-disable-Werror.patch" #887777
+	#"${FILESDIR}/amdvlk-2023.1.2-gcc13-cstdint.patch" #905174
+)
+
+pkg_pretend(){
+	ewarn "It's generally recomended to have at least 16GB memory to build"
+	ewarn "However, experiments shows that if you'll use MAKEOPTS=\"-j1\" you can build it with 4GB RAM"
+	ewarn "or you can use MAKEOPTS=\"-j3\" with 7.5GB system memory"
+	ewarn "See https://wiki.gentoo.org/wiki/AMDVLK#Additional_system_requirements_to_build"
+	ewarn "Use CHECKREQS_DONOTHING=1 if you need to bypass memory checking"
+
+	check-reqs_pkg_pretend
+}
+
+src_prepare() {
+	einfo "moving src to proper directories"
+	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
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WAYLAND_SUPPORT=$(usex wayland)
+		-DVKI_RAY_TRACING=$(usex raytracing)
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+		-DLLVM_ENABLE_WERROR=OFF
+		-DENABLE_WERROR=OFF
+		-DVAM_ENABLE_WERROR=OFF
+		-DICD_ANALYSIS_WARNINGS_AS_ERRORS=OFF
+		-DMETROHASH_ENABLE_WERROR=OFF
+		-DBUILD_SHARED_LIBS=OFF #LLVM parts don't support shared libs
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPACKAGE_VERSION="${PV}"
+		-DPACKAGE_NAME="${PN}"
+		-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON #Disable installation of various LLVM parts which we had to clean up.
+		-Wno-dev
+		)
+	cmake_src_configure
+}
+
+multilib_check_headers() {
+	einfo "Checking headers skipped: there is no headers"
+}
+
+multilib_src_install_all() {
+	default
+	einfo "Removing unused LLVM parts…"
+	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"
+}
+
+pkg_postinst() {
+	ewarn "Make sure the following line is NOT included in the any Xorg configuration section:"
+	ewarn "| Driver	  \"modesetting\""
+	ewarn "and make sure you use DRI3 mode for Xorg (not revelant for wayland)"
+	elog "More information about the configuration can be found here:"
+	elog "https://github.com/GPUOpen-Drivers/AMDVLK"
+	elog "You can use AMD_VULKAN_ICD variable to switch to the required driver."
+	elog "AMD_VULKAN_ICD=RADV application   - for using radv."
+	elog "AMD_VULKAN_ICD=AMDVLK application - for using amdvlk."
+}
--- a/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.3.5-no-compiler-presets.patch
@ -0,0 +1,20 @@
+diff --git a/xgl/CMakeLists.txt b/xgl/CMakeLists.txt
+index 0abdb0f42..dada07d96 100644
+--- a/xgl/CMakeLists.txt
+++ b/xgl/CMakeLists.txt
+@@ -31,7 +31,6 @@ option(XGL_USE_CLANG "Build with clang?" OFF)
+ if(UNIX AND XGL_USE_CLANG)
+     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+     include(XglCompilerOptions)
+-    xgl_use_clang_compiler()
+ endif()
+ 
+ ### CMake Includes ####################################################################################################
+@@ -114,7 +113,6 @@ if(UNIX)
+ endif()
+ 
+ ### Set Compiler ######################################################################################################
+-xgl_set_compiler()
+ 
+ ### Sanitizers ########################################################################################################
+ # Temporary variables
--- a/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.1-proper-libdir.patch
@ -0,0 +1,13 @@
+diff --git a/xgl/icd/CMakeLists.txt b/xgl/icd/CMakeLists.txt
+index 2d52a00ab..2d723e51b 100644
+--- a/xgl/icd/CMakeLists.txt
+++ b/xgl/icd/CMakeLists.txt
+@@ -30,7 +30,7 @@ set(ICD_TARGET amdvlk${TARGET_ARCHITECTURE_BITS})
+ set_target_properties(xgl PROPERTIES OUTPUT_NAME ${ICD_TARGET})
+ set_target_properties(xgl PROPERTIES PREFIX "")
+ 
+-install(TARGETS xgl DESTINATION ${CMAKE_SOURCE_DIR}/lib/${CMAKE_BUILD_TYPE})
+install(TARGETS xgl DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+ 
+ ### Compiler Options ###################################################################################################
+ xgl_compiler_options(xgl)
--- a/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-license-path.patch
@ -0,0 +1,13 @@
+diff --git a/xgl/cmake/XglPackaging.cmake b/xgl/cmake/XglPackaging.cmake
+index a3375293d..14d951b69 100644
+--- a/xgl/cmake/XglPackaging.cmake
+++ b/xgl/cmake/XglPackaging.cmake
+@@ -128,7 +128,7 @@ function(generateInstallTargets)
+   install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/icd.d)
+   install(FILES ${CMAKE_BINARY_DIR}/icd/amd_icd${TARGET_ARCHITECTURE_BITS}.json COMPONENT icd DESTINATION /etc/vulkan/implicit_layer.d)
+   if(EXISTS ${CMAKE_SOURCE_DIR}/LICENSE.txt)
+-    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME})
+    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt COMPONENT icd DESTINATION share/doc/${PACKAGE_NAME}-${PACKAGE_VERSION})
+   else()
+     message(WARNING "LICENSE.txt is not found under ${CMAKE_SOURCE_DIR}, please put it there")
+   endif()
--- a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations-part2.patch
@ -0,0 +1,175 @@
+diff --git a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+index 00bb892be..af4677fdc 100644
+--- a/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/llvm-project/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+@@ -355,9 +355,9 @@ function(add_compiler_rt_runtime name type)
+           DEPENDS ${sources_${libname}}
+           COMMENT "Building C object ${output_file_${libname}}")
+       add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}})
+-      install(FILES ${output_dir_${libname}}/${output_file_${libname}}
+-        DESTINATION ${install_dir_${libname}}
+-        ${COMPONENT_OPTION})
+      #install(FILES ${output_dir_${libname}}/${output_file_${libname}}
+      #  DESTINATION ${install_dir_${libname}}
+      #  ${COMPONENT_OPTION})
+     else()
+       add_library(${libname} ${type} ${sources_${libname}})
+       set_target_compile_flags(${libname} ${extra_cflags_${libname}})
+@@ -365,13 +365,13 @@ function(add_compiler_rt_runtime name type)
+       set_property(TARGET ${libname} APPEND PROPERTY
+                    COMPILE_DEFINITIONS ${LIB_DEFS})
+       set_target_output_directories(${libname} ${output_dir_${libname}})
+-      install(TARGETS ${libname}
+-        ARCHIVE DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION}
+-        LIBRARY DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION}
+-        RUNTIME DESTINATION ${install_dir_${libname}}
+-                ${COMPONENT_OPTION})
+      #      install(TARGETS ${libname}
+      #        ARCHIVE DESTINATION ${install_dir_${libname}}
+      #                ${COMPONENT_OPTION}
+      #        LIBRARY DESTINATION ${install_dir_${libname}}
+      #                ${COMPONENT_OPTION}
+      #        RUNTIME DESTINATION ${install_dir_${libname}}
+      #                ${COMPONENT_OPTION})
+     endif()
+     if(LIB_DEPS)
+       add_dependencies(${libname} ${LIB_DEPS})
+@@ -557,10 +557,10 @@ macro(add_compiler_rt_resource_file target_name file_name component)
+     COMMENT "Copying ${file_name}...")
+   add_custom_target(${target_name} DEPENDS ${dst_file})
+   # Install in Clang resource directory.
+-  install(FILES ${file_name}
+-    DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
+-    COMPONENT ${component})
+-  add_dependencies(${component} ${target_name})
+  #install(FILES ${file_name}
+  #  DESTINATION ${COMPILER_RT_INSTALL_DATA_DIR}
+  #  COMPONENT ${component})
+  #add_dependencies(${component} ${target_name})
+ 
+   set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc")
+ endmacro()
+diff --git a/llvm-project/libc/loader/linux/CMakeLists.txt b/llvm-project/libc/loader/linux/CMakeLists.txt
+index 92ff8965b..e2aa73465 100644
+--- a/llvm-project/libc/loader/linux/CMakeLists.txt
+++ b/llvm-project/libc/loader/linux/CMakeLists.txt
+@@ -90,7 +90,7 @@ foreach(target IN LISTS startup_components)
+   set(fq_target_name libc.loader.linux.${target})
+   add_dependencies(libc-startup ${fq_target_name})
+   get_target_property(loader_object ${fq_target_name} LOADER_OBJECT)
+-  install(FILES ${loader_object}
+-          DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-          COMPONENT ${LIBC_COMPONENT})
+  #install(FILES ${loader_object}
+  #        DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  #        COMPONENT ${LIBC_COMPONENT})
+ endforeach()
+diff --git a/llvm-project/libcxx/src/CMakeLists.txt b/llvm-project/libcxx/src/CMakeLists.txt
+index 9abf548ab..2170d4391 100644
+--- a/llvm-project/libcxx/src/CMakeLists.txt
+++ b/llvm-project/libcxx/src/CMakeLists.txt
+@@ -366,32 +366,32 @@ if (LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)
+ endif()
+ 
+ if (LIBCXX_INSTALL_SHARED_LIBRARY)
+-  install(TARGETS cxx_shared
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+	#install(TARGETS cxx_shared
+	# ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ if (LIBCXX_INSTALL_STATIC_LIBRARY)
+-  install(TARGETS cxx_static
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+	#  install(TARGETS cxx_static
+	#    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ if (LIBCXX_INSTALL_LIBRARY)
+-  install(TARGETS cxx_experimental
+-    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+-    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+	#  install(TARGETS cxx_experimental
+	#    LIBRARY DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    ARCHIVE DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR} COMPONENT cxx
+	#    RUNTIME DESTINATION ${LIBCXX_INSTALL_RUNTIME_DIR} COMPONENT cxx)
+ endif()
+ 
+ # NOTE: This install command must go after the cxx install command otherwise
+ # it will not be executed after the library symlinks are installed.
+ if (LIBCXX_ENABLE_SHARED AND LIBCXX_ENABLE_ABI_LINKER_SCRIPT)
+-  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
+-    DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
+-    COMPONENT libcxx)
+	#  install(FILES "$<TARGET_LINKER_FILE:cxx_shared>"
+	#    DESTINATION ${LIBCXX_INSTALL_LIBRARY_DIR}
+	#    COMPONENT libcxx)
+ endif()
+ 
+ if (NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/llvm-project/llvm/tools/lto/CMakeLists.txt b/llvm-project/llvm/tools/lto/CMakeLists.txt
+index 67f6d3af4..51aa827a4 100644
+--- a/llvm-project/llvm/tools/lto/CMakeLists.txt
+++ b/llvm-project/llvm/tools/lto/CMakeLists.txt
+@@ -32,9 +32,9 @@ endif()
+ add_llvm_library(${LTO_LIBRARY_NAME} ${LTO_LIBRARY_TYPE} INSTALL_WITH_TOOLCHAIN
+     ${SOURCES} DEPENDS intrinsics_gen)
+ 
+-install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
+-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+-  COMPONENT LTO)
+#install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
+#  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+#  COMPONENT LTO)
+ 
+ if (APPLE)
+   set(LTO_VERSION ${LLVM_VERSION_MAJOR})
+diff --git a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
+index c0070f8cb..afe9756e0 100644
+--- a/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
+++ b/llvm-project/llvm/tools/opt-viewer/CMakeLists.txt
+@@ -6,11 +6,11 @@ set (files
+   "optrecord.py"
+   "style.css")
+ 
+-foreach (file ${files})
+-  install(PROGRAMS ${file}
+-    DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
+-    COMPONENT opt-viewer)
+-endforeach (file)
+#foreach (file ${files})
+	#  install(PROGRAMS ${file}
+	#    DESTINATION "${CMAKE_INSTALL_DATADIR}/opt-viewer"
+    #    COMPONENT opt-viewer)
+    #endforeach (file)
+ 
+ add_custom_target(opt-viewer DEPENDS ${files})
+ if(NOT LLVM_ENABLE_IDE)
+diff --git a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
+index f22cedd9e..13ec0103d 100644
+--- a/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
+++ b/llvm-project/llvm/tools/remarks-shlib/CMakeLists.txt
+@@ -18,9 +18,9 @@ if(LLVM_ENABLE_PIC)
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -INCLUDE:malloc")
+   endif()
+   
+-  install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+-    COMPONENT Remarks)
+  #  install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/Remarks.h
+  #  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm-c"
+  #  COMPONENT Remarks)
+ 
+   if (APPLE)
+     set(REMARKS_VERSION ${LLVM_VERSION_MAJOR})
--- a/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.2-reduced-llvm-installations.patch
@ -0,0 +1,309 @@
+diff --git a/llvm-project/compiler-rt/include/CMakeLists.txt b/llvm-project/compiler-rt/include/CMakeLists.txt
+index 5968cfd0e..b19de088b 100644
+--- a/llvm-project/compiler-rt/include/CMakeLists.txt
+++ b/llvm-project/compiler-rt/include/CMakeLists.txt
+@@ -74,30 +74,30 @@ add_dependencies(compiler-rt compiler-rt-headers)
+ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc")
+ 
+ # Install sanitizer headers.
+-install(FILES ${SANITIZER_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer)
+#install(FILES ${SANITIZER_HEADERS}
+#  COMPONENT compiler-rt-headers
+#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/sanitizer)
+ # Install fuzzer headers.
+-install(FILES ${FUZZER_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer)
+#install(FILES ${FUZZER_HEADERS}
+#  COMPONENT compiler-rt-headers
+#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/fuzzer)
+ # Install xray headers.
+-install(FILES ${XRAY_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray)
+#install(FILES ${XRAY_HEADERS}
+#  COMPONENT compiler-rt-headers
+#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/xray)
+ # Install ORC headers.
+-install(FILES ${ORC_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc)
+#install(FILES ${ORC_HEADERS}
+#  COMPONENT compiler-rt-headers
+#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/orc)
+ # Install profile headers.
+-install(FILES ${PROFILE_HEADERS}
+-  COMPONENT compiler-rt-headers
+-  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile)
+#install(FILES ${PROFILE_HEADERS}
+#  COMPONENT compiler-rt-headers
+#  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+#  DESTINATION ${COMPILER_RT_INSTALL_INCLUDE_DIR}/profile)
+ 
+ if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDEs.
+   add_custom_target(install-compiler-rt-headers
+diff --git a/llvm-project/libclc/CMakeLists.txt b/llvm-project/libclc/CMakeLists.txt
+index 96519e09e..4d971d617 100644
+--- a/llvm-project/libclc/CMakeLists.txt
+++ b/llvm-project/libclc/CMakeLists.txt
+@@ -186,16 +186,16 @@ endif()
+ 
+ # pkg-config file
+ configure_file( libclc.pc.in libclc.pc @ONLY )
+-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
+-install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
+#install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
+#install( DIRECTORY generic/include/clc DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" )
+ 
+ if( ENABLE_RUNTIME_SUBNORMAL )
+ 	add_library( subnormal_use_default STATIC
+ 		generic/lib/subnormal_use_default.ll )
+ 	add_library( subnormal_disable STATIC
+ 		generic/lib/subnormal_disable.ll )
+-	install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
+-		DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" )
+	#	install( TARGETS subnormal_use_default subnormal_disable ARCHIVE
+	#		DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" )
+ endif()
+ 
+ find_package( Python3 REQUIRED COMPONENTS Interpreter )
+diff --git a/llvm-project/libcxxabi/include/CMakeLists.txt b/llvm-project/libcxxabi/include/CMakeLists.txt
+index 5b1cc2545..587549494 100644
+--- a/llvm-project/libcxxabi/include/CMakeLists.txt
+++ b/llvm-project/libcxxabi/include/CMakeLists.txt
+@@ -22,11 +22,11 @@ target_include_directories(cxxabi-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}
+ if (LIBCXXABI_INSTALL_HEADERS)
+   foreach(file ${files})
+     get_filename_component(dir ${file} DIRECTORY)
+-    install(FILES ${file}
+-      DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir}
+-      COMPONENT cxxabi-headers
+-      PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    )
+    #    install(FILES ${file}
+    #  DESTINATION ${LIBCXXABI_INSTALL_INCLUDE_DIR}/${dir}
+    #  COMPONENT cxxabi-headers
+    #  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+    #)
+   endforeach()
+ 
+   add_custom_target(install-cxxabi-headers
+diff --git a/llvm-project/libunwind/include/CMakeLists.txt b/llvm-project/libunwind/include/CMakeLists.txt
+index adf1766c4..5ca04b1f0 100644
+--- a/llvm-project/libunwind/include/CMakeLists.txt
+++ b/llvm-project/libunwind/include/CMakeLists.txt
+@@ -13,11 +13,11 @@ target_include_directories(unwind-headers INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+ if(LIBUNWIND_INSTALL_HEADERS)
+   foreach(file ${files})
+     get_filename_component(dir ${file} DIRECTORY)
+-    install(FILES ${file}
+-      DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
+-      COMPONENT unwind-headers
+-      PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+-    )
+    #install(FILES ${file}
+    #  DESTINATION "${LIBUNWIND_INSTALL_INCLUDE_DIR}/${dir}"
+    #  COMPONENT unwind-headers
+    #  PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+    #)
+   endforeach()
+ 
+   if(NOT CMAKE_CONFIGURATION_TYPES)
+diff --git a/llvm-project/lld/cmake/modules/CMakeLists.txt b/llvm-project/lld/cmake/modules/CMakeLists.txt
+index 61e7a1fe2..71395e8bb 100644
+--- a/llvm-project/lld/cmake/modules/CMakeLists.txt
+++ b/llvm-project/lld/cmake/modules/CMakeLists.txt
+@@ -50,10 +50,10 @@ set(LLD_CONFIG_CMAKE_DIR)
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+   install_distribution_exports(LLD)
+ 
+-  install(FILES
+-    ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake
+-    DESTINATION ${LLD_INSTALL_PACKAGE_DIR}
+-    COMPONENT lld-cmake-exports)
+  #install(FILES
+  #  ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LLDConfig.cmake
+  #  DESTINATION ${LLD_INSTALL_PACKAGE_DIR}
+  #  COMPONENT lld-cmake-exports)
+ 
+   if(NOT LLVM_ENABLE_IDE)
+     # Add a dummy target so this can be used with LLVM_DISTRIBUTION_COMPONENTS
+diff --git a/llvm-project/llvm-libgcc/lib/CMakeLists.txt b/llvm-project/llvm-libgcc/lib/CMakeLists.txt
+index d895a2155..fb1969249 100644
+--- a/llvm-project/llvm-libgcc/lib/CMakeLists.txt
+++ b/llvm-project/llvm-libgcc/lib/CMakeLists.txt
+@@ -45,10 +45,10 @@ target_link_libraries(libgcc_s PRIVATE
+ extend_path(LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${CMAKE_INSTALL_PREFIX}" "${LIBUNWIND_INSTALL_LIBRARY_DIR}")
+ #string(REPLACE "${CMAKE_INSTALL_FULL_LIBDIR}/" "" LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}")
+ 
+-install(TARGETS libgcc_s
+-        LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+-        ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind)
+#install(TARGETS libgcc_s
+#        LIBRARY DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+#        ARCHIVE DESTINATION "${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}" COMPONENT unwind
+#        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT unwind)
+ 
+ get_compiler_rt_install_dir(${LLVM_LIBGCC_TARGET_ARCH} install_dir_builtins)
+ string(REGEX REPLACE "^lib/" "" install_dir_builtins "${install_dir_builtins}")
+@@ -58,29 +58,29 @@ if(install_path_contains_triple EQUAL -1)
+ else()
+   string(PREPEND install_dir_builtins "../")
+ endif()
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+#install(CODE "execute_process(
+#                COMMAND \"\${CMAKE_COMMAND}\" -E
+#                create_symlink ${install_dir_builtins}/libclang_rt.builtins${builtins_suffix}.a libgcc.a
+#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+#        COMPONENT unwind)
+ 
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libunwind.a libgcc_eh.a
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-               COMMAND \"\${CMAKE_COMMAND}\" -E
+-               create_symlink libunwind.so libgcc_s.so.1.0
+-               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libgcc_s.so.1.0 libgcc_s.so.1
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+-install(CODE "execute_process(
+-                COMMAND \"\${CMAKE_COMMAND}\" -E
+-                create_symlink libgcc_s.so.1 libgcc_s.so
+-                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+-        COMPONENT unwind)
+#install(CODE "execute_process(
+#                COMMAND \"\${CMAKE_COMMAND}\" -E
+#                create_symlink libunwind.a libgcc_eh.a
+#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+#        COMPONENT unwind)
+#install(CODE "execute_process(
+#               COMMAND \"\${CMAKE_COMMAND}\" -E
+#               create_symlink libunwind.so libgcc_s.so.1.0
+#               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+#        COMPONENT unwind)
+#install(CODE "execute_process(
+#                COMMAND \"\${CMAKE_COMMAND}\" -E
+#                create_symlink libgcc_s.so.1.0 libgcc_s.so.1
+#                WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+#        COMPONENT unwind)
+#install(CODE "execute_process(
+#                COMMAND \"\${CMAKE_COMMAND}\" -E
+#                create_symlink libgcc_s.so.1 libgcc_s.so
+#               WORKING_DIRECTORY \"\$ENV{DESTDIR}${LLVM_LIBGCC_LIBUNWIND_STATIC_ROOT}\")"
+#        COMPONENT unwind)
+diff --git a/llvm-project/llvm/CMakeLists.txt b/llvm-project/llvm/CMakeLists.txt
+index c60e34efa..123704685 100644
+--- a/llvm-project/llvm/CMakeLists.txt
+++ b/llvm-project/llvm/CMakeLists.txt
+@@ -999,8 +999,8 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "")
+   include_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/tensorflow/include)
+   add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src
+     ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime)
+-  install(TARGETS tf_xla_runtime EXPORT LLVMExports
+-    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+  #install(TARGETS tf_xla_runtime EXPORT LLVMExports
+  #  ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime)
+   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime)
+   # Once we add more modules, we should handle this more automatically.
+   if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL)
+@@ -1247,44 +1247,44 @@ if (LLVM_INCLUDE_UTILS)
+ endif()
+ 
+ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+-  install(DIRECTORY include/llvm include/llvm-c
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-    COMPONENT llvm-headers
+-    FILES_MATCHING
+-    PATTERN "*.def"
+-    PATTERN "*.h"
+-    PATTERN "*.td"
+-    PATTERN "*.inc"
+-    PATTERN "LICENSE.TXT"
+-    )
+-
+-  install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c
+-    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-    COMPONENT llvm-headers
+-    FILES_MATCHING
+-    PATTERN "*.def"
+-    PATTERN "*.h"
+-    PATTERN "*.gen"
+-    PATTERN "*.inc"
+	#install(DIRECTORY include/llvm include/llvm-c
+	#    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	#    COMPONENT llvm-headers
+	#    FILES_MATCHING
+	#    PATTERN "*.def"
+	#    PATTERN "*.h"
+	#    PATTERN "*.td"
+	#    PATTERN "*.inc"
+	#    PATTERN "LICENSE.TXT"
+	#    )
+
+	#  install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm ${LLVM_INCLUDE_DIR}/llvm-c
+	#    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	#    COMPONENT llvm-headers
+	#    FILES_MATCHING
+	#    PATTERN "*.def"
+	#    PATTERN "*.h"
+	#    PATTERN "*.gen"
+	#    PATTERN "*.inc"
+     # Exclude include/llvm/CMakeFiles/intrinsics_gen.dir, matched by "*.def"
+-    PATTERN "CMakeFiles" EXCLUDE
+-    PATTERN "config.h" EXCLUDE
+-    )
+    #    PATTERN "CMakeFiles" EXCLUDE
+    #    PATTERN "config.h" EXCLUDE
+    #    )
+ 
+   if (LLVM_INSTALL_MODULEMAPS)
+-    install(DIRECTORY include/llvm include/llvm-c
+-            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+-            COMPONENT llvm-headers
+-            FILES_MATCHING
+-            PATTERN "module.modulemap"
+-            )
+-    install(FILES include/llvm/module.install.modulemap
+-            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm"
+-            COMPONENT llvm-headers
+-            RENAME "module.extern.modulemap"
+-            )
+	  #    install(DIRECTORY include/llvm include/llvm-c
+	  #            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+	  #            COMPONENT llvm-headers
+	  #            FILES_MATCHING
+	  #            PATTERN "module.modulemap"
+	  #            )
+	  #    install(FILES include/llvm/module.install.modulemap
+	  #            DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/llvm"
+	  #            COMPONENT llvm-headers
+	  #            RENAME "module.extern.modulemap"
+	  #         
+   endif(LLVM_INSTALL_MODULEMAPS)
+-
+	  #
+   # Installing the headers needs to depend on generating any public
+   # tablegen'd headers.
+   add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen)
--- a/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
+++ b/media-libs/amdvlk/files/amdvlk-2022.4.4-r1-disable-Werror.patch
@ -0,0 +1,13 @@
+diff --git a/pal/shared/devdriver/cmake/DevDriver.cmake b/pal/shared/devdriver/cmake/DevDriver.cmake
+index b3f2e7e48..cbd9f7839 100644
+--- a/pal/shared/devdriver/cmake/DevDriver.cmake
+++ b/pal/shared/devdriver/cmake/DevDriver.cmake
+@@ -111,7 +111,7 @@ function(apply_devdriver_warnings name)
+         target_compile_options(${name} PRIVATE
+             -Wall # Enable all warnings.
+             -Wextra # Enable extra warnings that are not enabled by -Wall.
+-            -Werror # warning as error
+	    #-Werror # warning as error
+         )
+     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+         target_compile_options(${name} PRIVATE
--- a/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
+++ b/media-libs/amdvlk/files/amdvlk-2023.1.2-gcc13-cstdint.patch
@ -0,0 +1,11 @@
+diff -Naur amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h
+--- amdvlk.orig/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2023-02-16 17:37:47.000000000 +0900
+++ amdvlk/pal/src/core/imported/rdf/rdf/inc/amdrdf.h	2024-01-17 06:58:02.666146730 +0900
+@@ -25,6 +25,7 @@
+ #pragma once
+ 
+ #include <cstddef>
+#include <cstdint>
+ #include <cstring>
+ #include <functional>
+ #include <memory>
--- a/sys-boot/grub/files/gfxpayload.patch
+++ b/sys-boot/grub/files/gfxpayload.patch
@ -0,0 +1,29 @@
+From e2d5bf1bc6aaaabeba538c1ca94ea8601e4e1474 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 16 Oct 2014 23:43:51 -0400
+Subject: [PATCH] 10_linux: Default gfxpayload=keep only when booting using efi
+
+vesafb seems to be unreliable when using BIOS compat mode.
+
+---
+ util/grub.d/10_linux.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index d2e2a8f..a54b888 100644
+--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
+@@ -104,7 +104,9 @@ linux_entry ()
+       echo "	load_video" | sed "s/^/$submenu_indentation/"
+       if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
+ 	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
+-	  echo "	set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
+	  echo '	if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
+	  echo "		set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
+	  echo '	fi' | sed "s/^/$submenu_indentation/"
+       fi
+   else
+       if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
+-- 
+2.7.2
+
--- a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
+++ b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch
@ -0,0 +1,74 @@
+From 43e3295aaad5278a1e53c5282e2660b72cd76d28 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Tue, 29 Dec 2015 15:29:14 -0800
+Subject: [PATCH] GRUB_LINUX_KERNEL_GLOBS: configurable kernel selection
+
+* util/grub.d/10_linux.in: Implement GRUB_LINUX_KERNEL_GLOBS
+* docs/grub.texi: Document GRUB_LINUX_KERNEL_GLOBS
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+---
+ docs/grub.texi          |  5 +++++
+ util/grub.d/10_linux.in | 21 +++++++++++----------
+ 2 files changed, 16 insertions(+), 10 deletions(-)
+
+diff --git a/docs/grub.texi b/docs/grub.texi
+index 9a25a0b..d1129ec 100644
+--- a/docs/grub.texi
+++ b/docs/grub.texi
+@@ -1490,6 +1490,11 @@ This option may be set to a list of GRUB module names separated by spaces.
+ Each module will be loaded as early as possible, at the start of
+ @file{grub.cfg}.
+ 
+@item GRUB_LINUX_KERNEL_GLOBS
+This option may be set to override the list of path globs used to find Linux
+kernels. The defaults vary by architecture, and generally include both
+@file{/boot} and @file{/}.
+
+ @end table
+ 
+ The following options are still accepted for compatibility with existing
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 859b608..e5ac11d 100644
+--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
+@@ -145,18 +145,19 @@ EOF
+ }
+ 
+ machine=`uname -m`
+-case "x$machine" in
+globs="$GRUB_LINUX_KERNEL_GLOBS"
+[ -z "$globs" ] && case "x$machine" in
+     xi?86 | xx86_64)
+-	list=
+-	for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
+-	    if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+-	done ;;
+-    *) 
+-	list=
+-	for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
+-                  if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+-	done ;;
+	globs="/boot/vmlinuz-* /vmlinuz-* /boot/kernel-*"
+	;;
+    *)
+	globs="/boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-*"
+	;;
+ esac
+list=
+for i in ${globs} ; do
+    if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
+done
+ 
+ case "$machine" in
+     i?86) GENKERNEL_ARCH="x86" ;;
+--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
+@@ -252,6 +252,7 @@
+   GRUB_BADRAM \
+   GRUB_OS_PROBER_SKIP_LIST \
+   GRUB_DISABLE_SUBMENU
+export GRUB_LINUX_KERNEL_GLOBS
+ 
+ if test "x${grub_cfg}" != "x"; then
+   rm -f "${grub_cfg}.new"
--- a/sys-boot/grub/files/grub-2.06-test-words.patch
+++ b/sys-boot/grub/files/grub-2.06-test-words.patch
@ -0,0 +1,25 @@
+From 0f5080a2f3c952e2ee00bd271f42c56bb955dc19 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Mar 2021 12:44:52 -0400
+Subject: [PATCH] Use /usr/share/dict/words as a 'compressible' file
+
+---
+ tests/util/grub-fs-tester.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
+index bfc425e1f..efd2977b0 100644
+--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
+@@ -265,7 +265,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
+ 	    MASTER="${tempdir}/master"
+ 	    FSLABEL="grub_;/testé莭莽茝😁киритi urewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewrewfceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfewceniuewruevrewnuuireurevueurnievrewfnerfcnevirivinrewvnirewnivrewiuvcrewvnuewvrrrewniuerwreiuviurewiuviurewnuvewnvrenurnunuvrevuurerejiremvreijnvcreivire nverivnreivrevnureiorfnfrvoeoiroireoireoifrefoieroifoireoifoirefoireoifoijfoirereoireoivoioirevoinvoinreoinvnoieoinreoinveoinveoinreoinvoineoinoinoineoinernoiveoinvreoiioewdioewoirvnoireoivfoirewfewoifoijewoijfoijewfoijfewoijoijoijoijoijoijoijfew"
+ 	    CFILESRC=
+-	    for cand in /usr/share/dict/american-english /usr/share/dict/linux.words /data/data/com.termux/files/usr/share/hunspell/en_US.dic; do
+	    for cand in /usr/share/dict/words; do
+ 		if test -f "$cand" ; then
+ 		    CFILESRC="$cand"
+ 		    break
+-- 
+2.31.0.rc1
+
--- a/sys-boot/grub/files/grub-2.12-fwsetup.patch
+++ b/sys-boot/grub/files/grub-2.12-fwsetup.patch
@ -0,0 +1,38 @@
+From 6e0b2277eba062bf7950536cd27f9789c545d20f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 11 Apr 2024 15:33:45 -0400
+Subject: [PATCH] grub.d: avoid calling fwsetup unconditionally
+
+This causes grub to enter the firmware setup on boot when using a
+grub core that does not support the 'fwsetup --is-supported' option.
+
+Upstream has rejected attempts to resolve this, so we will carry this as
+a distro patch for a bit.
+
+Bug: https://bugs.gentoo.org/925370
+---
+ util/grub.d/30_uefi-firmware.in | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
+index 1c2365ddb..b6041b55e 100644
+--- a/util/grub.d/30_uefi-firmware.in
+++ b/util/grub.d/30_uefi-firmware.in
+@@ -32,11 +32,8 @@ gettext_printf "Adding boot menu entry for UEFI Firmware Settings ...\n" >&2
+ 
+ cat << EOF
+ if [ "\$grub_platform" = "efi" ]; then
+-	fwsetup --is-supported
+-	if [ "\$?" = 0 ]; then
+-		menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
+-			fwsetup
+-		}
+-	fi
+	menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
+		fwsetup
+	}
+ fi
+ EOF
+-- 
+2.44.0
+
--- a/sys-boot/grub/files/grub.default-4
+++ b/sys-boot/grub/files/grub.default-4
@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+#     'grub-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DISTRIBUTOR="Gentoo"
+
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+#GRUB_TIMEOUT=5
+#GRUB_TIMEOUT_STYLE=menu
+
+# Append parameters to the linux kernel command line
+#GRUB_CMDLINE_LINUX=""
+#
+# Examples:
+#
+# Boot with network interface renaming disabled
+# GRUB_CMDLINE_LINUX="net.ifnames=0"
+#
+# Boot with systemd instead of sysvinit (openrc)
+# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
+
+# Append parameters to the linux kernel command line for non-recovery entries
+#GRUB_CMDLINE_LINUX_DEFAULT=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+#GRUB_GFXPAYLOAD_LINUX=
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Comment if you don't want GRUB to pass "root=PARTUUID=xxx" parameter to kernel
+GRUB_DISABLE_LINUX_PARTUUID=false
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
--- a/sys-boot/grub/files/sbat.csv
+++ b/sys-boot/grub/files/sbat.csv
@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+grub,3,Free Software Foundation,grub,%PV%,https//www.gnu.org/software/grub/
+grub.gentoo,1,Gentoo,grub,%PV%,https://bugs.gentoo.org/
Author	SHA1	Message	Date
lif	9868a89d8c	uhh new amdvlk i forgot to check in?	2024-07-21 15:55:10 -07:00
lif	7d058da7af	app-emulation/box64: add other platform flags	2024-07-21 15:54:22 -07:00
lif	1655b9cb21	amdvlk files oops	2024-05-08 12:57:42 -07:00
lif	5c95fb445d	grub files oops	2024-05-08 12:56:35 -07:00