Split src_unpack into src_prepare for EAPI=3.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 26 insertions, 15 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 353bb7a6416e..9cb88ad08609 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.322 2011/08/15 04:55:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.323 2011/08/29 05:09:44 vapier Exp $
+
+  29 Aug 2011; Mike Frysinger <vapier@gentoo.org>
+  linux-headers-2.6.36.1.ebuild, linux-headers-2.6.38.ebuild,
+  linux-headers-2.6.39.ebuild:
+  Split src_unpack into src_prepare for EAPI=3.
 
 *linux-headers-2.6.39 (15 Aug 2011)
 
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 5b0f6ac1ec05..f02099fca842 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -23,15 +23,15 @@ EBUILD linux-headers-2.4.36.ebuild 610 RMD160 b7460f982042adb0a14748967b3dbf0050
 EBUILD linux-headers-2.6.27-r2.ebuild 1464 RMD160 56c3731022fa959f4bd625c737ddda811f880633 SHA1 0bef4d2d101fc4e6b85b4e1fd8102b26c7d1243e SHA256 157e37458d29dc7a52ba6fccdfae04a45186da6ee4fdec5cf4072bec116c24a3
 EBUILD linux-headers-2.6.30-r1.ebuild 1475 RMD160 3976fd44264c0e09aea95b13a613d36f7b98a80b SHA1 e54f783196d1297edbcdb3856277b8b4245ca81c SHA256 cec57844e733fef70c5c8f5b3f956dc19ef83be8d18a9e31ecd0bd100bcef567
 EBUILD linux-headers-2.6.33.ebuild 1413 RMD160 a988105ed3ddba208b731bd0255366d060bcc3fb SHA1 f1c3b4e691793eef357b9b30137adde9bd6d1fae SHA256 e83ee05994ab707bf816d111f86a1b263e60b3829f2df578cbf86cfd0c688a43
-EBUILD linux-headers-2.6.36.1.ebuild 1381 RMD160 741c8e3d1dd037e94e5984e8e3fff390f4741073 SHA1 d9cbee8514ef4607a1b0bd6e64f51e1f55c7a981 SHA256 5939befe02cc62d55bade2bc74288973fc4b676c4dce28cbbf807ffad2cbb9be
-EBUILD linux-headers-2.6.38.ebuild 1394 RMD160 569a7be9575a1b5c675564fb4724ccf86dd08642 SHA1 29649b12ba68a956818ccc9796fcf5fa27bc6d96 SHA256 93c97a9494564ccc6942b45be8e69786658ed44872c056a67d5f8452d0f02cf8
-EBUILD linux-headers-2.6.39.ebuild 1388 RMD160 f67580c21830f02ed3dd69b6788d194b23c800fb SHA1 0b71c57549ecba871c0d3e787276f43828c76923 SHA256 9678065903712e35a86b557def3d0efa72d91b0135482cb73c1bcfba1617a58d
-MISC ChangeLog 54024 RMD160 74a5eeb29f3ba6a7ad75e31fcc5b3387f7210e89 SHA1 254278e0792d99f9d6d5dee6fea9ef58ad0b5a10 SHA256 33f2049b4f7ff20511275724e09ebe79a0910e7b189b6d755fb21b0ae5fffda6
+EBUILD linux-headers-2.6.36.1.ebuild 1392 RMD160 2cf83ab20fb317d8ae1dfc3a02f938415adcc5bb SHA1 5d5811c1cb617b45ee9ed725d4ff917b50d1138a SHA256 13f9f3f17ba4476ffa83d573b99096bda07f5020fa48bd50713e2d4eb76dca39
+EBUILD linux-headers-2.6.38.ebuild 1399 RMD160 70759f5e5c7103f225cacbd5e0542cc368b9d2db SHA1 f1935e06a16a4efde476af4cab4a56d741046857 SHA256 293a343e6a720136304eed740deb5939c1c76a09cea32b648e2ae22af788bc84
+EBUILD linux-headers-2.6.39.ebuild 1396 RMD160 3c662152c80a9765aa00e1ad624146549ef6b8c0 SHA1 713a45d41a60860570c86bd3a0aa6ad15562d49e SHA256 a077309bb4c7beb453ddb6e5588215193d1c4c253280be4299f69ffeb9d5021a
+MISC ChangeLog 54216 RMD160 f2fdb121b29b914a1d4b0e3aa9bbea2212126084 SHA1 06b2d45d5d86869ab1d9160faf2024c699d94a9b SHA256 6195f66c84fcaee2a4eb80fd35c01ad02b4521c80d3fa5e697b694284fcc7d07
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5IpsAACgkQaC/OocHi7JZH2AEAgjZBLpNlOQmM55Hpbx7ijmvu
-LsovIEWLlwRo3bfbBgkA+wZVzNJga6zeC4RQVlc+6OtpjtxiFV25HsR8+EVRQew8
-=Q1t6
+iF4EAREIAAYFAk5bHxIACgkQaC/OocHi7JbzxAD+Lx7QdN0gR8AqMKjvuu4t6g7J
+WhIE7UXNCfqnwL4+EykA/2o8Lu44ZpPrYyDZvvruq52mdIEVgogm4rwut+L6AK2K
+=y0H3
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild
index 3c5b19672962..0cfed30dfd44 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild,v 1.7 2011/04/04 22:45:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.36.1.ebuild,v 1.8 2011/08/29 05:09:44 vapier Exp $
 
 EAPI="3"
 
@@ -22,7 +22,9 @@ S=${WORKDIR}/gentoo-headers-base-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+}
+
+src_prepare() {
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV%.1}
 }
 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild
index dc69eb46e2ff..c85ec9cafa6a 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild,v 1.1 2011/03/18 19:49:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.38.ebuild,v 1.2 2011/08/29 05:09:44 vapier Exp $
 
 EAPI="3"
 
@@ -22,8 +22,10 @@ S=${WORKDIR}/gentoo-headers-base-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
-	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV%.1}
+}
+
+src_prepare() {
+	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
 }
 
 src_install() {
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
index e6f3871de50a..dfc4da694518 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild,v 1.1 2011/08/15 04:55:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.39.ebuild,v 1.2 2011/08/29 05:09:44 vapier Exp $
 
 EAPI="3"
 
@@ -22,7 +22,9 @@ S=${WORKDIR}/gentoo-headers-base-${PV}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+}
+
+src_prepare() {
 	[[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV}
 }