gentoo auto-resync : 06:12:2022 - 03:08:16

5 files changed, 28 insertions, 53 deletions

diff --git a/app-emulation/vendor-reset/Manifest b/app-emulation/vendor-reset/Manifest
index db5a6e5ce6fe..875488c63068 100644
--- a/app-emulation/vendor-reset/Manifest
+++ b/app-emulation/vendor-reset/Manifest
@@ -1,8 +1,7 @@
 AUX Fix-5.11-build.patch 1687 BLAKE2B 04ec945f071a3eca4d4a257340c82e635a1421696dbe538bf4864829ff0e8a7878989fceb63617ffa5b472bfce66ff06b20e57186c79b5477312a2b5c71f6fbb SHA512 5768890607d321a6b23cc13e79f54733d518fc319e1a2953b986113bd79bfeb4076053c8b87bcd9415b889e686945007e30fbd3ce4cc421c9ed30fddc7f4791f
+AUX Respect-eselect-kernel.patch 257 BLAKE2B 7ff9942cccd5e637e56efb5eacc4ce11ce1b0ab318e43a77b6f0fa3adf675ec2646de207e37fc269ea88e52228e9688eb3e7a16934d37e470a935d257ebecf4b SHA512 e2081192dd982c1ddf0f8897d24c5ddb93e0e1ce47973a279146a3165f1b6a00aeae5369c9280552f8317f573c57c9125214b775c3b1614d67780476611db14e
 AUX modload.conf 13 BLAKE2B 1e774873c1bf09ca1f3ec2c006b1938e3aa07187dd5a7f926369d6d1bc2c21bfe52f2cbb632f64174485896c8691ac4cbd10e988b7db7a2a9ada7fdccda1a22d SHA512 7a4bf9c95af41bf11e5a720f6258d62822f553c6f349dbe93cf23743b851d830340d268954252d6f058ea2fa823006a63afd45875e7b9108d5d2a6a1a316ff6d
-DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
-DIST vendor-reset-0.1.1_pre20220902.tar.gz 12724563 BLAKE2B 6d1aa45216a4a72981fc766ba7541873902272a27b5eebc08f7b2627f186d6236c3b6f576f997e35a3a9a3bb4b0c5f6a285585522e7c0eb86b446808e2de501b SHA512 27bc02fdbc7d0339c0f706e1ec8406bc47f163fca6d6471dd7ad92272a384ab7319f6180641177f90a38c11aee2def52ae408a2165438980b7fc3aea10f88b4e
-EBUILD vendor-reset-0.1.0.ebuild 939 BLAKE2B c414e22d1530b0c5e7b2d2195851d62c8a395ac78dcbcd84f7408d27a6845c6db885ad6b514654c8dedabd3a4dc5486b998308310bf06de17fd511c0bd6d3dce SHA512 1fd1d2bcb0bfa849f62ba9b085d814ea4fa7d6176f83ce06e782721cea2f82d906e351ef87fb9ef9817161ca73426c9441ab61cbe16a9e8c37d11dbdbd768e99
-EBUILD vendor-reset-0.1.1_pre20220902.ebuild 991 BLAKE2B 53a92746673e20acb4a04ab664cfbd2d8e8d58b046766f5f122b3b2ee5d3d8c16896d131de22bed944fdf7e441856e5c2fae14f29c6946085aa7b6261f3550db SHA512 b7a231f5dfee1ca0fbf932e38e141c3b9babddd0e3e2337f654f87eee494353214fc1bdf7a5f1b9f8b24715c10b67371c5d52c72b8021d3d897fbb8457f1b70f
-EBUILD vendor-reset-9999.ebuild 891 BLAKE2B b1557551cb1810ea7a605db2edbcf92b25be0b3123707df9b85c1dbf4b6cafb5e130ae923dedefb8c76fc28af31a24a5214682d001aa18849a2644a1e91ee24d SHA512 e566d40f4590878cd10ddb8c3ffd57decc54ed32c6335ae12ab632f8f41baae70a1f444f4fb8693d733df3fa52ba0805d02d62018325381295391f0eb521f6c3
+DIST vendor-reset-0.1.1_pre20221205.tar.gz 12725340 BLAKE2B 5f2e34b74e83c8f48daad8d2c714872ab23f50cb0fad6b5c7920476b43c2fbfcf5543e923c506dfb2d8c33846e8fdd08c7d20b30fcc053f2c191d813872b44c5 SHA512 87a3c64d917e6a44308115480f14956f65a9f84fef70de29feebe3fcd7d522b59a3dbcb5fc9a340ac9b7a3612a29ed696b4f52648f86a0d877b915c97c5a4cc9
+EBUILD vendor-reset-0.1.1_pre20221205.ebuild 1107 BLAKE2B 8563f6eca8974270007b633d71b70e5240d5c0aba4b5d163353d1214d1e60359aa1c44d06069c2aaad6757c8401c58e77257801ce95c468b19f282dc329da99f SHA512 726dadee17a21f11c6d5742ad54e06a81b7503fb6a207ccc84f1019e4d3c7eac7a030c3d34b30a6ffa82d95fc824938855eb7ed92829ba20366eaa61671ec6da
+EBUILD vendor-reset-9999.ebuild 1071 BLAKE2B 3842a78f2258c850701ae5bc466643e5751998bc6e7cb06651e92639e441a1f2d8590bc5a9207ac6e1ed9ba7a6f54f1d4e923bfe445c37ee15219df24f551ece SHA512 20cf56ef5031e134e54d110f573790f5c8a9ed855838dddd0124462c98c21cf6dc3ceb4fbc884e5c3eac938d28fd2b93bef167bed514ac4e7f31ef4e7445da77
 MISC metadata.xml 327 BLAKE2B 288b1a0df2469ed01bf576308ddc36c5843b4682333d6e42f0c3603d5bf43cbd6dd9b21cb07020476b9de92445611d04b2c1d5dd54624ed096f166607154137e SHA512 4ceef67a10bc25ed93bd76aaf1ac133b92a362ea0cf030bce21a14f921c3afc868e53e876bde2af91615b1142b3113c2e45a0a3c9a0abe1775c553118e5fbc3d
diff --git a/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch b/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch
new file mode 100644
index 000000000000..9259a3e12bf2
--- /dev/null
+++ b/app-emulation/vendor-reset/files/Respect-eselect-kernel.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index b8a0652..79f60e8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ USER  := $(shell whoami)
+-KVER ?= $(shell uname -r)
+-KDIR ?= /lib/modules/$(KVER)/build
++KVER ?= $(KV_FULL)
++KDIR ?= ${KERNEL_DIR}
+ 
+ all: build
+ 
diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
deleted file mode 100644
index ec57b37fd6fe..000000000000
--- a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Linux kernel vendor specific hardware reset module"
-HOMEPAGE="https://github.com/gnif/vendor-reset"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/Fix-5.11-build.patch" )
-
-pkg_setup() {
-	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
-	linux-mod_pkg_setup
-}
-
-src_compile() {
-	set_arch_to_kernel
-	default
-}
-
-src_install() {
-	set_arch_to_kernel
-	emake \
-		DESTDIR="${ED}" \
-		INSTALL_MOD_PATH="${ED}" \
-		install
-
-	insinto /etc/modules-load.d/
-	newins "${FILESDIR}"/modload.conf vendor-reset.conf
-}
diff --git a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20220902.ebuild b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild
index d0f34c496d9c..ceaaa99a4a5f 100644
--- a/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20220902.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-0.1.1_pre20221205.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
-	EGIT_COMMIT="7d43285a5054e4b2b18dbba771b57d365943a0f7"
+	EGIT_COMMIT="4b466e92a2d9f76ce1082cde982c7be0be91e248"
 	SRC_URI="https://github.com/gnif/vendor-reset/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -24,9 +24,13 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
+PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" )
+
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup
+	export KV_FULL=${KV_FULL}
+	export KERNEL_DIR=${KERNEL_DIR}
 }
 
 src_compile() {
diff --git a/app-emulation/vendor-reset/vendor-reset-9999.ebuild b/app-emulation/vendor-reset/vendor-reset-9999.ebuild
index 64f307942f3d..a0b2326fc95a 100644
--- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	EGIT_COMMIT="4b466e92a2d9f76ce1082cde982c7be0be91e248"
+	SRC_URI="https://github.com/gnif/vendor-reset/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="Linux kernel vendor specific hardware reset module"
@@ -22,9 +23,13 @@ SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/Respect-eselect-kernel.patch" )
+
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup
+	export KV_FULL=${KV_FULL}
+	export KERNEL_DIR=${KERNEL_DIR}
 }
 
 src_compile() {