commit:     93b9013d9c911a59de1702e3761e61c167ddab35
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 11:33:03 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 11:33:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b9013d

x11-drivers/nvidia-drivers: Version bump.

Package-Manager: portage-2.2.26

 x11-drivers/nvidia-drivers/Manifest                |   4 +
 .../nvidia-drivers/nvidia-drivers-361.18.ebuild    | 492 +++++++++++++++++++++
 2 files changed, 496 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index fbe7cdc..0996a37 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -7,6 +7,7 @@ DIST NVIDIA-FreeBSD-x86-352.63.tar.gz 55368686 SHA256 
1d290a9d583b6e99addb4888c2
 DIST NVIDIA-FreeBSD-x86-355.11.tar.gz 56832647 SHA256 
3d4d5d8fcf558a8f5f1a88846161b1a89bd7fc66c0268b40613c7e3457f5ce7b SHA512 
744d9b8c48b82bac0bfeea5e8b2b2bbaa0e6a183cbd1f5d4f782fa7b21a6f6c5b252e556a8b2161c3b5d43938ef8fabf6cb36f995ee823fbf792f3c9a92b87e1
 WHIRLPOOL 
43bceb8e8d3b00789cf2c8163a055b1d2405ef93e471fda4c4e2146093289891557f4ec8debfe6bca89ad6ed6dc2e389f1d3060759a71e8949df343bc31b85b9
 DIST NVIDIA-FreeBSD-x86-358.16.tar.gz 58548165 SHA256 
2257d9a2b3661d024be0864e2fe192de34fdf8e206073930541e0fa6f232016e SHA512 
e1d84c2cc3473253b31aa3df8e2ad7418da5789e31d6f71f07e6bf5e712ffcb6417cf8931c16e5e5a19d0f4cdaebf229e4edbee53d5613bea1ff6b4e4c6657cc
 WHIRLPOOL 
15b760556d978c9e82b063c1135089e1b1222460285ab2c40d450cf26820e701ff5d7ebdd04815f80a68a07eea0e622fa621b8369883f4168af5b45d4edde62d
 DIST NVIDIA-FreeBSD-x86-361.16.tar.gz 64863560 SHA256 
cfa2f74512bc71d5355f8d95e2ac060ae8655fb155824c04ce887258f19eb6d4 SHA512 
e6b4d1889ca21ab5984a94d4dda8ad0c8a0eaa2fa4f747457f1764a921cf18db5a8e3397eaa164d551fb1bdd2b691924a63a1e01cde0551ad0bc57edf4eae3ee
 WHIRLPOOL 
6cd0bfc14dcfb657d447965ec65b2029233564426be612ba268c666ac313a1b690c6e7c9cbddf13868ce7d1dde8496107dd3d13e5dc20b54a0042eeb2dd3e2c0
+DIST NVIDIA-FreeBSD-x86-361.18.tar.gz 64866939 SHA256 
93cdf053e2e0cf9dcd0e888c41ea95cedd9c3521e0ab14d9e4826ba1245aef35 SHA512 
aa0e23253330496e076a23335743ab16f0996406c7e9b0991d3f0cbe834be6a66b6a1d69fc5f92d7c29bbc748ec1d4ee4d161f130daea3fa85cb15c1f9411a86
 WHIRLPOOL 
c0387f0780b0717503c9ab15448229781eb9ef4f57ee0b4df3b42eb3f48c53ebf1a7b1d14102b959fa6a5db05702b0f65d359f9b42734fcaa9fde52d7647081c
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 
18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 
42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c
 WHIRLPOOL 
f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.131.tar.gz 35812363 SHA256 
e10aa34f4aeb6981c0bc6762f37e6ad57de52b45c7322d0caef9781c1a43858a SHA512 
0df69d11c79cfd66f40f5adf091f9c3ad494b89fbe9200a1a01fef8cb2d2591ffdeb703d82a263e050384d39ef81af3a717ac24716f96b1fd8386d1758bcf45b
 WHIRLPOOL 
a7e01ac4646d52229efb1d22df9b4db98bfd6bc30c79fc4c65273001b1cd09c4db823a0141a060f8c53926ae23a33fe66e27aec805879228d64bf3f45aa66bcd
 DIST NVIDIA-FreeBSD-x86_64-340.93.tar.gz 60215584 SHA256 
07208f6a832c2da8748b1c4f8b5ce42a7b617f2ee1ac59155fecaff952c30988 SHA512 
c480df2f36c3d6eba53af9c3070e1561ae7c56cd5d31fb531dcb6897ca02d0d205c0ce99597304ea36b7b75b173e31a9a4c07ddd143ad13884aff0a7c3479bce
 WHIRLPOOL 
c1b28898ffe733961bdb622e8b430715c74871cfaab0348a9e5990df5a92676e8fb8c199ea1f1a06fa6c6ded65877b987b802a7a9ea0b7023cbaa62fb52eda01
@@ -16,6 +17,7 @@ DIST NVIDIA-FreeBSD-x86_64-352.63.tar.gz 57026971 SHA256 
ac2e3926df50f6c0a020b35
 DIST NVIDIA-FreeBSD-x86_64-355.11.tar.gz 54031364 SHA256 
3637a879905bb541bf02f9bcdfe37c242a52ec6071671a0ba33581efdce1504e SHA512 
84add7d90c7f45d19d736ee70c1c4a6434be1c512bafa29cbbf9221e99a31fc383971696dce99da5a77a171eb3537c98cfec7005ff061411ac9c310fa219c906
 WHIRLPOOL 
d8ade5d63c3ef78fa92f9dc07934eed8fdd4ead1e40f1820ad95feb166264a95a800879e1fc6374bf2deef419b0838b4864796d9f81a81110d06ccd9b65c459d
 DIST NVIDIA-FreeBSD-x86_64-358.16.tar.gz 55338634 SHA256 
29b62c266bb96604e82c5a514aebea86b65057fa59ba37f91bd01cd870a0725c SHA512 
2e5aef35d5c4aa605ebe18a23ab132fe373c9b87a915ada005ecd28d75a476d6ac9d978394f8c63123f98a408dcc97d624b5deda5f242faea7304fc8ddf76d0d
 WHIRLPOOL 
bc8ee78214209fdeb0c6fc196cbc3acc244c777df8a83b5a5489959a73b744ecc125d7a9be6ca2f08d43b6a080898b1090eca45e627c96210dcfeb6207512c8e
 DIST NVIDIA-FreeBSD-x86_64-361.16.tar.gz 61655470 SHA256 
8c6945c7cae776c4fa42c13e8d2df0bbbe43c46f21f2514335027235c3bc77e7 SHA512 
5e12ca2ca45d6d44d345a9daa28c98585c377fea6fd85bd059865aa98b5aebea0453bd48e72c8cad2804ddd4092df7ca5b565198250051da68e6f67c45b944d4
 WHIRLPOOL 
0f8223e244caed527d14274340597b3abd03a99b2daa0572c2e9b3b6403ce745ee8abb7909bbfe1d85729f879f2fc4481d83d287ff974d313d2240ef738416c9
+DIST NVIDIA-FreeBSD-x86_64-361.18.tar.gz 61651804 SHA256 
83fe66f611ff2ef25fa9593ffc7fa49ef1c96597a263138918441acef3d4d066 SHA512 
fe27a9eb3c7b3488fc2ad7b13a4477a4d5eb1039b6d13c584bd558f9a0de1f6b8af7db425aa78d1700d113486246f136b65e72b8f22731ac0a76537ff3e51cf1
 WHIRLPOOL 
08bff8b3dd4961c77dcd10d02e38a5cd013a77e9a791520453db7151d7f4facee69359910dac8abdb8016365ae8f423224995cb2f95c84282a8f1f35f7e4ca81
 DIST NVIDIA-Linux-x86-173.14.39-pkg0.run 15134997 SHA256 
a09935f37121ed3db8ae3da63a0d8e9d4348a19c859811c9fe44d6ce8e3eab23 SHA512 
e24e15ccec725d3cbca502c2b77061776a81ef92917a950adec4ff6bdc34f10903aa654433177ea74be0dade4af81c5380d5710d375a5ea445940d06154bde93
 WHIRLPOOL 
fce3d8e4f6cdf698f5a057514b6fe220bb1011025bdce5bd4cf0e424fb4d306d38251b6726bda03f290ea8137d5a95ed418cf8751722879f9042462abd9181b6
 DIST NVIDIA-Linux-x86-304.131.run 40893199 SHA256 
d2554bb6f7867e7762d0ecedcac5bde7de0634e43b952bf466323ea8b4032da8 SHA512 
3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e
 WHIRLPOOL 
88e9cc0270a4fc64ed8475a217c7c8c50e6ea21fe14b5b5beb16f494bd62bf5ada2f47e26e5380dd3d0bc678091e29f0e26937eef1ee3c7bdc5805153201bae3
 DIST NVIDIA-Linux-x86-340.93.run 38703394 SHA256 
4a81c158302c595e1e72b5a1812eb3c67c8cf584ca74b1bc24163dad5289d612 SHA512 
7507553bd4b11cac2cd882cd8afba59e773f58a26e67ee7e781c488be963a4f1eb54dcd72b40b29d33dd81c74d4748a76c1632b2c8ea08b524b4318c18b5dfe5
 WHIRLPOOL 
242190999da74f2fe4bfe4b223f43dec6ec73d97afd1e84e2c78c5fd5616d9814b647067ddf3f591ea8064d29234491de1c6f87b442e240d2aac4a1e598aefad
@@ -25,6 +27,7 @@ DIST NVIDIA-Linux-x86-352.63.run 42983438 SHA256 
484442dd5163c3249e86736b1e297cb
 DIST NVIDIA-Linux-x86-355.11.run 43569515 SHA256 
94ce6b879581b931b84d83a9111040b9a5aa9306b012b4380cd93f6ffede3066 SHA512 
450caea472c5e1b3d7098adba28d18c1221cf809c6bd0071466ff2a946dd0eca6555475f5f6bc044fb19a21c8939b1020357d4aeb0ce47d0edfcda071a66fd46
 WHIRLPOOL 
3a95e83ab3f46e64150caf1489aa3173aae69919bf432eabcdd0501de8bcdee5402cdb33e149a4d5d429ccb85e4b4af9b30bec5516ad7b7f091ae42f6093d26f
 DIST NVIDIA-Linux-x86-358.16.run 43972195 SHA256 
d3a2842cbfb1163e20c658fbfaf5a235d5c9f035cd2d657f15df8a14b3fe80b1 SHA512 
a5d37fb56a59b9958f6c34139250baf13a1c42ffc70f7deb19ffaac1ae6c2ce80b96649c5797d60754050d75792d14141cd5ebc8820bb73ee4aad4aa6d6c5b20
 WHIRLPOOL 
336e56827619ad53622c3fbf9fb3e9895a08b8500b81f3830514a34913180e3dc5c6f170f14675fa628e2c9658a084d7f9c45f47213d28335ecfee53c8110907
 DIST NVIDIA-Linux-x86-361.16.run 49376707 SHA256 
14f539531a412fbfe73d6eb57e246fbd9d87054f71167a63ad5cbd7b62e3bb8f SHA512 
2cf5c8313a55badda6a1e820c7a571f794303bf881ad2b5dda996d4db6d6469d96e78fd7b854fd274e5943a49f3b7d3973b07f7f7d0d73ddbf03d22ae40e5d7c
 WHIRLPOOL 
7ec6c79d82a9d7efdb5901907231ba6c7995ce15483fb1b0956fcb7f575ba568b92fc17ec6712d2ca710be79cd3d9e78fef845da17b3f15446047142289e3ba6
+DIST NVIDIA-Linux-x86-361.18.run 48780711 SHA256 
45171c24e0011d0e062ba487bd9abef3797752e29ee4cbe665af8d9ccacfd6d8 SHA512 
9a41fc6319467cc947df739e7b596d2e72dc7343ee4cce810146166356081406bc3df08d0b649209ea569e0e7faae30fc2d9da22293916b82fec03f66387f9c5
 WHIRLPOOL 
31eb74835dc27c1dd999e53ac24fbe29e76c6d91e828d60b923a1adce9f8451d162f2fc85f5c279d9916509ceb18c936b9a43c30b66485938d8d5414f9c6b46b
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 
51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 
bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7
 WHIRLPOOL 
6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.39-pkg2.run 21100833 SHA256 
15a953666d5681ba54c97498b578ffd286a1dc96d605f3b02110f3f99813100e SHA512 
a65cd496e6ed57f771c3d99f37f616a1242d97844f6faef7a807825ad899c0e536a99fde397020839f0857883b934032f9491024f3047a6b06d3eea1f5d77713
 WHIRLPOOL 
dc5f243b7d1de7e2d1b7f005e018a2940d63335b11a7c83c234b348b7a1839e9131169d2ea928bd8c2f549a4535149b03e16e6c94d59dfa745f7f904ff790a45
 DIST NVIDIA-Linux-x86_64-304.131.run 69415084 SHA256 
74b7ec1c31dac03ee7c3e04612cadb9cbaa01ef4c796c27a0a649f7d32dccd0b SHA512 
ddfa1f23600821dcae17ddb735b615d67504c4e276d9b41813e0f8d7690fbdf48f79644ee4c9e5449ce22a31460734cf325fc83975e0b48a0379a85cd4ef747d
 WHIRLPOOL 
fc08c2337a1b80b0444dbc914f7d17441995e4965c435028194050df9f5ec1606cdfb5bf11e56f79a736e04cf0755b296017fe79629c5ded18a72093b8689bce
@@ -36,4 +39,5 @@ DIST NVIDIA-Linux-x86_64-352.68.run 77591852 SHA256 
104ad0b5e52fea5a1c181dee977a
 DIST NVIDIA-Linux-x86_64-355.11.run 76490009 SHA256 
a59b425381add9d9058dc2d987bf3087ab59c43224b5eb04c3f273f5886451ed SHA512 
bfc7ab7741183408aa0226dc29176c8ffe08566fbea7cebf78f4aa30627dc27ddf90bb82951c99006b34bc481be15712b4f5867ef543a32bfe3fe81a8e6ddeae
 WHIRLPOOL 
bb5d3397a855a53c2cd7e48056564085b906550f856207932e4670fef995030a3a7bcc0a9b97fee2e60aaff9b41c4a954afc57585441f5dec92c795358da810a
 DIST NVIDIA-Linux-x86_64-358.16.run 77353969 SHA256 
a942cdb29ed715ff1ce25beb06b6c2490126b98ef8bee5d9973967b557596bf2 SHA512 
4ae43f5e8c311d6c97eb89b02504bf52e3a947c71662f30641988a78eb9fe083370124aeee3b89db74f8ee50f454338db98dc7abeb35a242ba5729fefccead77
 WHIRLPOOL 
3dd0dcd4b455fcac12d55f40cfb8db0536af82d90c32b8471528b44a9fa1b3f3706ac26558d7395f82649c37550fded17b48d75d5584b3a41390c94bb1135c48
 DIST NVIDIA-Linux-x86_64-361.16.run 86500803 SHA256 
036d66c2c59adc8bb5c298ab102bed9b1cc690b4244eefbbd7a7e0ca5e6ab4c7 SHA512 
3a4fdc1ff4cfa1b3eb09b6bb21e175b997b93de450ce2f08870af753151a988dcbe481c0bc20bd365fddff4cdb82b2cead232725d72feac9409654002cf4296f
 WHIRLPOOL 
f8b6a136fb47a32c8d2359e816cbd3a3e5cc2cda7af20772e63c5c47b339ea87a256e84d637cdf0ec98a69b89cdd412f010cc47e90c137b809a9e1b40f1a6cc7
+DIST NVIDIA-Linux-x86_64-361.18.run 86447500 SHA256 
94cccc3ff10ee9544f60bf1d32d04dddabc5103880b57895ea60e1167b89a155 SHA512 
d307b50226b145761de69892c51af3cd4498b91f9c56b5d5bf7b1f4f00cc073af586008cb060a16c036426240853ed30d244e63d3f727eadf39338736a5c0b02
 WHIRLPOOL 
87e03bfe694f708d57fb548c01d853bbae1335a696bce225ce997000387189b55c27644922a051e9a50dfa94ec917bda14b6ed4b76f345c8adc8d8f54aebff97
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 
ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 
04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563
 WHIRLPOOL 
0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-361.18.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18.ebuild
new file mode 100644
index 0000000..b5a38b0
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-361.18.ebuild
@@ -0,0 +1,492 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+       portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/";
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA Accelerated Graphics Driver"
+HOMEPAGE="http://www.nvidia.com/";
+SRC_URI="
+       amd64-fbsd? ( 
${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+       amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+       x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+       x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+IUSE="acpi +driver multilib kernel_FreeBSD kernel_linux +kms pax_kernel +tools 
gtk2 gtk3 +X uvm"
+REQUIRED_USE="
+       tools? ( X || ( gtk2 gtk3 ) )
+"
+
+COMMON="
+       app-eselect/eselect-opencl
+       gtk3? ( x11-libs/cairo )
+       kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+       X? (
+               >=app-eselect/eselect-opengl-1.0.9
+               app-misc/pax-utils
+       )
+"
+DEPEND="
+       ${COMMON}
+       app-arch/xz-utils
+       kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+       ${COMMON}
+       acpi? ( sys-power/acpid )
+       tools? (
+               dev-libs/atk
+               dev-libs/glib:2
+               x11-libs/gdk-pixbuf
+               gtk2? ( >=x11-libs/gtk+-2.4:2 )
+               gtk3? ( x11-libs/gtk+:3 )
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/pango[X]
+       )
+       X? (
+               <x11-base/xorg-server-1.17.99:=
+               >=x11-libs/libvdpau-0.3-r1
+               multilib? (
+                       >=x11-libs/libX11-1.6.2[abi_x86_32]
+                       >=x11-libs/libXext-1.3.2[abi_x86_32]
+               )
+       )
+"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+       if use amd64 && has_multilib_profile && \
+               [ "${DEFAULT_ABI}" != "amd64" ]; then
+               eerror "This ebuild doesn't currently support changing your 
default ABI"
+               die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+       fi
+
+       if use kernel_linux && kernel_is ge 4 5; then
+               ewarn "Gentoo supports kernels which are supported by NVIDIA"
+               ewarn "which are limited to the following kernels:"
+               ewarn "<sys-kernel/gentoo-sources-4.5"
+               ewarn "<sys-kernel/vanilla-sources-4.5"
+               ewarn ""
+               ewarn "You are free to utilize epatch_user to provide whatever"
+               ewarn "support you feel is appropriate, but will not receive"
+               ewarn "support as a result of those changes."
+               ewarn ""
+               ewarn "Do not file a bug report about this."
+               ewarn ""
+       fi
+
+       # Since Nvidia ships many different series of drivers, we need to give 
the user
+       # some kind of guidance as to what version they should install. This 
tries
+       # to point the user in the right direction but can't be perfect. check
+       # nvidia-driver.eclass
+       nvidia-driver-check-warning
+
+       # Kernel features/options to check for
+       CONFIG_CHECK="~ZONE_DMA ~MTRR ~SYSVIPC ~!LOCKDEP"
+       use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+
+       # Now do the above checks
+       use kernel_linux && check_extra_config
+}
+
+pkg_setup() {
+       # try to turn off distcc and ccache for people that have a problem with 
it
+       export DISTCC_DISABLE=1
+       export CCACHE_DISABLE=1
+
+       if use driver && use kernel_linux; then
+               MODULE_NAMES="nvidia(video:${S}/kernel)"
+               use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+               use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel)"
+
+               # This needs to run after MODULE_NAMES (so that the eclass 
checks
+               # whether the kernel supports loadable modules) but before 
BUILD_PARAMS
+               # is set (so that KV_DIR is populated).
+               linux-mod_pkg_setup
+
+               BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+               SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+               # linux-mod_src_compile calls set_arch_to_kernel, which
+               # sets the ARCH to x86 but NVIDIA's wrapping Makefile
+               # expects x86_64 or i386 and then converts it to x86
+               # later on in the build process
+               BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+       fi
+
+       if use kernel_linux && kernel_is lt 2 6 9; then
+               eerror "You must build this against 2.6.9 or higher kernels."
+       fi
+
+       # set variables to where files are in the package structure
+       if use kernel_FreeBSD; then
+               use x86-fbsd   && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+               use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+               NV_DOC="${S}/doc"
+               NV_OBJ="${S}/obj"
+               NV_SRC="${S}/src"
+               NV_MAN="${S}/x11/man"
+               NV_X11="${S}/obj"
+               NV_SOVER=1
+       elif use kernel_linux; then
+               NV_DOC="${S}"
+               NV_OBJ="${S}"
+               NV_SRC="${S}/kernel"
+               NV_MAN="${S}"
+               NV_X11="${S}"
+               NV_SOVER=${PV}
+       else
+               die "Could not determine proper NVIDIA package"
+       fi
+}
+
+src_prepare() {
+       if use pax_kernel; then
+               ewarn "Using PAX patches is not supported. You will be asked to"
+               ewarn "use a standard kernel should you have issues. Should you"
+               ewarn "need support with these patches, contact the PaX team."
+               epatch "${FILESDIR}"/${PN}-355.06-pax.patch
+       fi
+
+       # Allow user patches so they can support RC kernels and whatever else
+       epatch_user
+}
+
+src_compile() {
+       # This is already the default on Linux, as there's no toplevel 
Makefile, but
+       # on FreeBSD there's one and triggers the kernel module build, as we 
install
+       # it by itself, pass this.
+
+       cd "${NV_SRC}"
+       if use kernel_FreeBSD; then
+               MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake 
CC="$(tc-getCC)" \
+                       LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+       elif use driver && use kernel_linux; then
+               MAKEOPTS=-j1
+               linux-mod_src_compile
+       fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+       # Full path to library
+       nv_LIB="${1}"
+
+       # SOVER to use
+       nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+       # Where to install
+       nv_DEST="${2}"
+
+       # Get just the library name
+       nv_LIBNAME=$(basename "${nv_LIB}")
+
+       if [[ "${nv_DEST}" ]]; then
+               exeinto ${nv_DEST}
+               action="doexe"
+       else
+               nv_DEST="/usr/$(get_libdir)"
+               action="dolib.so"
+       fi
+
+       # Install the library
+       ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+       # If the library has a SONAME and SONAME does not match the library 
name,
+       # then we need to create a symlink
+       if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+               dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \
+                       || die "failed to create ${nv_DEST}/${nv_SOVER} symlink"
+       fi
+
+       dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \
+               || die "failed to create ${nv_LIBNAME/.so*/.so} symlink"
+}
+
+src_install() {
+       if use driver && use kernel_linux; then
+               linux-mod_src_install
+
+               # Add the aliases
+               # This file is tweaked with the appropriate video group in
+               # pkg_preinst, see bug #491414
+               insinto /etc/modprobe.d
+               newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+               doins "${FILESDIR}"/nvidia-rmmod.conf
+
+               # Ensures that our device nodes are created when not using X
+               exeinto "$(get_udevdir)"
+               newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+               udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+       elif use kernel_FreeBSD; then
+               if use x86-fbsd; then
+                       insinto /boot/modules
+                       doins "${S}/src/nvidia.kld"
+               fi
+
+               exeinto /boot/modules
+               doexe "${S}/src/nvidia.ko"
+       fi
+
+       # NVIDIA kernel <-> userspace driver config lib
+       donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+       # NVIDIA framebuffer capture library
+       donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+       # NVIDIA video encode/decode <-> CUDA
+       if use kernel_linux; then
+               donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+               donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+       fi
+
+       if use X; then
+               # Xorg DDX driver
+               insinto /usr/$(get_libdir)/xorg/modules/drivers
+               doins ${NV_X11}/nvidia_drv.so
+
+               # Xorg GLX driver
+               donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+                       /usr/$(get_libdir)/opengl/nvidia/extensions
+
+               # Xorg nvidia.conf
+               if has_version '>=x11-base/xorg-server-1.16'; then
+                       insinto /usr/share/X11/xorg.conf.d
+                       newins {,50-}nvidia-drm-outputclass.conf
+               fi
+       fi
+
+       # OpenCL ICD for NVIDIA
+       if use kernel_linux; then
+               insinto /etc/OpenCL/vendors
+               doins ${NV_OBJ}/nvidia.icd
+       fi
+
+       # Documentation
+       dohtml ${NV_DOC}/html/*
+       if use kernel_FreeBSD; then
+               dodoc "${NV_DOC}/README"
+               use X && doman "${NV_MAN}/nvidia-xconfig.1"
+               use tools && doman "${NV_MAN}/nvidia-settings.1"
+       else
+               # Docs
+               newdoc "${NV_DOC}/README.txt" README
+               dodoc "${NV_DOC}/NVIDIA_Changelog"
+               doman "${NV_MAN}/nvidia-smi.1.gz"
+               use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+               use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+               doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+       fi
+
+       # Helper Apps
+       exeinto /opt/bin/
+
+       if use X; then
+               doexe ${NV_OBJ}/nvidia-xconfig
+       fi
+
+       if use kernel_linux; then
+               doexe ${NV_OBJ}/nvidia-cuda-mps-control
+               doexe ${NV_OBJ}/nvidia-cuda-mps-server
+               doexe ${NV_OBJ}/nvidia-debugdump
+               doexe ${NV_OBJ}/nvidia-persistenced
+               doexe ${NV_OBJ}/nvidia-smi
+
+               # install nvidia-modprobe setuid and symlink in /usr/bin (bug 
#505092)
+               doexe ${NV_OBJ}/nvidia-modprobe
+               fowners root:video /opt/bin/nvidia-modprobe
+               fperms 4710 /opt/bin/nvidia-modprobe
+               dosym /{opt,usr}/bin/nvidia-modprobe
+
+               doman nvidia-cuda-mps-control.1.gz
+               doman nvidia-modprobe.1.gz
+               doman nvidia-persistenced.1.gz
+               newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+               newconfd "${FILESDIR}/nvidia-persistenced.conf" 
nvidia-persistenced
+               newinitd "${FILESDIR}/nvidia-persistenced.init" 
nvidia-persistenced
+       fi
+
+       if use tools; then
+               doexe ${NV_OBJ}/nvidia-settings
+               use gtk2 && donvidia libnvidia-gtk2.so.${PV}
+               use gtk3 && donvidia libnvidia-gtk3.so.${PV}
+               insinto /usr/share/nvidia/
+               doins nvidia-application-profiles-${PV}-key-documentation
+               insinto /etc/nvidia
+               newins nvidia-application-profiles-${PV}-rc 
nvidia-application-profiles-rc
+       fi
+
+       dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+       # Desktop entries for nvidia-settings
+       if use tools; then
+               # There is no icon in the FreeBSD tarball.
+               use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png 
${PN}-settings.png
+               domenu "${FILESDIR}"/${PN}-settings.desktop
+               exeinto /etc/X11/xinit/xinitrc.d
+               doexe "${FILESDIR}"/95-nvidia-settings
+       fi
+
+       #doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+       if has_multilib_profile && use multilib; then
+               local OABI=${ABI}
+               for ABI in $(get_install_abis); do
+                       src_install-libs
+               done
+               ABI=${OABI}
+               unset OABI
+       else
+               src_install-libs
+       fi
+
+       is_final_abi || die "failed to iterate through all ABIs"
+
+       readme.gentoo_create_doc
+}
+
+src_install-libs() {
+       local inslibdir=$(get_libdir)
+       local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+       local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+       local libdir=${NV_OBJ}
+
+       if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; 
then
+               libdir=${NV_OBJ}/32
+       fi
+
+       if use X; then
+               NV_GLX_LIBRARIES=(
+                       "libEGL.so.1 ${GL_ROOT}"
+                       "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+                       "libGL.so.1 ${GL_ROOT}"
+                       "libGLESv1_CM.so.1 ${GL_ROOT}"
+                       "libGLESv2.so.2 ${GL_ROOT}"
+                       "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+                       "libGLX.so.0 ${GL_ROOT}"
+                       "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+                       "libGLdispatch.so.0 ${GL_ROOT}"
+                       "libOpenCL.so.1.0.0 ${CL_ROOT}"
+                       "libOpenGL.so.0 ${GL_ROOT}"
+                       "libcuda.so.${NV_SOVER}"
+                       "libnvcuvid.so.${NV_SOVER}"
+                       "libnvidia-compiler.so.${NV_SOVER}"
+                       "libnvidia-eglcore.so.${NV_SOVER}"
+                       "libnvidia-encode.so.${NV_SOVER}"
+                       "libnvidia-fatbinaryloader.so.${NV_SOVER}"
+                       "libnvidia-fbc.so.${NV_SOVER}"
+                       "libnvidia-glcore.so.${NV_SOVER}"
+                       "libnvidia-glsi.so.${NV_SOVER}"
+                       "libnvidia-ifr.so.${NV_SOVER}"
+                       "libnvidia-opencl.so.${NV_SOVER}"
+                       "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+                       "libvdpau_nvidia.so.${NV_SOVER}"
+               )
+
+               if use kernel_linux && has_multilib_profile && [[ ${ABI} == 
"amd64" ]];
+               then
+                       NV_GLX_LIBRARIES+=( "libnvidia-wfb.so.${NV_SOVER}" )
+               fi
+
+               if use kernel_FreeBSD; then
+                       NV_GLX_LIBRARIES+=( "libnvidia-tls.so.${NV_SOVER}" )
+               fi
+
+               if use kernel_linux; then
+                       NV_GLX_LIBRARIES+=(
+                               "libnvidia-ml.so.${NV_SOVER}"
+                               "tls/libnvidia-tls.so.${NV_SOVER}"
+                       )
+               fi
+
+               for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+                       donvidia ${libdir}/${NV_LIB}
+               done
+       fi
+}
+
+pkg_preinst() {
+       if use driver && use kernel_linux; then
+               linux-mod_pkg_preinst
+
+               local videogroup="$(egetent group video | cut -d ':' -f 3)"
+               if [ -z "${videogroup}" ]; then
+                       eerror "Failed to determine the video group gid"
+                       die "Failed to determine the video group gid"
+               else
+                       sed -i \
+                               -e "s:PACKAGE:${PF}:g" \
+                               -e "s:VIDEOGID:${videogroup}:" \
+                               "${D}"/etc/modprobe.d/nvidia.conf || die
+               fi
+       fi
+
+       # Clean the dynamic libGL stuff's home to ensure
+       # we dont have stale libs floating around
+       if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+               rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+       fi
+       # Make sure we nuke the old nvidia-glx's env.d file
+       if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+               rm -f "${ROOT}"/etc/env.d/09nvidia
+       fi
+}
+
+pkg_postinst() {
+       use driver && use kernel_linux && linux-mod_pkg_postinst
+
+       # Switch to the nvidia implementation
+       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+       "${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+       readme.gentoo_print_elog
+
+       if ! use X; then
+               elog "You have elected to not install the X.org driver. Along 
with"
+               elog "this the OpenGL libraries and VDPAU libraries were not"
+               elog "installed. Additionally, once the driver is loaded your 
card"
+               elog "and fan will run at max speed which may not be desirable."
+               elog "Use the 'nvidia-smi' init script to have your card and 
fan"
+               elog "speed scale appropriately."
+               elog
+       fi
+       if ! use tools; then
+               elog "USE=tools controls whether the nvidia-settings 
application"
+               elog "is installed. If you would like to use it, enable that"
+               elog "flag and re-emerge this ebuild. Optionally you can 
install"
+               elog "media-video/nvidia-settings"
+               elog
+       fi
+}
+
+pkg_prerm() {
+       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+       use driver && use kernel_linux && linux-mod_pkg_postrm
+       use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}

Reply via email to