From 9403c20e10161812ed5231e7fd14464ca484aa09 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 28 Jul 2022 21:05:25 +0100
Subject: gentoo auto-resync : 28:07:2022 - 21:05:25

---
 sys-apps/Manifest.gz                    | Bin 48148 -> 48145 bytes
 sys-apps/fwupd-efi/Manifest             |   4 +--
 sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild |  50 --------------------------------
 sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild |   1 +
 sys-apps/fwupd/Manifest                 |   2 +-
 sys-apps/fwupd/fwupd-1.8.3.ebuild       |   3 ++
 sys-apps/gsmartcontrol/Manifest         |   2 +-
 sys-apps/gsmartcontrol/metadata.xml     |   1 +
 sys-apps/hwdata/Manifest                |   2 +-
 sys-apps/hwdata/metadata.xml            |   3 ++
 sys-apps/kmod/Manifest                  |   2 +-
 sys-apps/kmod/metadata.xml              |  27 ++++++++---------
 sys-apps/pciutils/Manifest              |   2 +-
 sys-apps/pciutils/metadata.xml          |  21 ++++++++------
 sys-apps/systemd/Manifest               |   2 +-
 sys-apps/systemd/metadata.xml           |   1 +
 sys-apps/zram-generator/Manifest        |   2 +-
 sys-apps/zram-generator/metadata.xml    |   3 ++
 18 files changed, 46 insertions(+), 82 deletions(-)
 delete mode 100644 sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index add4e28fe9ee..280666a46643 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/fwupd-efi/Manifest b/sys-apps/fwupd-efi/Manifest
index abf98fceec03..6767e348a55b 100644
--- a/sys-apps/fwupd-efi/Manifest
+++ b/sys-apps/fwupd-efi/Manifest
@@ -1,7 +1,5 @@
 DIST fwupd-efi-1.1.tar.gz 37079 BLAKE2B 6f9d97f969aa8c4e7f220e7914163ddff31fa841469b30e9ca73c76d49b753edcfd6e76df68b408533deb14e230240c9d15278eb8d7d490e45f10f28a0993cd6 SHA512 ee2c1039de87a3580cbe47bb5818015936ad7ef00b3bc8fff644c858387e5c5b3fe84e075e01ff9069218b04474774abee4a13261a2d1dd786e0e6d3bfe5833b
-DIST fwupd-efi-1.2.tar.gz 38867 BLAKE2B aa1a877db06dcf8347dff9411f9c9475b40e9a5f533949b254170c627869c61c5c3b17d9cbc9075af9d4f5c534befe1ab89f27d4684d1f7b701d50ab4cda2ff0 SHA512 c08a471ecdefdf40c94750954595ad1279da204e939517b62f223e0003a258840e7d4725ec74d77ccdf46906561d8ac987dcc67a9d3f6e9ba99219e16dd350de
 DIST fwupd-efi-1.3.tar.gz 39122 BLAKE2B f295869038f485026b8e60977faf76ad81f1ad11474d13be9a635b1a014daf79ee4250a44dcdb4b79f887a3093ba70a470dde6e8376bc4c064cd30c64c76cddc SHA512 3f17bc990de15e48d7be7302992d51c12b510a793b556ac269fcf3b63f83cc3c257bc852de23ee44a0de1b96eea324277015265c42ee41a11b88368a3f4b38eb
 EBUILD fwupd-efi-1.1.ebuild 1067 BLAKE2B 2dd3c612da1d7fa6603aa6df5589c6d04f3d73a2256952c991114e93842bb0a9f020843416a9fecd44af2361b62a76c91a8dcec8abf97c55717bd58a26a49694 SHA512 014fb50779f0f0dced8f8a6affe6cc4b12171f1e24562f6c27539e458e9ca6396a59e9db18ac1e320cfd05d1a413674be3099b6331087e13ac2b82271ae0bc48
-EBUILD fwupd-efi-1.2.ebuild 1039 BLAKE2B bbf5723c4961a0b883b8d6f48a594c665167d959fd0515bb776d9edf8de3ff48301d1ec037e937dee472f03f36c74e4c57b9ebebd9767190ab033938bd2dbe23 SHA512 7a202e3dc391e038e8083be7ee9c80043786247c9cde956019197359fa5511ed6fe9cd0fa8ca2991dea8d146b2249a4676c0923e7257806ae40299899c114a4c
-EBUILD fwupd-efi-1.3.ebuild 1038 BLAKE2B 198002a15e3a073a641061bb31f7154bf1c86d1f88381d628af3840ac856daacc45e571815029d5fa2e25b0b827ce152202799821564ec812133c6037ddaee80 SHA512 99e3d83cde5d20f9ebf96fd186f67d4ef2eacb1b4f4fdb2d731890fbacdf77b471acabf7f636792e7622c3b928134b74a60810ad04cc12149b7ffe658a1087c9
+EBUILD fwupd-efi-1.3.ebuild 1084 BLAKE2B 602c779689e11e91fcdbba11eb2b1d61e8a0c319f57a8cc06271ec04e7a3577171258861d91fcceaf79c934fac44215540e2c9081b382baf2f38966c299c16bb SHA512 1151570d8986db4b22e4a4b4ea44a79e2f6e5388cc4547e50fd6ac059d12059a47d85502a78997435f8d4b77e266a814b7c42e72330217ad37525b542c6b0a4f
 MISC metadata.xml 502 BLAKE2B 37525a0056ad72eab2b2b7b15436181a8581075053704012670e1f0434c8af74bd0780f16f31fa5cd2c8836bc2e4d8f55dfd5a77140be83ebffda5ca9e1a1382 SHA512 70ccf403ddb8e4d33ee9cc6ba438583d42ab313784c3251919b74a6596c4e3593263a6400513605c1004bc0d3ebb1677febc31449096b825f688ed1cc7052c31
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild
deleted file mode 100644
index e7bb5a79d7d4..000000000000
--- a/sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="EFI executable for fwupd"
-HOMEPAGE="https://fwupd.org"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fwupd/fwupd-efi.git"
-else
-	SRC_URI="https://github.com/fwupd/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DEPEND="sys-boot/gnu-efi"
-
-RDEPEND="!<sys-apps/fwupd-1.6.0"
-
-src_prepare() {
-	default
-
-	python_fix_shebang "${S}/efi"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-Defi_sbat_distro_id="gentoo"
-		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
-		-Defi_sbat_distro_pkgname="${PN}"
-		-Defi_sbat_distro_version="${PVR}"
-		-Defi_sbat_distro_url="https://packages.gentoo.org/packages/${CATEGORY}/${PN}"
-	)
-
-	meson_src_configure
-}
diff --git a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
index 7fff4de7760f..ade0d8be03f8 100644
--- a/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
+++ b/sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
@@ -39,6 +39,7 @@ src_configure() {
 	local emesonargs=(
 		-Defi-cc="$(tc-getCC)"
 		-Defi-ld="$(tc-getLD)"
+		-Defi-libdir="${EPREFIX}"/usr/$(get_libdir)
 		-Defi_sbat_distro_id="gentoo"
 		-Defi_sbat_distro_summary="Gentoo GNU/Linux"
 		-Defi_sbat_distro_pkgname="${PN}"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index fb48895c32c8..40b4ff0a43d8 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -10,5 +10,5 @@ EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9
 EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
 EBUILD fwupd-1.8.1.ebuild 4922 BLAKE2B 99f3888b9c3c2ce2f793f14ccfdf7a4ce725a6c9a026cf6cb9090aaad0e800d2524932fbfccd92b6f9c1753d06aa0de010beed72dec663fb384edc376accd831 SHA512 f333e07a813fd0e25d9b48731454f450f8467e60db6732a40855c4934e9e1354da4e6f6bbab6fb0991d3502445c694b329d40eabd4ce7104a27d5c54ab84a213
-EBUILD fwupd-1.8.3.ebuild 5224 BLAKE2B 5a6cba4d1da6c0af23594fbd0a29c70e99a8bf4574a4c4da048e339a2e72c5a4a4a0d6792c8a13a342337f40b30621093c21eb1d3d37f2da4ce00a56b20786c5 SHA512 86d946f60e969c552d5276673225415cdc84186dac8a57425b5d2ec3f75dc46bd2211201fe42b4e747d639f8e715680e672f67d0713295c68b6acc195d56c468
+EBUILD fwupd-1.8.3.ebuild 5266 BLAKE2B d08e99c72593eea714b5f3670f44ac314cb9d40232a1c86e3a74b3035691c7bafecf7fc9d99cb07531c1c0d757df8132b2f2671303b96207765b79d22be708b8 SHA512 d12fec962668911e9d32081773301b979d342eb70760a69004a79f07ad4db5eda66092ae0a25c39c37cfde1d3339b3d19d20fb366eae22fed38095c0749a57ed
 MISC metadata.xml 1527 BLAKE2B 0cbeb805ede86d77bbd736349c84de642534059b2c90d938bd68c3caf0ff90257f3579d20eb38313f10a99f72780accd242601d778fd73386a727cad362a9f48 SHA512 9a541ecead0fc13a5cd78bcbcda425b9b2f4029dd921f01dc0ab1d2055ffcb0690d1fefdfbb98c68ef168c150178f75d085eeedf0699d35fd440d0b4d730a8d2
diff --git a/sys-apps/fwupd/fwupd-1.8.3.ebuild b/sys-apps/fwupd/fwupd-1.8.3.ebuild
index 2d52acf698a3..4265a6081d1e 100644
--- a/sys-apps/fwupd/fwupd-1.8.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.8.3.ebuild
@@ -107,6 +107,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	# c.f. https://github.com/fwupd/fwupd/issues/1414
 	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
 		-i plugins/thunderbolt/meson.build || die
@@ -118,6 +119,8 @@ src_prepare() {
 		-i data/builder/meson.build || die
 	sed -e "/install_dir.*'doc'/s/doc/gtk-doc/" \
 		-i docs/meson.build || die
+
+	python_fix_shebang "${S}"/contrib/*.py
 }
 
 src_configure() {
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index a8c815af6db3..9e39aae408ce 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -2,4 +2,4 @@ DIST gsmartcontrol-1.1.3.tar.bz2 677998 BLAKE2B f444dd29602f6934b440650e57d5d981
 DIST gsmartcontrol-1.1.4.tar.bz2 691155 BLAKE2B 484452b85e848ca9d0539f9fb9e63fc60f837d5e5de1d85d6ef6340fba194ea52cb2026682b263b1391a59eee4ee846dad3863dc1f0bd00296015ddcf86dda9a SHA512 a59147f7adb76fa1cfc55198d175b38f7840c0ec07563bc020757d7609891c8f67953b87a867235821f90c52bc3c8e40a8d8a57a1429e4b75a3afb3a2ada42f1
 EBUILD gsmartcontrol-1.1.3.ebuild 1009 BLAKE2B 68fbd4e99795031f6d1124cd756f30f271746a7546ffdafb0d9c0d765292e3415e163edec83d6d692fd21ce29aab2d3fcc2db0e38817939d561458a28e21037b SHA512 a05864d911a09af9a435d3c132e5aae57eb8a458fcb818a18d4d4040af55467b620aa35a8b8a202acc3dd32fe9722a0c1afc474b223dae5a8f934a9daa83f97c
 EBUILD gsmartcontrol-1.1.4.ebuild 811 BLAKE2B 262fe0dee900cbb0436717bd8bd5804c34766e292c4d0003df07721e667b2ccfe1b98974530c3829598cdd4618db78b0d5b3012b423fe7b0b5ea6526b3ca605f SHA512 3f698126ff2a7b3739210b48723b94b325d92c8556283dc6155e5466851d87cd1a8c2214a788874beae5d9fc62085aabd735e6878625e95f41a6e005640f19f2
-MISC metadata.xml 341 BLAKE2B 0186090acb3718e9c11fd0acea1cbfcbb7222abda56ede52e5c40fd30b61572504a7905b86962c446a87b4ec0b5d7787d5e2beb8255130d97b40f8255f328843 SHA512 df6c99e8f920b1588d2ddea188ff4a9b4553e75a0c5d1a98d43c2ba1b46ef24a7a63a06865db71ab61cdf761b885a1017ca622966cd4ba5462c32a3822464a67
+MISC metadata.xml 403 BLAKE2B d956dd9002a8aff344b2f3ef3828ce9d9d7f765a94c3c53155fb0a71d4c1b8e65a1139e00d4865b06baad3bdd87995af9d242fe8e9ad0a6cb3d172ae68b3cb55 SHA512 785a051ea2334eb59b738ff41a104b40bbc8cf3aa2922bc4697abe74138df34dd6a8bd5c8fa905c4f560685126e8c072f4348604e38a70f9b7c41e2e7885fb37
diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
index e72f0c9fbf35..46eb3aab15c3 100644
--- a/sys-apps/gsmartcontrol/metadata.xml
+++ b/sys-apps/gsmartcontrol/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Base System</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">ashaduri/gsmartcontrol</remote-id>
 		<remote-id type="sourceforge">gsmartcontrol</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/hwdata/Manifest b/sys-apps/hwdata/Manifest
index 7f5e88f9ee7e..80dfbee8c904 100644
--- a/sys-apps/hwdata/Manifest
+++ b/sys-apps/hwdata/Manifest
@@ -4,4 +4,4 @@ DIST hwdata-0.361.tar.gz 2263204 BLAKE2B 83f613dd75e677bb25e884c00e8c32aa97e1b03
 EBUILD hwdata-0.358.ebuild 700 BLAKE2B 3a2ff9c72dbafaa512759e46ecfebb10a2195b97ef2fa32e17c53770d089b7d21609c788b5ad17e8658c66bca25eb6d756be6b5177e53072517888e728c986e0 SHA512 494b93597c428fe331d4915b35b29a849876d4079db8a5b450367307b8b58f1f4d208d44279fb6ac25faaf51aeda18c3618abe0e81f0c95a1e7c29e404e2a79c
 EBUILD hwdata-0.360.ebuild 708 BLAKE2B 1412ce67e1332c9df371a9a4bb0c68a94f24cd430b54102c4b2d9adbb6f0254fdc5359da02ffab4e463a9d341b3f81a4ed5bab4dc50be30894ff042c624316fa SHA512 68c36e8ae23c54c25be73b797cf9233d1db5d61591a7ef2150b0e63143c6bd825d784e5232e3abbc0a1adf7811d8e34477c803b428d269949b7557589a670b2e
 EBUILD hwdata-0.361.ebuild 704 BLAKE2B e40a0fc670739174b895ddeb0fc150d0d7112caf9e01b4b7cf8a6a6e832237dd493d1d9b48c1c496ef162eaf452db10e1ffff03a7f2e41d4e189e29eacc8c4bb SHA512 6d81bf29ab974be19d3d3f1abb835373d9babbca9c949293ec5b0b3bd76648354afffbb0d074f6f59e0e62c762ae4da0adbbeb179c4b24dcf822a0725a0ec60c
-MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
+MISC metadata.xml 328 BLAKE2B cf72c9663e944154e41475067b5e89dbfcd50f0c771e17dddfb6042a2ccb10693d7ef6eb7508e9ec7a50cbc59e8e47698030a5c1e18accd79040d4318416eb54 SHA512 f366d006f709fabe624840768aa780982884ba8a74f3ac121e323995e218a577dc5a4d34d9dcbec44571580d388967d78350d4540316444ddaf014b99db804e7
diff --git a/sys-apps/hwdata/metadata.xml b/sys-apps/hwdata/metadata.xml
index 8cb7f9b298b9..b94496ecd92c 100644
--- a/sys-apps/hwdata/metadata.xml
+++ b/sys-apps/hwdata/metadata.xml
@@ -5,4 +5,7 @@
 		<email>base-system@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">vcrhonek/hwdata</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 33e5e080f0e9..335822d6096f 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -5,4 +5,4 @@ EBUILD kmod-29-r2.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd0029
 EBUILD kmod-29.ebuild 5236 BLAKE2B 8674297d2f9ba5382792f4ca756e3fc47e6558020dd11d07c590232098d14f358130163733d5338cecf13b55b0f90086011bab2e4a753de8fc17f17cd22c7e07 SHA512 f576e67fd863468a49fa0b17a70cc654cce65675a10080911a210a07392a9b542d5706d63eba6daf5662be4670e2e254afc70780c9d50a7fa6ba7c967df94a41
 EBUILD kmod-30.ebuild 5294 BLAKE2B 1f38d5a0fdfec0113ea7fb8dc62b33418bd36521c91aacb7dfad983b1dd4c77f47af94d464330f9af824a9fc8f6e3abe8552bff53887274df34b73be07825be3 SHA512 081fdd6bee6eecf7f10424a868f21db7a4b269eca9ca672038d84f315be9717e5005943739e5e92d3cf5f82dbd85ceb6b417f40e69fc0476c574b09d9edee337
 EBUILD kmod-9999.ebuild 5291 BLAKE2B 7528b891100e568a324649b865ff22b22d5dcd00294f70514ab62ebea527983b4a2e0a79f9fba4efeaf4a20621fa2243691eb813b70e5495e6ad33aa820580e4 SHA512 52a755c75b47c5d52a4f15ccddba16e21ecabecd7ecbe48f85bae9e5334c22b73ca5677a2ea3397aa0429b562a46b6a46b68bc15d75ec716679c0f2a61e812da
-MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
+MISC metadata.xml 681 BLAKE2B d99a380ff37258528d263ede7c4752ffbb9abfb458674e884504a3618d574cffd0cad0da260e9bca208c5bdce1878ce7b3bf26e48fe883e812c5221c6ae38a53 SHA512 032d9a89779ae60a3e34f4d5cdb6b89c6f07bec68dc23b063e1b06f57825cb071ea89322f3bd9408b2503dab423fef3bac42ab5c8a9ae899849f51e38e0ecef3
diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 9cc925a0b0e9..20c2f19925da 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="lzma">Enable support for XZ compressed modules</flag>
-	<flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag>
-	<flag name="tools">Install module loading/unloading tools.</flag>
-	<flag name="zlib">Enable support for gzipped modules</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:kernel:kmod</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="lzma">Enable support for XZ compressed modules</flag>
+		<flag name="pkcs7">Enable PKCS#7 signature parsing for modinfo.</flag>
+		<flag name="tools">Install module loading/unloading tools.</flag>
+		<flag name="zlib">Enable support for gzipped modules</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:kernel:kmod</remote-id>
+		<remote-id type="github">kmod-project/kmod</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 4dcdb905d5e2..81645acc5642 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,4 +5,4 @@ AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 EBUILD pciutils-3.8.0-r1.ebuild 4915 BLAKE2B ddc1ba11cefb65a69392aad79260482827a62476200518f5d5aeac8209713b791f5fd389fcdd93c4acb3e40663180338584b17c04ea7148a5123a8bd274d0909 SHA512 ea895c2400ea0af258d0dc1151e81b3f972218f03054ddc20edf847fe053794d7286932fee44f008f53f641193bcdfd8cfac8b08800f4b0a620ae30e8591962a
 EBUILD pciutils-3.8.0.ebuild 4709 BLAKE2B f3954f5bf30d0fc063fdd27b7e1c6824ef396a8f922d5ed0b3180a1ea5036a6d04f79acfb863919f1f00466f6070e1f42338d89fa937fbf2b9318987bea4d7bc SHA512 dfacfe7264bacac6e00c252f20b04366a72cccb47f7629bd8dd12541be9d4daea82c0359f6407bbc566bbcef0d6f875de69bbdcf147506bf19080d2a347d0b98
-MISC metadata.xml 525 BLAKE2B 5a7a502d28b6e74db1f1f008adfc5d9c398fb7832c8c82e066c9d4834726a0cd1e97b9738ca21906468f3c2444f20bfcf715339a1314e34b2b43d4f5c631a659 SHA512 5e53a4261ea0aa0d58f7a16b5c8ddbc2e6bda130e49642a9dc220f39cd6a77b8fdf22c22fd7def106d4728b880b75371feea3d552981d03294b86b8cb7fd08c0
+MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index c6961f232f5d..708b18c7834c 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
-	<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
-	<flag name="zlib">Support compressed pci.ids database</flag>
-</use>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
+		<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
+		<flag name="zlib">Support compressed pci.ids database</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">pciutils/pciutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 67b5a761de0b..0ec4d467398b 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -14,4 +14,4 @@ EBUILD systemd-250.7.ebuild 16382 BLAKE2B 465a4e903c31401e7f0d8804dde61cca9df521
 EBUILD systemd-251.2.ebuild 15630 BLAKE2B e107322c07f313e0ec5bffaaace81074c71ad7d8ec33d71382ba9726552b0ebd587b4cd8b3b52093deb38e3d11b115eb41854cc76a43e9794e08eef0d724a30a SHA512 1b9cd6a6dd45185f40272a29a06bcd8eee8de4a0d9a2469aaf487d3bf476dee439170ee089bedce41abbe83bf98bc7f9ed752dcda441eff13bf60c41e2caf005
 EBUILD systemd-251.3.ebuild 15598 BLAKE2B 74279a36d028eda0f23fd9c00f576ca295a26841a91162e7f5e27152d622970e66ca81025d76e281ae1e5d7f870aff19df8e1cec4256433a059511185b026c17 SHA512 86b01c5359c4fa70805b87eda6312d6fe8cea762d7f2ada563b6ab5893a0ec556c007423915ddd800aa1a1cf144250071d7335168cec8156aa05d59f5ec7e56a
 EBUILD systemd-9999.ebuild 15462 BLAKE2B 1208bd9c96e23d479a545385db048e9f9aac405a5b011fe8de6af40e190ad4e855d69136bab6874d0e152baf5e22b2e03cd6ceb31a0d654c6cc1b7690a625d05 SHA512 1360af2b5fb12c687a773a572fa8a31f03efa7dc949ffae1ceb0f24c10b9e9f7792816f5e2362e9d82b315a6280c5bcddfff2514e33fbc0ffcfff1e0547fee22
-MISC metadata.xml 2693 BLAKE2B 20bad229300b6a8df613533c9a66f75364cfc1eccf046999c8fa5646737afeb9b1c048b9954f0f81597b78d51db3a5f5de3416ec46bb997eaced90efb6c3388f SHA512 de6869537d64417c78a41650137cb16e7bc39585fe464befdbc6efca57edfb72bb597d30fd5df1af611390d21114ef80b2c9cafa80fe85da1c563133f1fb8d68
+MISC metadata.xml 2755 BLAKE2B 54ce05794b190925dbe103ef494c904d23a3891765dcff82ee09bbe6bcafece47362e52522828277978309566eb8eea5b850afc6f58f18c628d3a6cf989bdc58 SHA512 23851ca77dabeb4a0b2c7e5853ba47550955369af5453c7af74e73515380b8fd0f570cf9d552127cff1934793b72e57581b13630c251431c9c612860b6a4d6bc
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index b6426bde80a1..d9f94345f7ab 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -38,5 +38,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">systemd/systemd</remote-id>
+		<remote-id type="github">systemd/systemd-stable</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/zram-generator/Manifest b/sys-apps/zram-generator/Manifest
index 626437cb902d..97dc745a0713 100644
--- a/sys-apps/zram-generator/Manifest
+++ b/sys-apps/zram-generator/Manifest
@@ -38,4 +38,4 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST zram-generator-1.1.2.tar.gz 26483 BLAKE2B 20a3519c21f543626efb4bf507f0f59dc6dd2ec208eccbcbdbb07a96e7f03ca5539cda17e4a96187267f71f3d771921f7a83fbdab26051c312640c1118a3b186 SHA512 334864dade2c5e0ca5519c0d1d3448e115440538dd04d29857f71cdb6383c65afebd022903f7fa768824becd90072a6a15ed9e1709bbe2676fb71d9f6b9b5f42
 EBUILD zram-generator-1.1.2.ebuild 2087 BLAKE2B 16cdc414273a35645f1ccaa877a413b2bda66332fcc163ac839ea1e916cbdcafe4a70e94e27e60ba859c7151bcb4eda8536525fae52a50433c0a152b0fe869a0 SHA512 37489b95e989ff8197ec4f3d45180d9b3d045f474014ce9af2d25822e8469f3934a408dadc1ac1c602a30347ad6198aa16450bbc77189fd9dc75627814c10643
-MISC metadata.xml 215 BLAKE2B d2ce9b6179c543801bfe26069c65df723eaac4c8bab2d6ea1bb78f41a6ea032fb4491adee16a11e38342158c312ea625113cb362f5da840efc2b432ba3117fe6 SHA512 375665b8997b26eaec5c9237b5ccdf8628af5fd54548e85ba80c12e34e6afe8304fbcf7dfb30f69c6081e9d45e372ae2603efc778421586a13ddfcbec695cf87
+MISC metadata.xml 302 BLAKE2B ea3b44f9fec6a8b2d8f06495adccacb08cc188b7de8ec5fceef90ff16f38196f046157eb58f2b4fd8b0ba554dc3fa73bc05fb8fa20cd3e0dd66467e3651385be SHA512 ee3878e2af4b0382469befab07b5e99bfc45a74e74b611c70326efdbb1a2ed7e973f22ac271b683361b581b79e60733b98537b093b5cd86680350d36770c197b
diff --git a/sys-apps/zram-generator/metadata.xml b/sys-apps/zram-generator/metadata.xml
index 5e28a56d9b0d..6982ee5cb5a0 100644
--- a/sys-apps/zram-generator/metadata.xml
+++ b/sys-apps/zram-generator/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>sam@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">systemd/zram-generator</remote-id>
+	</upstream>
 </pkgmetadata>
-- 
cgit v1.2.3