Do not call env-update in pkg_postinst (bug #402339).

(Portage version: 2.1.10.45/cvs/Linux x86_64)

6 files changed, 13 insertions, 12 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index ed3d2d1d4f29..5d30edf02b22 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-toolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.46 2012/02/05 16:41:16 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.47 2012/02/11 14:54:39 spock Exp $
+
+  11 Feb 2012; Michał Januszewski <spock@gentoo.org>
+  nvidia-cuda-toolkit-3.0.ebuild, nvidia-cuda-toolkit-3.1.ebuild,
+  nvidia-cuda-toolkit-3.2.ebuild, nvidia-cuda-toolkit-4.0.ebuild,
+  nvidia-cuda-toolkit-4.1.ebuild:
+  Do not call env-update in pkg_postinst.
 
   05 Feb 2012; Michał Januszewski <spock@gentoo.org>
   nvidia-cuda-toolkit-4.1.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
index 135a34d2dbc1..d339e3ad3fb2 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild,v 1.10 2012/02/05 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.0.ebuild,v 1.11 2012/02/11 14:54:39 spock Exp $
 
 EAPI=2
 
@@ -142,7 +142,6 @@ EOF
 }
 
 pkg_postinst() {
-	env-update
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-195.36.15."
 	elog ""
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild
index b56ec5908fc7..c51c1e4591b1 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild,v 1.7 2012/02/05 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.1.ebuild,v 1.8 2012/02/11 14:54:39 spock Exp $
 
 EAPI=2
 
@@ -136,7 +136,6 @@ EOF
 }
 
 pkg_postinst() {
-	env-update
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-256.22."
 	elog ""
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
index 5383fa1182f7..6c9295db12d0 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild,v 1.5 2012/02/05 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild,v 1.6 2012/02/11 14:54:39 spock Exp $
 
 EAPI=2
 
@@ -139,7 +139,6 @@ EOF
 }
 
 pkg_postinst() {
-	env-update
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
 	elog ""
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild
index d9de1fe5b10e..0fb02355a136 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild,v 1.8 2012/02/05 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.0.ebuild,v 1.9 2012/02/11 14:54:39 spock Exp $
 
 EAPI=2
 
@@ -142,7 +142,6 @@ EOF
 }
 
 pkg_postinst() {
-	env-update
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
 	elog ""
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild
index 92c6ce72a6e1..ad9e7e68606e 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild,v 1.5 2012/02/05 16:41:16 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild,v 1.6 2012/02/11 14:54:39 spock Exp $
 
 EAPI=2
 
@@ -59,7 +59,7 @@ src_install() {
 #!/bin/sh
 LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${DEST}/lib:${DEST}/lib64 ${DEST}/libnvvp/nvvp
 EOF
-		dobin ${T}/nvv
+		dobin "${T}/nvv"
 		insinto ${DEST}/extras
 		doins -r extras/CUPTI
 	fi
@@ -111,7 +111,6 @@ EOF
 }
 
 pkg_postinst() {
-	env-update
 	elog "If you want to natively run the code generated by this version of the"
 	elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21."
 	elog ""