gentoo auto-resync : 02:06:2023 - 15:29:04

5 files changed, 11 insertions, 11 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 652e2bf11d68..a84d54507a2e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c834273ecc35..a411cad00098 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,7 +7,7 @@ DIST portage-3.0.46.tar.bz2 1148375 BLAKE2B d97698eb3341a8d04980e021e5be8650193b
 DIST portage-3.0.47.tar.bz2 1148789 BLAKE2B 268589c37a6bdc36377f3e407b16bebfb9876adc1d89ee7576f3ebbee42bc0799f5a225dfd53ffedeeded91ca4403383d4811b4f104448c1b2fc6c277ca94ef1 SHA512 abbd2446d0da0b5d298a235c2cc7d2d4e001e9f012b6e22149fed4514b52dc938b0377b2551f45e3505b9dddeedd7170951ff967310708ec3b93610b775a7c02
 DIST portage-3.0.48.tar.bz2 1150955 BLAKE2B ca61adcfa66c96f702f5f05436d100102adbd6b2d5028b100dc2793dba8e0f8d8a17520bc6a4165254e2bcebd1fb798d67f7e0e1f46abc776adc351a42ba93c9 SHA512 46dcfbb833838a16a6c8f8dc4062bd2b9a37d0f34e1f884a74abf74846e7236381c2dfa06cf36c50a978d930834784c3ecd44208ff64f4cc289b7df1522d7fae
 EBUILD portage-3.0.44-r1.ebuild 9185 BLAKE2B d1477b9433d5d369f10b4332293c0686be65cf0a3c343612749e437b8db10e9609167e430dd051fbb8fdbf0c74ca2e8b67fd84868d0e7aeebcd678aaf9c4e70d SHA512 58f4dd151193fd9fb626855a1e05804f4ffe8ddc88f3431db59dde337fb7e07fd319d4583f15108aaa853d1b8ae13d4586af5ab203c2703dc6ff15d5837a7086
-EBUILD portage-3.0.45.3-r2.ebuild 9030 BLAKE2B 8562562b64a6832f7592c215bc81f04930eed7a52839ab9b660984622b4340ca8b107ed2d4751fe0bb32134e379af8c9fb606fc26cfde3b689bd5573c9f2e324 SHA512 51671c98ab74c21213d010fc912f7b5cc41788bc339837774c0f63e1d937fdbb338f7020c6654b81c0af4609b4d3348e14c557b8449d197cb8e2b0ce6c9a74b1
+EBUILD portage-3.0.45.3-r2.ebuild 9029 BLAKE2B c2f3e0ec0b310c0bd23afc4bd2c7197b296d0e66414812e04bbacca08261aa82821b14528cd04f670f17090fb793b520c28fd46027d32665fd1d2d8a0c893503 SHA512 c8e998e5a0003a988de30052e68dbe9064eba135b47b4da142c2d870b54533327bad54fd497eff50a8198834fb31d80d3601892ad11ab14c2ccbe32ca05ebec1
 EBUILD portage-3.0.46.ebuild 9034 BLAKE2B 14f9d103cb065925f1487975448bc3bc2da871676a6216782f8fbda37823a063ffa74601630f316e66a3acf611381ae2e2610138faf6df977b648035d4234643 SHA512 de460773918dade93a80b3bf3253fbe02530024534a4a673c803d0440ebe24e7bc2af5322193864577180af831895096d8ea6cf12477c3b0dab6f0280833e65f
 EBUILD portage-3.0.47-r1.ebuild 9272 BLAKE2B 5cfd00aa50d078fe299c5cf244064ddf63e9b31a713d96a515c6dac9efd4b2e9964630de983a1707831ef06df49286ea123b9c4dd6503162bb107202f60e71c4 SHA512 3914720ad172677040d9016783145c325ae2504df00180811bcb0418ca983f3c843e57d08ef76d749cddaea4a491e4b95148a62ac85de625a33e083b5289f4c1
 EBUILD portage-3.0.47.ebuild 9200 BLAKE2B a3cd513f441aef9205bc0761ee782b82d6721181243d6bef4dab5bbafa47a54a4e470d8eb805a2c31f3ee40b0a8b426578a46cb7bf406bdeb1485b7d20a10f79 SHA512 6b2f57982d6bb6e6ccab936f9cf995817bb8ab93c67f81615ca74151bea13d832a29998ee70cff7a7ac3859c2c5648cfc75ed89af8f807665bc05bc09dd45407
diff --git a/sys-apps/portage/portage-3.0.45.3-r2.ebuild b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
index 235d432c5566..91746a505377 100644
--- a/sys-apps/portage/portage-3.0.45.3-r2.ebuild
+++ b/sys-apps/portage/portage-3.0.45.3-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 374c9813337b..331d4c4f58ab 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,5 +1,5 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 AUX smc-sum-2.7.0.20210903-missing-include.patch 264 BLAKE2B 977008b43b91ff7ee7a1c32ac6ce4221d078c782b36479f5319818c143d99eec0ef69c787e8e170badb54c45bde4bf10f7359bf7e30e84141de816de4334f1e1 SHA512 c75b04f7c44cb273d781648e57c7339eb16c23e37b6cdfe3387444e0f5a4dcb72097d03a78d5f6ec327ba4b739444c93c378f0d2212c845873a387d30517328b
 DIST sum_2.10.0_Linux_x86_64_20221209.tar.gz 20797081 BLAKE2B 2dde47521c0243a02098a4aafb4f8818227c01e73cba860b82ba5b989ee77a8fbc9a665f92222a55830b982b157782839e07e3d6f7c8dbb41b80034bf67428ae SHA512 5627fa6e473429e6fe3c93ef74f6938c9da3481b890435fb56359ea6d7f4b733e9aeae18c3c19895697db2318aa62806eae2bc40e57ca467365ffd9749d0cc75
-EBUILD smc-sum-2.10.0.20221209.ebuild 1441 BLAKE2B 23401c3204a18897f4b6fbee97bd4997f0c923ceae6af3d2e0b5eddff70d5224a2dc6f15877dbe79ae0dea91efdc05ff2c5f42a4e6668ca0df929606ecd2bcc3 SHA512 e919c77a866c21c2894eb850ede49174b88ca74a981900f78d450306e31392c38407e81cdbe7ecb498caf6a23cb58007dd01d574f747aefe1bb0ae4459799621
+EBUILD smc-sum-2.10.0.20221209-r1.ebuild 1406 BLAKE2B 8dcdb9d2de53dbdf98856ed0ac0b02b907071f14a6b98c5892b2d5a3e0cb37c638465b3c9119daa26f92d39ab9772dc4d4c8f9fba3a59ba74de019d67a5edeb1 SHA512 e424ea30ba5fa87cac242ad4af38202f50750dbfd4fc466ef35166d92cdcda1944c8595c6f6b5f2942c174d1af50a8f16640d568a1c841ace7d0b0da912cf4f8
 MISC metadata.xml 1098 BLAKE2B af888334fb5709cdaf9ee12821a8d006e4343d27ae89d51683b30c32820a6250b75b762946a6c7d1f23b7c1383eb66ba4d6b450d5d366bdac42d4df350f5e5fc SHA512 aef30566e58c8781faed28eee5e8574fa7017f90c20065a13868a0c6abaa9e069f425c4826cddbbbbbb84c37b3ef83c13eb46ce1eb829dca0380a2f5ed72729c
diff --git a/sys-apps/smc-sum/smc-sum-2.10.0.20221209.ebuild b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild
index fa73a90522dd..232195afedd7 100644
--- a/sys-apps/smc-sum/smc-sum-2.10.0.20221209.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.10.0.20221209-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit linux-mod
+inherit linux-mod-r1
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN/smc-/}"
@@ -23,7 +23,6 @@ IUSE="module"
 RDEPEND="
 	sys-libs/zlib
 	sys-power/iasl
-	module? ( !sys-apps/smc-sum-driver )
 "
 
 RESTRICT="bindist mirror"
@@ -39,9 +38,6 @@ DOCS=(
 
 PATCHES=( "${FILESDIR}/${PN}-2.7.0.20210903-missing-include.patch" )
 
-BUILD_TARGETS="default"
-MODULE_NAMES="sum_bios(misc:${S}/driver/Source/Linux)"
-
 QA_PREBUILT="usr/bin/smc-sum"
 
 src_prepare() {
@@ -49,12 +45,16 @@ src_prepare() {
 
 	# Install new Makefile to respect users CFLAGS and LDFLAGS
 	cp "${FILESDIR}"/makefile driver/Source/Linux/Makefile || die
+
+	use module && linux-mod-r1_pkg_setup
 }
 
 src_compile() {
 	if use module; then
-		BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}/driver/Source/Linux"
-		linux-mod_src_compile
+		local modargs=( KDIR="${KV_OUT_DIR}" )
+		local modlist=( sum_bios="misc:driver/Source/Linux" )
+
+		linux-mod-r1_src_compile
 	else
 		:;
 	fi
@@ -64,5 +64,5 @@ src_install() {
 	newbin sum smc-sum
 	einstalldocs
 
-	use module && linux-mod_src_install
+	use module && linux-mod-r1_src_install
 }