dev-util/nvidia-cuda-toolkit: Use MERGE_TYPE wrap for postinst check, thanks lxnay pointing this out

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

7 files changed, 55 insertions, 13 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 7fc8f3912cac..368271a41376 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.74 2013/09/19 14:16:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.75 2013/11/26 09:28:44 jlec Exp $
+
+  26 Nov 2013; Justin Lecher <jlec@gentoo.org>
+  nvidia-cuda-toolkit-4.2.9-r2.ebuild, nvidia-cuda-toolkit-4.2.9-r3.ebuild,
+  nvidia-cuda-toolkit-5.0.35-r2.ebuild, nvidia-cuda-toolkit-5.0.35-r3.ebuild,
+  nvidia-cuda-toolkit-5.0.35-r4.ebuild, nvidia-cuda-toolkit-5.5.22.ebuild:
+  Use MERGE_TYPE wrap for postinst check, thanks lxnay pointing this out
 
   19 Sep 2013; Justin Lecher <jlec@gentoo.org>
   nvidia-cuda-toolkit-5.5.22.ebuild:
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
index f1dea9b35d15..32c41859a979 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2.9-r2.ebuild,v 1.6 2013/08/11 12:16:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r2.ebuild,v 1.7 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -104,7 +104,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -122,3 +122,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild
index 3871d1692d2f..a0d6ebd05d1a 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.2.9-r3.ebuild,v 1.2 2013/08/11 12:16:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r3.ebuild,v 1.3 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -104,7 +104,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -122,3 +122,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild
index 8ace64d6e14d..1b98c3e7abce 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-5.0.35-r2.ebuild,v 1.5 2013/08/11 12:16:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r2.ebuild,v 1.6 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -110,7 +110,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -128,3 +128,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild
index 585dc90709d1..3619f88f408f 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-5.0.35-r3.ebuild,v 1.3 2013/08/11 12:16:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r3.ebuild,v 1.4 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -132,3 +132,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild
index a1a4d8f5c2c8..33a3ca802f28 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-5.0.35-r4.ebuild,v 1.2 2013/08/11 12:16:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35-r4.ebuild,v 1.3 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -132,3 +132,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
index a03d27d06028..8ff20601646d 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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-5.5.22.ebuild,v 1.5 2013/09/19 14:16:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.5.22.ebuild,v 1.6 2013/11/26 09:28:44 jlec Exp $
 
 EAPI=5
 
@@ -114,7 +114,7 @@ src_install() {
 	dobin "${T}"/cuda-config
 }
 
-pkg_postinst() {
+pkg_postinst_check() {
 	local a b
 	a="$(version_sort $(cuda-config -s))"; a=( $a )
 	# greatest supported version
@@ -132,3 +132,9 @@ pkg_postinst() {
 			echo
 	fi
 }
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}