[gentoo-commits] repo/gentoo:master commit in: sys-kernel/linux-headers/

[Sergei Trofimovich]

commit:     296273b37e76d98f527219bc07592b01eeb18531
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 10:04:14 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr  2 10:04:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=296273b3

sys-kernel/linux-headers: reorder src_install and src_test

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-kernel/linux-headers/linux-headers-3.18.ebuild   | 20 ++++++++++----------
 .../linux-headers/linux-headers-4.14-r1.ebuild       | 16 ++++++++--------
 sys-kernel/linux-headers/linux-headers-4.19.ebuild   | 16 ++++++++--------
 sys-kernel/linux-headers/linux-headers-4.4.ebuild    | 16 ++++++++--------
 sys-kernel/linux-headers/linux-headers-4.9.ebuild    | 16 ++++++++--------
 sys-kernel/linux-headers/linux-headers-5.10.ebuild   |  8 ++++----
 sys-kernel/linux-headers/linux-headers-5.11.ebuild   |  8 ++++----
 sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild | 10 +++++-----
 sys-kernel/linux-headers/linux-headers-5.9.ebuild    | 10 +++++-----
 9 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index b4c2a44ff50..1574835523e 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
@@ -30,6 +30,16 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
+src_test() {
+	einfo "Possible unescaped attribute/type usage"
+	egrep -r \
+		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
+		-e '\<([us](8|16|32|64))\>' \
+		.
+
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,13 +50,3 @@ src_install() {
 	# provided by libdrm (for now?)
 	rm -rf "${ED}"/$(kernel_header_destdir)/drm
 }
-
-src_test() {
-	einfo "Possible unescaped attribute/type usage"
-	egrep -r \
-		-e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
-		-e '\<([us](8|16|32|64))\>' \
-		.
-
-	emake ARCH=$(tc-arch-kernel) headers_check
-}

diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index c931c75d07e..4b167e1ada3 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -30,14 +30,6 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
@@ -47,3 +39,11 @@ src_test() {
 
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}

diff --git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index 159b1080ae4..66e8b26589d 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
@@ -33,14 +33,6 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}"/${PV}/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
@@ -50,3 +42,11 @@ src_test() {
 
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}

diff --git a/sys-kernel/linux-headers/linux-headers-4.4.ebuild b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index c931c75d07e..4b167e1ada3 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
@@ -30,14 +30,6 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
@@ -47,3 +39,11 @@ src_test() {
 
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}

diff --git a/sys-kernel/linux-headers/linux-headers-4.9.ebuild b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
index 45ad986072e..14349ca8e26 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
@@ -30,14 +30,6 @@ src_prepare() {
 	[[ -n ${PATCH_VER} ]] && eapply "${WORKDIR}/${PV}"/*.patch
 }
 
-src_install() {
-	kernel-2_src_install
-
-	# hrm, build system sucks
-	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
-	find "${ED}" -depth -type d -delete 2>/dev/null
-}
-
 src_test() {
 	einfo "Possible unescaped attribute/type usage"
 	egrep -r \
@@ -47,3 +39,11 @@ src_test() {
 
 	emake ARCH=$(tc-arch-kernel) headers_check
 }
+
+src_install() {
+	kernel-2_src_install
+
+	# hrm, build system sucks
+	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
+	find "${ED}" -depth -type d -delete 2>/dev/null
+}

diff --git a/sys-kernel/linux-headers/linux-headers-5.10.ebuild b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
index d23a56f31e8..f1a29850d47 100644
--- a/sys-kernel/linux-headers/linux-headers-5.10.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.10.ebuild
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}

diff --git a/sys-kernel/linux-headers/linux-headers-5.11.ebuild b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
index b543fdb5adc..6ce8a6c038a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.11.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.11.ebuild
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}

diff --git a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
index 5abde386164..c76039abfd8 100644
--- a/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake ARCH=$(tc-arch-kernel) headers_check
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake ARCH=$(tc-arch-kernel) headers_check
-}

diff --git a/sys-kernel/linux-headers/linux-headers-5.9.ebuild b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
index 3c7e3cd2bc0..6ce8a6c038a 100644
--- a/sys-kernel/linux-headers/linux-headers-5.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -33,6 +33,10 @@ src_prepare() {
 	default
 }
 
+src_test() {
+	emake headers_check ${xmakeopts}
+}
+
 src_install() {
 	kernel-2_src_install
 
@@ -40,7 +44,3 @@ src_install() {
 	find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete
 	find "${ED}" -depth -type d -delete 2>/dev/null
 }
-
-src_test() {
-	emake headers_check ${xmakeopts}
-}