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

Package-Manager: portage-2.1.10.45/cvs/Linux x86_64

7 files changed, 22 insertions, 21 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/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 9c1034bc1ec6..12173ad45771 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -22,17 +22,17 @@ DIST cudatoolkit_4.1.28_linux_32_ubuntu11.04.run 198302412 RMD160 a45f5f21927af8
 DIST cudatoolkit_4.1.28_linux_64_ubuntu11.04.run 259109551 RMD160 1ba04058f897564a0b8c3058415a679808500526 SHA1 03c77b0882d5efa813829f9286e4f06403dd6b51 SHA256 073864953c0cec206254e2ceccb8745a902dc8a95d4f2ef86f5231ae729070ad
 EBUILD nvidia-cuda-toolkit-2.2-r3.ebuild 2884 RMD160 711dfd0c64072d1d2aa7ce166a588bc5d1845ac2 SHA1 03f75b47a4a67dc3b5f948c60424f773b3adae14 SHA256 4166c6b79e1b84ee3b198892cd732f1ee5dc98a0e35e2a041fa580a719f9f6b6
 EBUILD nvidia-cuda-toolkit-2.3.ebuild 2775 RMD160 d2fa4f8f4ed651f62594ae839b866b8c4f38e79c SHA1 9e259eaaf97f5c1b407dcb1c137e5dec2f0cfece SHA256 08e6ad58b88f685880b63905af5c4a7f0b0782852f43884b666d08d6d86174c5
-EBUILD nvidia-cuda-toolkit-3.0.ebuild 3468 RMD160 f2b7a829df7cb436be0c923ca0d18a66347cf44b SHA1 a3f439fe79f0fc3f2ebd711d0e3d7826c256f9f4 SHA256 2eebac4afa6befcb525d6d60632d217784d99f18eda0685932b5d45181977eb9
-EBUILD nvidia-cuda-toolkit-3.1.ebuild 3292 RMD160 054e9f7c59def2870f0e4f50d137d1b68d7b4ac3 SHA1 a5788976b4c4be84b0088d463b654fe0a94aa3d1 SHA256 0dc51ccb2b2d4a569b823c4e2de16914f522822eebad763fa47172fc8dca5710
-EBUILD nvidia-cuda-toolkit-3.2.ebuild 3513 RMD160 d30e678692991b26cfff246a3b082f68deb354c9 SHA1 5600f02e55c84ccd3bb688e2ccc31f4931012ef8 SHA256 8a8bde9b99a01bdcbfb13b7d8276b58f7084572fb8d800dd3b19b65fcba58d66
-EBUILD nvidia-cuda-toolkit-4.0.ebuild 3604 RMD160 884da7cb2be9a2fbb05d2d16d0cd00885b7f5313 SHA1 b0f0b455224fb00b189d729ff7b6673a9e7b8c9a SHA256 b652549985ad3f840a14d79df1fd7596917c8b7b1a43fad041a6f5e6558b2756
-EBUILD nvidia-cuda-toolkit-4.1.ebuild 2939 RMD160 bfce9823d0a15b3eeb1fbc689486bc0dc5936618 SHA1 4c6641699eab59ede7a11e68faabaf6093652708 SHA256 0b3db426e18854a824cc8ef863470fd6a0a3d9f2a6f8bbedf29c8b0a6bfb56b0
-MISC ChangeLog 8565 RMD160 b80877a7ac4a40f0fea7f93af1b5edefa5e54c7f SHA1 9c8d2b1ed9ffcd3befc90be7752d9e518db3109f SHA256 59bfaba42335280552e397e147d2bec492e382e5302acf68e0defa33529ae440
+EBUILD nvidia-cuda-toolkit-3.0.ebuild 3455 RMD160 d13f1da63aa3c22b7590b0221229774d30acfec9 SHA1 fd446f9522f8d357c5318f1328604019e1de69f6 SHA256 2c71c045cd3f4f25c29117564e59792c4354c74dfe2ca7d4caa85cc80a113687
+EBUILD nvidia-cuda-toolkit-3.1.ebuild 3279 RMD160 88bebe4d4e057459e0c6fbeadbf21ac5b9a7575e SHA1 38cedd094db9e10f6466f4f1320e5c2555ccc674 SHA256 4d15b3524bf01ae8cac45e18f56688015e4e0c3876e793a6331661f48f7f09cd
+EBUILD nvidia-cuda-toolkit-3.2.ebuild 3500 RMD160 08442aa818674cd73d0bd3a0ff8eab8a991c4629 SHA1 2c950d82f70598e791c4bbeb445965ea22d248d1 SHA256 cc0e857cf38d0822497ecef695d1a956799e972a85bc317299b614ce47fd4cf4
+EBUILD nvidia-cuda-toolkit-4.0.ebuild 3591 RMD160 6c33725481017095b90e48b211a68c090b38fb2d SHA1 d223910dd5e94ab86ea43aab71d7a21bd9324148 SHA256 e2d651e66f90f911a66d6f22e168f7f5b4c1a0a01fceb1cb373252edf12ac1f8
+EBUILD nvidia-cuda-toolkit-4.1.ebuild 2929 RMD160 16c10af53428a29376c2535ad10e76fbdfc056e7 SHA1 92bbff6ffad8bbf158453f4dfed06ff73b04cdb1 SHA256 cecf0cb03fa49fba001c7484e54ad6cc17ddf7a0c7ce56a22229b1bd7434565e
+MISC ChangeLog 8828 RMD160 c8cc8cdfc5885caff399915e043d4357761cc47a SHA1 25a951c06c8f91c2368a41df2cae50d42ea8ac55 SHA256 be29ffa762f7a76a108ea0a09870b77fc5d5f25dc92e98c391174ef13971c3ee
 MISC metadata.xml 462 RMD160 f1584dbb8fbdfd170cdc74827f7edb1ce41ce4c1 SHA1 1a793b6507c9c207b54d02ebb0b8cf9199912b31 SHA256 9b61c1cb31d86a60ed81be112681c9642f53000b332748e24a8eb002585db530
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8usVMACgkQchej4aZK9/c+QQCfYCBv2ZFiIt5MKUVrjshlFv0W
-ODYAni7j3mQsIljvynUVK/52NwRH5/NA
-=a0qr
+iEYEARECAAYFAk82gV8ACgkQchej4aZK9/cSfQCeIQqJhKcNz4K/v7WwSRhDlaG4
+zkgAoIeSBLJtljkK3RvZ5jkbcfoPl6JU
+=ke5t
 -----END PGP SIGNATURE-----
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 ""