[gentoo-commits] repo/gentoo:master commit in: sys-kernel/ck-sources/

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     91dd958a2ce457a7df6f74c4b74c670b0cee5a9f
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 18:07:58 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue May 24 18:09:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dd958a

sys-kernel/ck-sources: move use() calls out of global scope

Bug: http://bugs.gentoo.org/582200

Package-Manager: portage-2.2.28

 sys-kernel/ck-sources/ck-sources-3.10.97.ebuild | 24 +++++++++---------
 sys-kernel/ck-sources/ck-sources-3.14.61.ebuild | 24 +++++++++---------
 sys-kernel/ck-sources/ck-sources-3.18.27.ebuild | 24 +++++++++---------
 sys-kernel/ck-sources/ck-sources-3.4.110.ebuild | 33 +++++++++++++------------
 4 files changed, 56 insertions(+), 49 deletions(-)

diff --git a/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild b/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
index c82c404..951191b 100644
--- a/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.10.97.ebuild
@@ -74,21 +74,23 @@ SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_UR
 	!bfsonly? ( ${CK_URI} )
 	bfsonly? ( ${BFS_URI} )"
 
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
 
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+src_unpack() {
+	UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+	UNIPATCH_STRICTORDER="yes"
 
-UNIPATCH_STRICTORDER="yes"
+	if ! use bfsonly ; then
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+	else
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+	fi
 
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
+	#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	kernel-2_src_unpack
+}
 
 src_prepare() {
 

diff --git a/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild b/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
index 6f14fdf..a10afea 100644
--- a/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.14.61.ebuild
@@ -72,21 +72,23 @@ SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_UR
 	!bfsonly? ( ${CK_URI} )
 	bfsonly? ( ${BFS_URI} )"
 
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
 
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+src_unpack() {
+	UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+	UNIPATCH_STRICTORDER="yes"
 
-UNIPATCH_STRICTORDER="yes"
+	if ! use bfsonly ; then
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+	else
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+	fi
 
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
+	#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	kernel-2_src_unpack
+}
 
 src_prepare() {
 

diff --git a/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild b/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
index ff06a24..d475fef 100644
--- a/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.18.27.ebuild
@@ -72,21 +72,23 @@ SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_UR
 	!bfsonly? ( ${CK_URI} )
 	bfsonly? ( ${BFS_URI} )"
 
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
+K_EXP_GENPATCHES_LIST="50*_*.patch*"
 
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+src_unpack() {
+	UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+	UNIPATCH_STRICTORDER="yes"
 
-UNIPATCH_STRICTORDER="yes"
+	if ! use bfsonly ; then
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+	else
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+	fi
 
-#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
-K_EXP_GENPATCHES_LIST="50*_*.patch*"
+	#-- Since experimental genpatches && we want BFQ irrespective of experimental -
+	kernel-2_src_unpack
+}
 
 src_prepare() {
 

diff --git a/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild b/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
index 06bb20e..4c39624 100644
--- a/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-3.4.110.ebuild
@@ -77,28 +77,29 @@ SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_UR
 	experimental? (
 		urwlocks? ( ${XPR_1_URI} ${XPR_2_URI} ) )"
 
-UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
-
-if ! use bfsonly ; then
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
-else
-	UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
-fi
+src_unpack() {
+	UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}"
+	UNIPATCH_STRICTORDER="yes"
+
+	if ! use bfsonly ; then
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}"
+	else
+		UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}"
+	fi
 
-UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
+	UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}"
 
-if use experimental ; then
-	if use urwlocks ; then
-		UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
+	if use experimental ; then
+		if use urwlocks ; then
+			UNIPATCH_LIST="${UNIPATCH_LIST} ${DISTDIR}/${XPR_1_FILE} ${DISTDIR}/${XPR_2_FILE}:1"
+		fi
 	fi
-fi
 
-UNIPATCH_STRICTORDER="yes"
+	kernel-2_src_unpack
+}
 
 src_prepare() {
-
-#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
-
+	#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
 	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile"
 }