Update x11-drivers/nvidia-drivers-340.96

4 files changed, 13 insertions, 17 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0a11bc3c..6fbc5813 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -51,7 +51,7 @@ AUX lvm2-start.sh 1025 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c
 AUX lvm2-start.sh-2.02.49-r3 1244 SHA256 e9c72d8500294301131183b37a7060dbcbd1d01b2a3e8425cf644e07652fae87 SHA512 5e57db4f24584437262f76d1c7ea8753decca8c4b041ec2e0414d92a81ea04cff48fee48fa01b7a0d7d9bc97493cee32ce78da6348f3920704be64f9671bb5ec WHIRLPOOL d90452503560ff6e97235c34f2bba7cca96905a4f881cd3fd7aa47c5a191b2529596c944c95aa8d7472ef5d2d7ad4a21432ac702ce1094697d42219a20d671a7
 AUX lvm2-start.sh-2.02.67-r1 1267 SHA256 48def1f022a337df7cd030c0d1e386d843026814da5494dde5610aa66af94bd2 SHA512 0b60d5be19673927872b310b6825c5912dea55028b05668914856cb085fcf229fffc0089479b1e5bf346cc9e6f1c7f024634cafca5ebfbd0f431264455ddc4f4 WHIRLPOOL 59db10f46e56ef19824b0c43a92790a29a108648138137dfe40c3fa9673d2df3087d8852bae4843dbdc04db393d12fc318a7db186ce2e5ab039dde288c259516
 AUX lvm2-start.sh-2.02.95 1535 SHA256 46225f0703ac66b8a41b34c74a93060749386be1e8c13e74ec2785cdd38577b4 SHA512 7ab702a6d62e608e2427561338aa04257303ef13ba79ba90810925723512523cba66d14751b1585fdf47cdde9897143a2f3868992095bfa5fb3b7cd013383ba4 WHIRLPOOL 97626e6ae3a22daae3ee15f7bc854d012776a73b6971d1ed6ae184ea2a5c3a1106c759a752a128cc7592ec3cf3620487e75796e4e0041ed8bf6574eeda501a9c
-AUX lvm2-start.sh-2.02.97-r1 1555 SHA256 98adb6bd0dafbd04c6af0614e801794dd71e5975270ad7717176e0e2b5827b17 SHA512 7088d74666a3c021f96a62fef90feed482148f53ec6d7b8b7bd368ac29785687df50235554b80352731ee926255e1b82b50739ea43e58d9aa9cb626d631102de WHIRLPOOL f86c7bd8e8380f8fa7c052f11261c6a3e1d9c5b5bdae212c959fb32d92ca734cb368e0cbac81a5a11e58b8d0e0b84a6c6b19a120a9c3ee6a98ff04267a59314a
+AUX lvm2-start.sh-2.02.97-r1 1323 SHA256 8ff9d5e1cd7e9650a2fb8efab060c76781f13e1438ddefc7875d5b95ea2440e7 SHA512 4f660d492774283b67a9fa82c0dc2c6afaca113eddf51039856f9943e79c68313414ff4251d3c0536d97a8daa80d0b7a2fcc3629fe26fad63b9fd6fe6a046596 WHIRLPOOL caac228e9ea3302d78924bee97c53fa9d3c44de17017cf1866ebca4be8c9d3abffde8aa4d0c07040c306b385f217919a97eac8a5a5a27de5974f9893aa03e8a5
 AUX lvm2-stop.sh 1939 SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c SHA512 f372d458b5bccbf872f7a8cc6759bde1c6aea90ba28b0a8a40b05084339e2bebf2d26431de8862cbb072e0b1e9970f393ac82fcda9437adfc75127ca2c76f97a WHIRLPOOL 74bd413264d8c6342b74d363ff1154e4c56b44526151869619f14d3c9952e2b870673676ad23a11ea9fa2ae0034c677897a3d859ea58b269411703d3fc0ebf10
 AUX lvm2-stop.sh-2.02.49-r3 2253 SHA256 dea23f37d232437b15c743ca23af3d7baa95f2b7c71ac1e47ae5289bdcfe0a56 SHA512 909eae8d09157a7227c4240bb9d0a3d2a56347b8926a2209b3d778d6c4f709c94fec8d966839ea8ac4fcb0f2fed8ae4349bcb6b9d487ec83116b83123fff7979 WHIRLPOOL 057ea018b83f8480407cbbbc0b60ed17dcb84644476382f8a79dec9f08caea6f5a103d21389a12697927b205f91b3168db5db65596c5e86cd130482b78d6d489
 AUX lvm2-stop.sh-2.02.67-r1 982 SHA256 7a793715d1b157801fd503f39740a82131bc5b53bb57c845f6a01f960d769bce SHA512 280da1c5ff91d660f1eda3920c9068dfbfe8e180ad8a9a0c3e05368b2531f2f2efa8bc2e405ad315c012ca4015f6080c45dac434aa8355ec783f1745e190667c WHIRLPOOL 380aee9ac828be5f9df7ef0704945554365e695c0f6bb17dfc6f6feb9ecee7c143fbac71a054341945f5f8cced982450d8d670ec9c2dfce8652a23d33cfc7c7e
diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1
index f09e78f3..b36192bc 100644
--- a/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1
+++ b/sys-fs/lvm2/files/lvm2-start.sh-2.02.97-r1
@@ -1,7 +1,7 @@
 # /lib/rcscripts/addons/lvm-start.sh
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.95,v 1.1 2012/03/27 03:20:56 robbat2 Exp $
 
-config='global { locking_dir = "/dev/.lvm" }'
+config='global { locking_type = 1 locking_dir = "/dev/.lvm" }'
 
 dm_in_proc() {
 	local retval=0
@@ -30,18 +30,14 @@ if [ -z "${CDBOOT}" ] ; then
 		modprobe dm-mod 2>/dev/null
 	fi
 	if [ -d /proc/lvm ] || dm_in_proc ; then
-		ebegin "Setting up the Logical Volume Manager"
-		#still echo stderr for debugging
-		lvm_commands="#! ${lvm_path} --config '${config}'\n"
-		# Extra PV find pass because some devices might not have been available until very recently
-		lvm_commands="${lvm_commands}pvscan\n"
-		# Now make the nodes
-		lvm_commands="${lvm_commands}vgscan --mknodes\n"
-		# And turn them on!
-		lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
-		# Order of this is important, have to work around dash and LVM readline
-		printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-		eend $? "Failed to setup the LVM"
+		ebegin "Setting up Logical Volume Manager"
+
+		# For debug purposes, don't redirect stderr...
+		$lvm_path pvscan --ignorelockingfailure --config "${config}" >/dev/null &&
+		$lvm_path vgscan --mknodes --ignorelockingfailure --config "${config}" >/dev/null &&
+		$lvm_path vgchange --sysinit -a ly --ignorelockingfailure --config "${config}" >/dev/null
+
+		eend $? "Failed to setup LVM"
 	fi
 fi
 
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index f6b49290..5796cc4e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -26,5 +26,5 @@ DIST NVIDIA-Linux-x86_64-340.93.run 69813449 SHA256 ea2ac747fd473ea55ed5f6263bd3
 DIST NVIDIA-Linux-x86_64-340.96.run 69824601 SHA256 a7553a5749679994642ef0262906e6431dce354c03052151d9821d29dad7470d SHA512 6ffa4567ef6f5e09bcd50760b87baa2abe6a6ed1fbc280319101cc6582f2a381c36ab3fd1b4d74bcb5748adc3b82881618673ef77e5fe1a74c19a657774bcd87 WHIRLPOOL 823488bf9e338fee314d84c7ad2af6556548b94437c98094ca42911d74f19b5f44ee9809bb112a244016dadfdb372232365a355a4d40eaf685f5e0fa13868b58
 DIST NVIDIA-Linux-x86_64-346.96.run 73538317 SHA256 229b28a6b65965a248d07223d941de7d79b54cee7c6574f1037293e8a8026727 SHA512 188f8aac88085c3cac9637e87f4d9259d0c508075bbbf684775650a12f4760f47ba9e92f79e8bbe96d33ee014092edd38efce7dd730f67e0f11c2079eca938c5 WHIRLPOOL c9f4a5163018dc0b53aeff84b410cb34720d06ca7bdd17ce166ad3a2b057ffe94e6773594cd617fce79d9d0a02e5e1cd0525ca30dade7247ad5b7b20ff661a64
 EBUILD nvidia-drivers-340.93.ebuild 13517 SHA256 f67bec79d3ac59ac26b8ceb432eca1e03c1bf8c8195b14690f06df5627a4caca SHA512 354ca9673bbdb8f7ca7fcedf6bfb505024b959fd03660ed97b64ff71d4f1f70423e9f96ed0d54165960b49e472f5f36f73d99dacc82774715dc9c2bbb568ec0c WHIRLPOOL 1f6e002cdd8658862273a2c81db4bcfe398daf4f05413adae49a47e520e9ea45bbf12f3343042f9653278127479a80b53ba4f413a45d8b45c62e24e8c5f032f6
-EBUILD nvidia-drivers-340.96.ebuild 13559 SHA256 47def165509501fa44ebafdb341bec69271322e3c138f50ce6052b21d3426bfe SHA512 c431ec2f2bf8f5934e2467d595a6bd93603bd351f0e64e17dfa6ecdd7560823d8d1e7f8c4c9f31d25e0495d4a271fd1c889b3df3a0a0245a1f035757951c92b0 WHIRLPOOL cd7512f590ef8cc0d10716b048bb41f8874bc5532e8cdaa3dcc3f0b58f8d156fcffaec49204cc179c8b27531808a7b921dd53295be73564eac259439080a85a2
+EBUILD nvidia-drivers-340.96.ebuild 13600 SHA256 d9e48c9e5875fcb05d15878ba9aa6384e54ca57c200ecb5fbac88d188bace6a6 SHA512 bc6aff9f91955a37e84ee3c79cbf3b38710d4fe834ea8147ab6797e57219cb63782fe67b2674d8009ab4365090349932ce47972c682bfe30580882ea62aa6c55 WHIRLPOOL 3198f63d69eff70d74b34cdda2bde627c6c7c614dbca3f8229964566e744031a1f4718f04a2afc5f1eac544bc9d42dc28c2a2bbad5cbc39e74f9d1c6f25f8533
 EBUILD nvidia-drivers-346.96.ebuild 13829 SHA256 4a604fc4c05e3e2144ea9000ab2805e1a20000e3460720333dd2e8563bb709f7 SHA512 c0334519b50db013bfd140c0fc613d1e621f0690cbcc83ac74bde7882c649ff6b7d0deefd91d9ae747afde737c24ea5ea40210a5d8d0d00d584bcfc713678e15 WHIRLPOOL 60eda62a2f9819f4400c590f24333a2e67b6022f643406b882ab9651b80feb63f2f4317513ade97f1277542ebf16364d722c4392aac723909f1553588d365609
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
index 26b994a5..081be4e6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-340.96.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: b8d4cedb13e99eb1480b216e3c4543e6cebc6861 $
+# $Id: 80c331c574b1c900c34d90128d7cc44b99d50f9e $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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/"
+HOMEPAGE="http://www.nvidia.com/ http://www.nvidia.com/Download/Find.aspx"
 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 )