Move to new unpacker eclass for unpack_makeself.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

8 files changed, 28 insertions, 75 deletions

diff --git a/dev-util/nvidia-cuda-toolkit/ChangeLog b/dev-util/nvidia-cuda-toolkit/ChangeLog
index 63680c38c73a..ad5acf3418f3 100644
--- a/dev-util/nvidia-cuda-toolkit/ChangeLog
+++ b/dev-util/nvidia-cuda-toolkit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.43 2012/01/29 16:50:52 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/ChangeLog,v 1.44 2012/02/05 05:37:49 vapier Exp $
+
+  05 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  nvidia-cuda-toolkit-2.2-r3.ebuild, nvidia-cuda-toolkit-2.3.ebuild,
+  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:
+  Move to new unpacker eclass for unpack_makeself.
 
 *nvidia-cuda-toolkit-4.1 (29 Jan 2012)
 
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild
index 864aef7d3ab3..c631d1290415 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.2-r3.ebuild,v 1.3 2011/07/23 20:41:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.2-r3.ebuild,v 1.4 2012/02/05 05:37:49 vapier Exp $
 
 EAPI=2
 
-inherit eutils
+inherit eutils unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -33,12 +33,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
-src_unpack() {
-	for f in ${A} ; do
-		unpack_makeself ${f}
-	done
-}
-
 src_prepare() {
 	epatch "${FILESDIR}/${P}-enum_fix.patch"
 }
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.3.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.3.ebuild
index ef93b4f5980d..e0c762811c69 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.3.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.3.ebuild,v 1.6 2011/07/23 20:41:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-2.3.ebuild,v 1.7 2012/02/05 05:37:49 vapier Exp $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -32,14 +32,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_install() {
 	local DEST=/opt/cuda
 
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 db7e4a5fedf8..135a34d2dbc1 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,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.9 2011/07/23 20:41:24 spock Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -36,14 +36,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-enum_fix.patch
 }
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 83099f09d0aa..b56ec5908fc7 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,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6 2011/07/23 20:41:24 spock Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -36,14 +36,6 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-enum_fix.patch
 }
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 5673c639fd22..5383fa1182f7 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,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.4 2011/07/23 20:41:24 spock Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -41,14 +41,6 @@ S="${WORKDIR}"
 #QA_DT_HASH_x86="opt/cuda/.*"
 #QA_DT_HASH_amd64="opt/cuda/.*"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_install() {
 	local DEST=/opt/cuda
 
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 dbb04d564952..d9de1fe5b10e 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,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.7 2011/09/04 10:08:12 maekke Exp $
+# $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 $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -41,14 +41,6 @@ S="${WORKDIR}"
 #QA_DT_HASH_x86="opt/cuda/.*"
 #QA_DT_HASH_amd64="opt/cuda/.*"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_install() {
 	local DEST=/opt/cuda
 
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 33274a9e0272..e6e38a4ff21f 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,10 +1,10 @@
 # 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.2 2012/01/29 22:10:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.1.ebuild,v 1.3 2012/02/05 05:37:49 vapier Exp $
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib unpacker
 
 DESCRIPTION="NVIDIA CUDA Toolkit"
 HOMEPAGE="http://developer.nvidia.com/cuda"
@@ -33,14 +33,6 @@ S="${WORKDIR}"
 #QA_DT_HASH_x86="opt/cuda/.*"
 #QA_DT_HASH_amd64="opt/cuda/.*"
 
-src_unpack() {
-	for f in ${A} ; do
-		if [ "${f//*.run/}" == "" ]; then
-			unpack_makeself ${f}
-		fi
-	done
-}
-
 src_install() {
 	local DEST=/opt/cuda