commit:     35516cc1b3d7cbf5416b096c8a36c4ee654ed6a6
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 17:35:05 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 18:18:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35516cc1

x11-drivers/nvidia-drivers: add 390.154

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-drivers/nvidia-drivers/Manifest                |   7 +
 .../nvidia-drivers/nvidia-drivers-390.154.ebuild   | 437 +++++++++++++++++++++
 2 files changed, 444 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index e93ce333b551..c54e2e34dc90 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,32 +1,39 @@
 DIST NVIDIA-Linux-aarch64-510.73.05.run 211202539 BLAKE2B 
0841e4a6fe09d2f0720b25eee545d15d09edb9689ea886fcf86394d09472cda1119488c58325b7bdc20a13af8bcf577056b44987a5a276d2914935fc223285a1
 SHA512 
bf46b4b8116819ef58fe3aeafe823627d797dd42e936cdc10f93a4acbfe2d7a53614f3d3ce1e43a1027c7d4c6ed5cceb66bd7ebba98471ecbe660b711e0b62de
 DIST NVIDIA-Linux-aarch64-515.57.run 220881279 BLAKE2B 
a0ecf7f18644da11ef813ffe27c900f43d6ef6f7f6cde8626e0884aab9003c5dc026a43e0708409f07518f6d313dfa84f976834d10f872c9e5fda372c8990e69
 SHA512 
e863fea28fd8b47c21c8832b41eee17ede3c15a0b281c7a8bb143b7d4f07f477e5b30757477f16b3fd4a096b53f25da165f6db641ea3d3dd17893813df3d2a53
 DIST NVIDIA-Linux-x86-390.151.run 50757681 BLAKE2B 
48821fd918b858167f4f6bda123b132898baea1c41fe7a9273bd67c54d664fce949c9557a7978766661c23e6bc61cb12d1ff6d376c050cdb4cecad117eae7001
 SHA512 
4e60a5886a8d25b86efed62c01a4ad3aae43c515c8be18ada3f3a20b47c9c6e1d4ca5f268b00932d52ef4330d84c4324e574e6847fef871ddfaa9a0e9dc9751b
+DIST NVIDIA-Linux-x86-390.154.run 49362860 BLAKE2B 
083d9dd234a37ec39a703ef7e0eb6ec165c24d2fcb5e92ca987c33df643d0604319eb65ef152c861acacd5a41858ab6b82c45c2c8ff270efc62b07727666daae
 SHA512 
5064ae135d099a4b8b81cf4d29f0cc0dcbcd93f13cadb0378f5e20eefad47522bdab42c9130f22ac8a22a4bef22365321cb35dc53b0ba35374e2bedd44e5a5c2
 DIST NVIDIA-Linux-x86_64-390.151.run 86025677 BLAKE2B 
8f78ee00d15ffac9f371e8302541eee8b033670953850dd770c6615eb674fcda2adcea52582284c59a9d7e32943a445d65515b1cacd6f8e5fcbe6c9e94080fb0
 SHA512 
aad962e4132c8ab031b5f72e47fbd4b5c49824bc175f13fd2c6fb3e539d41ff9829835ce4928bbfa56aba2ffa43fbe3d8049e9246e29b19abcea0ac89bdae5d4
+DIST NVIDIA-Linux-x86_64-390.154.run 84438529 BLAKE2B 
e1bd2982f9697e74b593380acf471e03192cd8d20f14bd9b43e6d5925421c518278e75515a0713be25b29bf99d7ea49c770adf2cede79736a03f323d5ed96a33
 SHA512 
cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3
 DIST NVIDIA-Linux-x86_64-470.129.06.run 272145574 BLAKE2B 
9eb75456f3aa6cea13a66b9e161677e06ab3a3e12d960df3973adfa7ded4aefc5336761398f92e91a304786e48c1cc0a34675ad18d416297a177d677668ec4a2
 SHA512 
6f61f01b3840e30b3cd195ecb81826c37200e27b79d555808c873d5381fd55868bddf16a53f15cb51646af067705a6ce289c4cef514908b1b4b2d2e765907252
 DIST NVIDIA-Linux-x86_64-510.73.05.run 329250752 BLAKE2B 
dd79ad5a7c94cd50a832a224a5dcab7cb24368453417962ac63cb7dca6f7d9bfe0a41460df90f9793b9c8c2e42d1e3666c940cf9f869e18b201df385a66c7dd8
 SHA512 
c2ce41ee8112ad5450d6aa18f910da0870ac08a1ad0ab0d82a256b191c7826057afb3477e7a842244034c9eb9de37c6af919b0dd055bb90dd2a32d7e97a8c72c
 DIST NVIDIA-Linux-x86_64-515.49.10.run 362743485 BLAKE2B 
a97490c588c4a0abaa23b889204f39ff6f39da9105170860d6bb85255e23a601168c295b2a68a4b0110782ca911cde8b8db3ca1e54f2aa62e8a0322e7c60967a
 SHA512 
0c9e51d01152294b890675ffe39cb246e9b7ac221534a6f1a895cff1e83e4785d82a93a39011277debedfdb51b3979e7a56258b5c8d54f065b7a90a5ca627e2a
 DIST NVIDIA-Linux-x86_64-515.57.run 363365091 BLAKE2B 
13bd4d4cbfbfe99a9841d82e6ae86600ba93a5db1a87d8a3372fde2fb86b104adf31e345ec7ffd6bc076cda962521f64213bbc5ebe46077c6d457c2676b5f8c4
 SHA512 
6c6ff830dfdf9fb7d127cddc1d72b54e78dc14aeb07596413e82ffa62e065272781d2c487ffd25d153bdbeedb9b26d6fd80380304f736a47fa628aded0e817d6
 DIST nvidia-installer-390.151.tar.bz2 150160 BLAKE2B 
373c0f26ca258d6e274891ec49f8ae768b3ba50cc1079b697e310c52fac7710b221591074497803b3e65a8fc9c2f49a493126de0907a117d6af1101d190b2b38
 SHA512 
027676209d1ba5fa3bf63d716562beb308c28b083f9411461112493f006afa69bcad7c95c479724a841f2790548924a3cf4b11ae95b70e33854ce0b2eff4b8f8
+DIST nvidia-installer-390.154.tar.bz2 150301 BLAKE2B 
c9c91b19455823e42ccb9c9c49761f38bd3f85ddfe2fb4c159fe37f10a1d66f5b7b02d66b403881d863c905f86f1ecc1ac7393f051f1b7bee764ab1e15638218
 SHA512 
56ef5b845cd92a235473e868f81d6f94a1dc685e8bd113cc63be43d68a00f8f4eb74e239a2fec623a4ba89dd5c3690d5f97d06d71ca093570a05bd88757224fd
 DIST nvidia-installer-470.129.06.tar.bz2 146297 BLAKE2B 
d09351edc3b90bb401ced3cf883c18dfbd83b9a1f2d4b5595adc8a593357e848ad7d588ef2283ab11ee520860ba8786684e177d84156d75f78c8f312848255c4
 SHA512 
b49963d7c4fde2354f64e77373d0e1c9fdd71927b43101b5663be31d3b36bd3c652ae983286dc406b080fce6f2f2ff0151254ee833a39c81b44524d0b79090b6
 DIST nvidia-installer-510.73.05.tar.bz2 144478 BLAKE2B 
183ae9dd744905b2171226b4552ab88e85fb70b941db246f5e9a6cc01f17dbb30aa91738cce9ef9294326aff9aa2dfd121358c1374e94524ba00e20de338c72d
 SHA512 
83deb6bca2c448f319c1a0065f5dea8d754e5b8e812b0342a4c85ef2c7bb2efeb2b3ebde3234e823c9029ef575a4cfe38e48acde3b2639b21d123e361d56c767
 DIST nvidia-installer-515.48.07.tar.bz2 144506 BLAKE2B 
6d1cc61e5ea20e94f467eeac873cfd5a2f56b2ac2be680284872c0f078d4e1d3aceabec395c9581273ac333fcc9642bbe346a228c4b691b5a4bc3a00494167b5
 SHA512 
219ca1cdd4b31779e0b7a0180b20e067d9f52bb5f54cfb38ec3e4559f13cd854caa7378d23ec2f171b54d9a8c0ddaabd7579f4f041c2b973df1d13a17466943b
 DIST nvidia-installer-515.57.tar.gz 199931 BLAKE2B 
6e3ceb3f3e3e042c7409eba282381a11f2ad593b831e1e07cbf07e218f7025b983ab6f4162e12bbaedb6f210963112d619f75f94ec3b9c24b9b925b71f2e9958
 SHA512 
6d0fb7503e61ff70a69ba8bcd063cb62b26b73f3941f5a5c4963b877c72358a7854e980f7bfbfb8b38d2e14d796f59bebf81e5e4f8d33f0a6571c965d7683bb4
 DIST nvidia-modprobe-390.151.tar.bz2 35327 BLAKE2B 
0bfc5057082b68df6e8d1431257ec2b95445dea2401d4d64af475a1b416f647bf04e64c484d27f0a52255216fad7c6d02659dea8d5bdaa7d3eba1eac8b3565da
 SHA512 
257bd82139f7e598b47d3dea620aea2662332c69a19b3e6c2f02bf2705f204c10c8a2c7bdcde24ed044d4738c8d8a5f28fee78d6e87071d4b7a6c62687239bb1
+DIST nvidia-modprobe-390.154.tar.bz2 35315 BLAKE2B 
02d9f11345ceb13e073d4f43401e95d04dc4eb54fdb7eb8966b60450accf103a403c2d101be6a0548ae59bce7412fe491becf707b17c6a3dd50bb2eef864feff
 SHA512 
09b5119ace0a48cc6fea92ed220a702a5033e7205d39bb111e49eb84f7b0fe193f8c3870da9f7df6816ea4c8cb91c2c776f54f448e423fbf8dfa7d3a7f96411b
 DIST nvidia-modprobe-470.129.06.tar.bz2 38371 BLAKE2B 
85bc02ea735cc6bf37e00b0c1d91110c58e67a0456598790758e5007bf097289b3910aaff27e7f7796b5ed3c6aed1f6f076f39808b7c77622f6adc650cd0445b
 SHA512 
e37aa5ce6e471ed62aafd5854990bb145b5ffc64226ab8a91be877b89f4951b0f381d933d0463b30920485d7fc60a2271f4e2042ac9f347bea8785cf402a0465
 DIST nvidia-modprobe-510.73.05.tar.bz2 39043 BLAKE2B 
8601827f688c321ca98563b3eb35bf88e617997edad71522ac832d5fc1eeb1e7563d0d753b52519007bc3fc2347d09b3c5b9e2eb544d2868fc3a95990886e195
 SHA512 
cf6fad9d4a3873ec9e7142aa276782cdb5419ff4e55354d1cb6ca9baadaadabb7536e68c76084b34eeb241d005e5018f0d4da7b1044c5ff553d2c59b8215e75f
 DIST nvidia-modprobe-515.48.07.tar.bz2 39099 BLAKE2B 
771902fe989516324210b0b3db9e927c5ce13a8caf790bbcd4da76ecf60ffd4ada66faf7e3e0296569c774f1ad2044f879d2902178966e3de9c56cba730dc63c
 SHA512 
3df1ea30f8a0c520ab02c05b0f805437e7abc0479402ad725b4d98ac0ff56ce10b797227b19157f51fdc18530cc772e6cf0bd66130a2387782658a5e9fd732a1
 DIST nvidia-modprobe-515.57.tar.gz 44361 BLAKE2B 
08bc65b03f61c7fadeed22ec040e051a607ef48b4c2db5508393f6d9e31ca7e00fa1785ad532e5a9e1d8a4dee7ec7ea9fdde1bb1382a25f12de52f0b6abad3c5
 SHA512 
d12d93d46519f0a5d4272da85a9fec26de56c54c2d858f56e3baa0d1165c475b160f9025ef14d70c0874618863a1e4b8942abb55ffefe832ec1c6f48709d2851
 DIST nvidia-persistenced-390.151.tar.bz2 48701 BLAKE2B 
adc54b184777ffdf00111f2635d4ae55778588d4f986db26591c60ca0137f66cf092b1d89e6bd54a88260251f7f71854bf144f1f64818c34d418c88ec9fbefa2
 SHA512 
24983016f4ad57e6baf5c89b58215501ca01d5685ac42c0067986f82601acd8e4ef72ac156ad153d65f07714a1cae426ef1629983e23b776067f67658462e8a0
+DIST nvidia-persistenced-390.154.tar.bz2 48669 BLAKE2B 
13739d3b32d7f5fddebc599d024968cd6fc2cd516da80bc2f0f4c61be01c622f13274157cce2997a051dafc19375c997927c0042c3fdbfecb4d0634463dfccd6
 SHA512 
efd6f15b9f4b91ab3c41d55138da48198889f3ee58b20b5e12cf0e47bb736cf559b69c679060563612a33c41b6187aec83052a1edf155438ed4935821aa2cf41
 DIST nvidia-persistenced-470.129.06.tar.bz2 46549 BLAKE2B 
4e120e7a3022f43a57356bddde55140b3702b13faa1bde44da724443c695208246507f8c4d596e54a9ce44e4127d23e4edea07120e587b2278c1797bdd5fcd60
 SHA512 
f1a55427d48ab540e2b7c4cfd834a063a9281337c4d2af4e8fd975508ee67b226bac78d3247eca7ed5138665178f25fa48459a56ac4a8eb815502e40dd5a9b06
 DIST nvidia-persistenced-510.73.05.tar.bz2 47104 BLAKE2B 
3013a5b10c85524da63fff23a4c0ebeea98335a698b0dc15977760f71bc9372af333fb1187f262c91b572d3e114a59b2075414f6f1ea8d2167ac45e09c4dcf12
 SHA512 
e3a6218ac6b68e586abcb0ecc591e101b82753f8e70ac3316c181706a2ba7250125e4a8a09ebac96768d2dfe862ed9bf8c466b760f749a45cca06539213321bb
 DIST nvidia-persistenced-515.48.07.tar.bz2 47155 BLAKE2B 
9465e8f86e22f623d3fd242636ae64da944ea302e82a877e453a406767254c9c210b6f8d1069e08e6010d8f182c09825c2748b68cd6d2403d05f8422a811f8f7
 SHA512 
4a00d4c0a5f7044b9258bcd1970112256f4ddd2a4a7440714f97dc65e9624f68713eb41ade24bc2dffcfca3e9d30652af528c939c1991370572db8384a43fa88
 DIST nvidia-persistenced-515.57.tar.gz 54737 BLAKE2B 
6cb9e11da910df5d4e46bc1bccc4a92faa10f1d6c8b78f73ed9b82ab57f2de9b376b7647d0b94b25ad56459b0b47585cfd576faaea0362ea0bf1eb0c4b716e4b
 SHA512 
03421335c9a929bf25b4ebc0ea8274251ae89dc67e123ea29bbd81fa2b3c0b73a711a5b1f5c89a189c87676a9d8009e01bf23f3d626880f610e235dc2f4fd238
 DIST nvidia-settings-390.151.tar.bz2 1109138 BLAKE2B 
07e94cf595c00b2b238cc81a99bab2862e4a41b83a3d3f24a9a28ec24ab0a1bd273551f541f685dd548334f4d19c93a3e2a7f2fb05cee653488a1a29988c0bb1
 SHA512 
00db210471402173c44007760a47905e52a04158ffb0ee09142ad53b2fa4f091e70825191151e2d80ddec2fdbcd722fe922a52efbcfd2c5a2b896e542f0cbbda
+DIST nvidia-settings-390.154.tar.bz2 1109136 BLAKE2B 
c351d6c950f037b06e8da1c5a481ed0a0951cae14878a1cac32ad58c29a301f1d9ac291f23873a57c7cb4b9ca93709d946adf8f91c937410d5f997696ca74729
 SHA512 
95321bffb6e6af7971ee0705a73ee3388cdb84dfd32e799d63c5b36e5c3ddd45de4091349d35c6af279a9aa6fea30b0ec0cb19b940e5b356768c580d8488d2df
 DIST nvidia-settings-470.129.06.tar.bz2 1062306 BLAKE2B 
7a61a069df021f39cb2b0ff54e77e5375848f4357aa7cdeeed200e75b902be8ad5b521c218a7461c17e131775a33bca44de416e76873ee568be5e5abd4c67828
 SHA512 
e54e873388b915b628e66ccb328feed640c619ca6633129db3d58ffd06818f0b2176590753cfcf1f2456fa4837d924d82cdf8cd06e8c84e37d6782086135b2c3
 DIST nvidia-settings-510.73.05.tar.bz2 1075626 BLAKE2B 
776713f21faf3eb8101169a11b47d6e9ee0d57884f63277032f50433bc9ddd13e74cedbd31837a73e518df79bd05816c2c58bfd7ae8433705c00c6427902589e
 SHA512 
b8c9bb01d85644f0a64189e54de282f21f5fe6c6ead80e97b8af8bbe5e2e0b64f9d187e75edc1b3ff466293783ec545746a89d8617d327497e637e56a3ab88d0
 DIST nvidia-settings-515.48.07.tar.bz2 1079544 BLAKE2B 
76da1e83cdcc052a820cb6bd196848291339ae7f8baf794673b3eb349476a39964e1dc1bd2dce40ebf2308033e729753cbef8ea03dd8f6a9d04fa512f2e0a479
 SHA512 
3eba90714ebb2b56c269db7ad0bd60b9ff58680767edf137742b31f78ee75b54468b61dba4c9f0727f267aeeb3bbd48de5c933226035f415cbf95b368fe69aa5
 DIST nvidia-settings-515.57.tar.gz 1253956 BLAKE2B 
b7a9d2443471037f91a1e1f88cfc82e1e575a92100543f1e891615334eb9b511b56c33ace2d1544fff388dbc07ba838c3819a9312e32a7db1f64143bc10511c5
 SHA512 
e40b66db06e563c4ee3749874137ceab9a10e0562da2c511a3d494467b097479ccc4a3427dbd2955b530111d42d8b14bd6a3ade0644fc772d5856d713140ecc7
 DIST nvidia-xconfig-390.151.tar.bz2 107177 BLAKE2B 
47b7b28f70c148c49149d44d20e3e2396c3c78143c687654f90350620a057edc912e1616f930a4212b921cf76e75cfc3ef4155adfd1819141a0ef3185891daef
 SHA512 
9bbabb35a8ea26b0714a4387d8503434681e35297d6c6ff3ee562f18086369fab75caff78f9122da7e11100367fcd62a05a18b0bef797ba7b5c97cd8887c1dcb
+DIST nvidia-xconfig-390.154.tar.bz2 107145 BLAKE2B 
8e221f182af0f7d7af3bc11acd4991ee0edd8f8a328545c0b7cfe37454b9ae02ea8d86f70c589446ed9e2e7f70fd0af05e8a1e965b854e61a97b67536b0007d3
 SHA512 
2e593ee519600e40b80d3c176ef3a1383a1ff51ba0ccce9c19b9d6ed6d122daa06769e992d4b8c0c64721011d84d5066a63932c34e55ec958802b61869f95350
 DIST nvidia-xconfig-470.129.06.tar.bz2 108704 BLAKE2B 
71ead889bca8503e987bc00c71531a4fd1a779ba6e679da5bee7636bfb4c46ff2984fc3b7feadd296ec45b58730fee52c55e1eedc0b24a4ff0976357eed79b3c
 SHA512 
26955fbcd17e5d2caaadd0ff818cbdf93934d6cec5f29bb43fbc98bf300c9bc745f9e3dd977be1209a5f5a7f812d3fb9b2b33140ffc4b86789477661bb8c49c3
 DIST nvidia-xconfig-510.73.05.tar.bz2 109809 BLAKE2B 
4554555b543073281f7b2e3f2d3463f7b4e8a7c8a734663af0d6a3110d432dd8f9e14e4e0efbd93902ae1e8cd1afefd35838f0bf70a5a619b05119acef25aa1a
 SHA512 
bc992cd75e9e757f2e3edf35b38106362de0900085dec059b3b609bca3bc02fcac4a39a1481a7c9ca0e704fe0355e8f9620a1e8cc867e1c341d2b0df2cf47bf0
 DIST nvidia-xconfig-515.48.07.tar.bz2 110220 BLAKE2B 
54283c809f4d50337279727c70bed11e98b1422751663a1c77afb250917c28f269cecf6d75c1458051ed09bd826d9fdc7329b332d8e2118e6b3529f6a4e34bc1
 SHA512 
417bcb829fe578ccecea713780e5d3cbe79798d974ef66741c2b0fe3a87c6a236c719e369af44b297f0c42d82b33af76a61a0e205ad939684b56d258a0d37b0b

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
new file mode 100644
index 000000000000..6c9f7abeb155
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MODULES_OPTIONAL_USE="driver"
+inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \
+       systemd toolchain-funcs unpacker user-info
+
+NV_KERNEL_MAX="5.19"
+NV_URI="https://download.nvidia.com/XFree86/";
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="https://www.nvidia.com/download/index.aspx";
+SRC_URI="
+       amd64? ( ${NV_URI}Linux-x86_64/${PV}/NVIDIA-Linux-x86_64-${PV}.run )
+       x86? ( ${NV_URI}Linux-x86/${PV}/NVIDIA-Linux-x86-${PV}.run )
+       $(printf "${NV_URI}%s/%s-${PV}.tar.bz2 " \
+               nvidia-{installer,modprobe,persistenced,settings,xconfig}{,})"
+# nvidia-installer is unused but here for GPL-2's "distribute sources"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-r2 BSD BSD-2 GPL-2 MIT"
+SLOT="0/${PV%%.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+X abi_x86_32 abi_x86_64 +driver persistenced +static-libs +tools"
+
+COMMON_DEPEND="
+       acct-group/video
+       sys-libs/glibc
+       persistenced? (
+               acct-user/nvpd
+               net-libs/libtirpc:=
+       )
+       tools? (
+               dev-libs/atk
+               dev-libs/glib:2
+               dev-libs/jansson:=
+               media-libs/harfbuzz:=
+               x11-libs/cairo
+               x11-libs/gdk-pixbuf:2
+               x11-libs/gtk+:3
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXxf86vm
+               x11-libs/pango
+       )"
+RDEPEND="
+       ${COMMON_DEPEND}
+       X? (
+               media-libs/libglvnd[X,abi_x86_32(-)?]
+               x11-libs/libX11[abi_x86_32(-)?]
+               x11-libs/libXext[abi_x86_32(-)?]
+       )"
+DEPEND="
+       ${COMMON_DEPEND}
+       static-libs? (
+               x11-libs/libX11
+               x11-libs/libXext
+       )
+       tools? (
+               media-libs/libglvnd
+               sys-apps/dbus
+               x11-base/xorg-proto
+               x11-libs/libXrandr
+               x11-libs/libXv
+               x11-libs/libvdpau
+       )"
+BDEPEND="
+       sys-devel/m4
+       virtual/pkgconfig"
+
+QA_PREBUILT="opt/bin/* usr/lib*"
+
+PATCHES=(
+       "${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
+       "${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
+       "${FILESDIR}"/nvidia-settings-390.144-desktop.patch
+       "${FILESDIR}"/nvidia-settings-390.144-no-gtk2.patch
+       "${FILESDIR}"/nvidia-settings-390.144-raw-ldflags.patch
+)
+
+pkg_setup() {
+       use driver || return
+
+       local CONFIG_CHECK="
+               PROC_FS
+               ~DRM_KMS_HELPER
+               ~SYSVIPC
+               ~!AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+               ~!LOCKDEP
+               ~!X86_KERNEL_IBT
+               !DEBUG_MUTEXES"
+       local ERROR_DRM_KMS_HELPER="CONFIG_DRM_KMS_HELPER: is not set but 
needed for Xorg auto-detection
+       of drivers (no custom config), and optional nvidia-drm.modeset=1.
+       With 390.xx drivers, also used by a GLX workaround needed for OpenGL.
+       Cannot be directly selected in the kernel's menuconfig, and may need
+       selection of a DRM device even if unused, e.g. CONFIG_DRM_AMDGPU=m or
+       DRM_I915=y, DRM_NOUVEAU=m also acceptable if a module and not built-in."
+       local ERROR_X86_KERNEL_IBT="X86_KERNEL_IBT: is set, be warned the 
modules may not load with it.
+       If run into problems, either unset or pass ibt=off to the kernel."
+
+       kernel_is -ge 5 8 && CONFIG_CHECK+=" X86_PAT" #817764
+
+       MODULE_NAMES="
+               nvidia(video:kernel)
+               nvidia-drm(video:kernel)
+               nvidia-modeset(video:kernel)
+               $(usev !x86 "nvidia-uvm(video:kernel)")"
+
+       linux-mod_pkg_setup
+
+       [[ ${MERGE_TYPE} == binary ]] && return
+
+       BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" 
SYSOUT="${KV_OUT_DIR}"'
+       use x86 && BUILD_PARAMS+=' ARCH=i386'
+       BUILD_TARGETS="modules"
+
+       if linux_chkconfig_present CC_IS_CLANG; then
+               ewarn "Warning: building ${PN} with a clang-built kernel is 
experimental"
+
+               BUILD_PARAMS+=' CC=${CHOST}-clang'
+               if linux_chkconfig_present LD_IS_LLD; then
+                       BUILD_PARAMS+=' LD=ld.lld'
+                       if linux_chkconfig_present LTO_CLANG_THIN; then
+                               # kernel enables cache by default leading to 
sandbox violations
+                               BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= 
LDFLAGS_MODULE=--thinlto-cache-dir='
+                       fi
+               fi
+       fi
+
+       if kernel_is -gt ${NV_KERNEL_MAX/./ }; then
+               ewarn "Kernel ${KV_MAJOR}.${KV_MINOR} is either known to break 
this version of ${PN}"
+               ewarn "or was not tested with it. It is recommended to use one 
of:"
+               ewarn "  <=sys-kernel/gentoo-kernel-${NV_KERNEL_MAX}.x"
+               ewarn "  <=sys-kernel/gentoo-sources-${NV_KERNEL_MAX}.x"
+               ewarn "You are free to try or use /etc/portage/patches, but 
support will"
+               ewarn "not be given and issues wait until NVIDIA releases a 
fixed version"
+               ewarn "(Gentoo will not accept patches for this)."
+               ewarn
+               ewarn "Do _not_ file a bug report if run into issues."
+               ewarn
+       fi
+}
+
+src_prepare() {
+       # make patches usable across versions
+       rm nvidia-modprobe && mv nvidia-modprobe{-${PV},} || die
+       rm nvidia-persistenced && mv nvidia-persistenced{-${PV},} || die
+       rm nvidia-settings && mv nvidia-settings{-${PV},} || die
+       rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
+
+       default
+
+       # prevent detection of incomplete kernel DRM support (bug #603818)
+       sed 's/defined(CONFIG_DRM/defined(CONFIG_DRM_KMS_HELPER/g' \
+               -i kernel/conftest.sh || die
+
+       sed 's/__USER__/nvpd/' \
+               
nvidia-persistenced/init/systemd/nvidia-persistenced.service.template \
+               > "${T}"/nvidia-persistenced.service || die
+
+       sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \
+               nvidia_icd.json.template > nvidia_icd.json || die
+
+       # 390 has legacy glx needing a modified .conf (bug #713546)
+       # directory is not quite right, but kept for any existing custom 
xorg.conf
+       sed "s|@LIBDIR@|${EPREFIX}/usr/$(get_libdir)|" \
+               "${FILESDIR}"/nvidia-drm-outputclass-390.conf > 
nvidia-drm-outputclass.conf || die
+}
+
+src_compile() {
+       tc-export AR CC CXX LD OBJCOPY OBJDUMP
+
+       NV_ARGS=(
+               PREFIX="${EPREFIX}"/usr
+               HOST_CC="$(tc-getBUILD_CC)"
+               HOST_LD="$(tc-getBUILD_LD)"
+               NV_USE_BUNDLED_LIBJANSSON=0
+               NV_VERBOSE=1 DO_STRIP= MANPAGE_GZIP= OUTPUTDIR=out
+       )
+
+       if use driver; then
+               if linux_chkconfig_present GCC_PLUGINS; then
+                       mkdir "${T}"/plugin-test || die
+                       echo "obj-m += test.o" > "${T}"/plugin-test/Kbuild || 
die
+                       > "${T}"/plugin-test/test.c || die
+                       if [[ $(LC_ALL=C make -C "${KV_OUT_DIR}" 
ARCH="$(tc-arch-kernel)" \
+                                       HOSTCC="$(tc-getBUILD_CC)" 
M="${T}"/plugin-test 2>&1) \
+                               =~ "error: incompatible gcc/plugin version" ]]; 
then
+                               ewarn "Warning: detected kernel was built with 
different gcc/plugin versions,"
+                               ewarn "you may need to 'make clean' and rebuild 
your kernel with the current"
+                               ewarn "gcc version (or re-emerge for 
distribution kernels, including kernel-bin)."
+                       fi
+               fi
+
+               linux-mod_src_compile
+       fi
+
+       if use persistenced; then
+               # 390.xx persistenced does not auto-detect libtirpc
+               LIBS=$($(tc-getPKG_CONFIG) --libs libtirpc || die) \
+                       common_cflags=$($(tc-getPKG_CONFIG) --cflags libtirpc 
|| die) \
+                       emake "${NV_ARGS[@]}" -C nvidia-persistenced
+       fi
+
+       emake "${NV_ARGS[@]}" -C nvidia-modprobe
+       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig
+
+       if use tools; then
+               # cflags: avoid noisy logs, only use here and set first to let 
override
+               # ldflags: abi currently needed if LD=ld.lld
+               CFLAGS="-Wno-deprecated-declarations ${CFLAGS}" \
+                       RAW_LDFLAGS="$(get_abi_LDFLAGS) $(raw-ldflags)" \
+                       emake "${NV_ARGS[@]}" -C nvidia-settings
+       elif use static-libs; then
+               emake "${NV_ARGS[@]}" -C nvidia-settings/src build-xnvctrl
+       fi
+}
+
+src_install() {
+       local libdir=$(get_libdir) libdir32=$(ABI=x86 get_libdir)
+
+       NV_ARGS+=( DESTDIR="${D}" LIBDIR="${ED}"/usr/${libdir} )
+
+       local -A paths=(
+               [APPLICATION_PROFILE]=/usr/share/nvidia
+               [CUDA_ICD]=/etc/OpenCL/vendors
+               
[EGL_EXTERNAL_PLATFORM_JSON]=/usr/share/egl/egl_external_platform.d
+               [GLVND_EGL_ICD_JSON]=/usr/share/glvnd/egl_vendor.d
+               [VULKAN_ICD_JSON]=/usr/share/vulkan/icd.d
+               [XORG_OUTPUTCLASS_CONFIG]=/usr/share/X11/xorg.conf.d
+
+               [GLX_MODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules/extensions
+               [GLX_MODULE_SYMLINK]=/usr/${libdir}/extensions/nvidia
+               [XMODULE_SHARED_LIB]=/usr/${libdir}/xorg/modules
+               [XMODULE_SYMLINK]=/usr/${libdir}/xorg/modules
+       )
+
+       local skip_files=(
+               # nvidia_icd(vulkan): skip with -X too as it uses libGLX_nvidia
+               $(usev !X "
+                       libGLX_nvidia libglx
+                       libnvidia-ifr
+                       nvidia_icd.json")
+               libGLX_indirect # non-glvnd unused fallback
+               libnvidia-gtk nvidia-{settings,xconfig} # built from source
+               libnvidia-egl-wayland 10_nvidia_wayland # gui-libs/egl-wayland
+       )
+       local skip_modules=(
+               $(usev !X "nvfbc vdpau xdriver")
+               installer nvpd # handled separately / built from source
+       )
+       local skip_types=(
+               GLVND_LIB GLVND_SYMLINK EGL_CLIENT.\* GLX_CLIENT.\* # 
media-libs/libglvnd
+               OPENCL_WRAPPER.\* # virtual/opencl
+               DOCUMENTATION DOT_DESKTOP # handled separately
+               XMODULE_NEWSYM # use xorg's libwfb.so, nvidia also keeps it if 
it exists
+               .\*_SRC DKMS_CONF LIBGL_LA OPENGL_HEADER # unused
+       )
+
+       local DOCS=(
+               README.txt NVIDIA_Changelog
+               nvidia-settings/doc/{FRAMELOCK,NV-CONTROL-API}.txt
+       )
+       local HTML_DOCS=( html/. )
+       einstalldocs
+
+       local DISABLE_AUTOFORMATTING=yes
+       local DOC_CONTENTS="\
+Trusted users should be in the 'video' group to use NVIDIA devices.
+You can add yourself by using: gpasswd -a my-user video\
+$(usev driver "
+
+Like all out-of-tree kernel modules, it is necessary to rebuild
+${PN} after upgrading or rebuilding the Linux kernel
+by for example running \`emerge @module-rebuild\`. Alternatively,
+if using a distribution kernel (sys-kernel/gentoo-kernel{,-bin}),
+this can be automated by setting USE=dist-kernel globally.
+
+Loaded kernel modules also must not mismatch with the installed
+${PN} version (excluding -r revision), meaning should
+ensure \`eselect kernel list\` points to the kernel that will be
+booted before building and preferably reboot after upgrading
+${PN} (the ebuild will emit a warning if mismatching).
+
+See '${EPREFIX}/etc/modprobe.d/nvidia.conf' for modules options.")\
+$(use amd64 && usev !abi_x86_32 "
+
+Note that without USE=abi_x86_32 on ${PN}, 32bit applications
+(typically using wine / steam) will not be able to use GPU acceleration.")\
+$(usev X "
+
+390.xx libglvnd support is partial and requires different Xorg modules
+for working OpenGL/GLX. If using the default Xorg configuration these
+should be used automatically, otherwise manually add the ModulePath
+from: 
'${EPREFIX}/${paths[XORG_OUTPUTCLASS_CONFIG]#/}/nvidia-drm-outputclass.conf'")\
+$(usev x86 "
+
+Note that NVIDIA is no longer offering support for the unified memory
+module (nvidia-uvm) on x86 (32bit), as such the module is missing.
+This means OpenCL/CUDA (and related, like nvenc) cannot be used.
+Other functions, like OpenGL, will continue to work.")
+
+Support from NVIDIA for 390.xx will end in December 2022, how long
+Gentoo will be able to reasonably support it beyond that is unknown.
+If wish to continue using this hardware, should consider switching
+to the Nouveau open source driver.
+https://nvidia.custhelp.com/app/answers/detail/a_id/3142/
+
+For general information on using ${PN}, please see:
+https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers";
+       readme.gentoo_create_doc
+
+       if use driver; then
+               linux-mod_src_install
+
+               insinto /etc/modprobe.d
+               newins "${FILESDIR}"/nvidia-390.conf nvidia.conf
+       fi
+
+       emake "${NV_ARGS[@]}" -C nvidia-modprobe install
+       fowners :video /usr/bin/nvidia-modprobe #505092
+       fperms 4710 /usr/bin/nvidia-modprobe
+
+       if use persistenced; then
+               emake "${NV_ARGS[@]}" -C nvidia-persistenced install
+               newconfd "${FILESDIR}"/nvidia-persistenced.confd 
nvidia-persistenced
+               newinitd "${FILESDIR}"/nvidia-persistenced.initd 
nvidia-persistenced
+               systemd_dounit "${T}"/nvidia-persistenced.service
+       fi
+
+       if use tools; then
+               emake "${NV_ARGS[@]}" -C nvidia-settings install
+
+               doicon nvidia-settings/doc/nvidia-settings.png
+               domenu nvidia-settings/doc/nvidia-settings.desktop
+
+               exeinto /etc/X11/xinit/xinitrc.d
+               newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+       fi
+
+       if use static-libs; then
+               dolib.a nvidia-settings/src/libXNVCtrl/libXNVCtrl.a
+
+               insinto /usr/include/NVCtrl
+               doins nvidia-settings/src/libXNVCtrl/NVCtrl{Lib,}.h
+       fi
+
+       use X && emake "${NV_ARGS[@]}" -C nvidia-xconfig install
+
+       # mimic nvidia-installer by reading .manifest to install files
+       # 0:file 1:perms 2:type 3+:subtype/arguments -:module
+       local m into
+       while IFS=' ' read -ra m; do
+               ! [[ ${#m[@]} -ge 2 && ${m[-1]} =~ MODULE: ]] ||
+                       [[ " ${m[0]##*/}" =~ ^(\ ${skip_files[*]/%/.*|\\} )$ ]] 
||
+                       [[ " ${m[2]}" =~ ^(\ ${skip_types[*]/%/|\\} )$ ]] ||
+                       has ${m[-1]#MODULE:} "${skip_modules[@]}" && continue
+
+               case ${m[2]} in
+                       MANPAGE)
+                               gzip -dc ${m[0]} | newman - ${m[0]%.gz}; assert
+                               continue
+                       ;;
+                       GLX_MODULE_SYMLINK|XMODULE_NEWSYM)
+                               # messy symlinks for non-glvnd xorg modules 
overrides put
+                               # in a different directory to avoid collisions 
(390-only)
+                               m[4]=../../xorg/modules/${m[3]#/}${m[4]}
+                               m[3]=/
+                       ;;
+                       TLS_LIB) [[ ${m[4]} == CLASSIC ]] && continue;; # 
segfaults (bug #785289)
+                       VDPAU_SYMLINK) m[4]=vdpau/; m[5]=${m[5]#vdpau/};; # .so 
to vdpau/
+                       VULKAN_ICD_JSON) m[0]=${m[0]%.template};;
+               esac
+
+               if [[ -v paths[${m[2]}] ]]; then
+                       into=${paths[${m[2]}]}
+               elif [[ ${m[2]} =~ _BINARY$ ]]; then
+                       into=/opt/bin
+               elif [[ ${m[3]} == COMPAT32 ]]; then
+                       use abi_x86_32 || continue
+                       into=/usr/${libdir32}
+               elif [[ ${m[2]} =~ _LIB$|_SYMLINK$ ]]; then
+                       into=/usr/${libdir}
+               else
+                       die "No known installation path for ${m[0]}"
+               fi
+               [[ ${m[3]: -2} == ?/ ]] && into+=/${m[3]%/}
+               [[ ${m[4]: -2} == ?/ ]] && into+=/${m[4]%/}
+
+               if [[ ${m[2]} =~ _SYMLINK$|_NEWSYM$ ]]; then
+                       [[ ${m[4]: -1} == / ]] && m[4]=${m[5]}
+                       dosym ${m[4]} ${into}/${m[0]}
+                       continue
+               fi
+
+               printf -v m[1] %o $((m[1] | 0200)) # 444->644
+               insopts -m${m[1]}
+               insinto ${into}
+               doins ${m[0]}
+       done < .manifest || die
+
+       # MODULE:installer non-skipped extras
+       dolib.so libnvidia-cfg.so.${PV}
+       dosym libnvidia-cfg.so.${PV} /usr/${libdir}/libnvidia-cfg.so.1
+       dosym libnvidia-cfg.so.${PV} /usr/${libdir}/libnvidia-cfg.so
+
+       dobin nvidia-bug-report.sh
+
+       # symlink non-versioned so nvidia-settings can use it even if 
misdetected
+       dosym nvidia-application-profiles-${PV}-key-documentation \
+               
${paths[APPLICATION_PROFILE]}/nvidia-application-profiles-key-documentation
+}
+
+pkg_preinst() {
+       use driver || return
+       linux-mod_pkg_preinst
+
+       # set video group id based on live system (bug #491414)
+       local g=$(egetent group video | cut -d: -f3)
+       [[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got 
'${g}')"
+       sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die
+}
+
+pkg_postinst() {
+       linux-mod_pkg_postinst
+
+       readme.gentoo_print_elog
+
+       if [[ -r /proc/driver/nvidia/version &&
+               $(</proc/driver/nvidia/version) != *"  ${PV}  "* ]]; then
+               ewarn "Currently loaded NVIDIA modules do not match the newly 
installed"
+               ewarn "libraries and may prevent launching GPU-accelerated 
applications."
+               use driver && ewarn "The easiest way to fix this is usually to 
reboot."
+       fi
+}

Reply via email to