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

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

Package-Manager: portage-2.2.28

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 c82c404130512f2d6e87ad8173b9734ddfb17707..951191b3e15909d7bc8a40413598243b88f5bee0 100644 (file)
--- 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 6f14fdf178ea7c663294d5167c0c7d096d4384c1..a10afea2cbc4dd70b2780b07be2f7a9892984e88 100644 (file)
--- 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 ff06a24a4a273a18d3dd2c0a3eff135dc4285c1e..d475fef96556e4882c8f9939661c51370d7d3275 100644 (file)
--- 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 06bb20e4e42b96984b4e2b4ff653c489619179cf..4c396247cc02abc4a9098c587aefa4852decad7e 100644 (file)
--- 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"
 }