gentoo auto-resync : 30:10:2022 - 03:02:28

16 files changed, 157 insertions, 30 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0eb3fb547338..03cf559ff677 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 5cd466e166cd..9b8010a05141 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,5 +3,5 @@ DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe482
 DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
 EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
 EBUILD conky-1.13.1.ebuild 4793 BLAKE2B bd580ca59a442b7bb164095cd3091742ec26b41c0d7181474f71259e384ff9147706c2ca35c577dab4dca4489b1256a58755f46120b7b69d08494c8f4db30104 SHA512 c16e1710f4c6bad79afd54187b236e5fb583e727264c5522f818f9bedc01187816ac5169a58671d9180a01347cdab58f695bb5f98c5f7e4d5ed8c31a0b89d5ca
-EBUILD conky-1.15.0.ebuild 4520 BLAKE2B 4fdb448db2b1f7c8236be63f094f80b09c786a0466c2eaec511b6b7f452c714fe0ee5e56f01235e58e6998f81ff72954b4cd387c87f58b1894bdeae405cab058 SHA512 0a8acea091b5eab390a4afb0ef2e83cef6c735fd9680045e8f6419a0e9f33f23867b4a8af1f71830e08c182281360c2e959cd4afcfc1328fd3b8219c6da29897
+EBUILD conky-1.15.0.ebuild 4551 BLAKE2B 9be98d2a3b5498cceb2f8c9c2dafe86decc37f7a831bbd5b29cfd99ef58c69edf266407f15fae4f5a80958c04a04aa98362b9c927c24179012d03f803ecf7a31 SHA512 9cfbb6353e2c1dd362c124f0976fadb47bf726b9f29dd8466df2f4d5f13f1982c440e88235133a64e75a73f25d4e63bf9b6469f14e920dfe739acf79ef685190
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index 8803596b5d27..ec41cde86063 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc extras hddtemp ical iconv imlib
 	intel-backlight iostats irc lua-cairo lua-imlib lua-rsvg math moc mpd
 	mysql ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index 991898040c1f..b7afc7d1a062 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -11,4 +11,4 @@ DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd050
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r29.ebuild 2727 BLAKE2B 864d2d8ab62869133c4f95bb8c50456effa2729286dd83a44bd292fa8d32d074e0d105b2098ce757d527aa2378a7f4bfa89f3895f2ab21f98252cc1961e8226f SHA512 8955a3ac9fdd650388f957e6a25a1d7a0802d18ff88fe4cae58e7e9865c5499ba7b9032ee5c0e917d50c0e50bac18a3b3c0bea1b92d95dc2147b96bb515da4e5
-MISC metadata.xml 261 BLAKE2B ad85ce24f1ddb319b32b2092fc7367c4c8874d9ad594b35b26b6d389d8c713454c11763b592cdd75fa9c3b5aae1faf1a08ddbce48b27b414e52d9cf85fa8efcd SHA512 e5a808d82e549cc05a1fc6dfa295f39c3ac2a983c5ebeb7093dfb63c7478181f93cb3cc434b2447e600c593da4d14e246d1f9633d6e94a211bd662ec76f75c39
+MISC metadata.xml 337 BLAKE2B f61e34c2b24d7aacee0b73de9c50c49a515eecf46360446fa08aec2f6ea83ea04d59fb1d7d876aad31180847217437d1aadb84ce509c23474a9e22179cde5809 SHA512 e46a12105caf6c3f1fe63af7dc2d182fa66796bc38ec09043aabdc561765bc35b5fae2468a1dba767514cad9f3c1a60f26508d3d099ae34fb28d6363ba5a4efd
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index f057c474627f..c3e338c7db9a 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -3,8 +3,9 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="network-cron">
-		Monthly cronjob to update hddtemp.db.
-	</flag>
+		<flag name="network-cron">Monthly cronjob to update hddtemp.db.</flag>
 	</use>
+	<upstream>
+		<remote-id type="savannah-nongnu">hddtemp</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 7c61467a8f54..da0d6f6cfe30 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,7 +1,10 @@
 AUX keepassxc-2.7.3-tests.patch 396 BLAKE2B 998b55785d7b43dfc00ed96548a31816440c49c4241ac702e479127c714d67a6d8980c90bd3775f3a650adcfe10ebbacb3373073f0da28a28464ef6246dee722 SHA512 8948d78c55b2ccad43e1155535b2c7cc980bc05bb01b9e4d732de63946d03f3b2d49bb7cd6ce77f76f8e1192e47d712f3e12bab352138f5ef3ecdc22a41f17bb
+AUX keepassxc-2.7.4-tests.patch 402 BLAKE2B d1d88059d70e8c43f51bdd94ba17222a919059efadc68712e4f6b8e72885f3088ed96793c8ad26f53000e76414b13b9ebcd52ea447b17e7822ce7d3245f30414 SHA512 e401e341c34a117395cb5852f561770a1f65904e6f649cdd2904a89f7b068c53f46e8509d2e4cafc3c213e2326a01838f719d360fde21d63f29962969f3d16ef
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
+DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
 EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207
 EBUILD keepassxc-2.7.3.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
+EBUILD keepassxc-2.7.4.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
 EBUILD keepassxc-9999.ebuild 2484 BLAKE2B e01ba45106ef10b452c746cb31b82359aebc7e0149574c39202ac34ceeb28a0f5dfcdaec363f07af580e89bafb6fd2000d20a37f835050538c26bc84eb3b774b SHA512 bca31898fdf2b92c2728f2c4023702268d797993acee7ed7517b051b43f22a3c6e46d1775b2fa5ff2835f4906a16868cfb7977eaa3247ddbaa27263df592793e
 MISC metadata.xml 1028 BLAKE2B bc89e683ead8dfcedd9c1794c35df27ca535b69ce0036641d71c7df8a2db70060adc0d34a007c9da69765dea4fbfe5df5349d880197e2cbdb7f6c5347baed78f SHA512 abe1527cdd2c26b8f64d6b7e8651325146ffbbd53dc9cf273599901e9e9ac31bd43f2c85d8aad1067ccf807cbcad3d921d76df3666b8983eafe69589c7bd0647
diff --git a/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
new file mode 100644
index 000000000000..ccee26cb5ba9
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.7.4-tests.patch
@@ -0,0 +1,13 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -231,10 +231,6 @@ if(WITH_XC_BROWSER)
+         LIBS ${TEST_LIBRARIES})
+ endif()
+ 
+-add_unit_test(NAME testcli SOURCES TestCli.cpp
+-        LIBS testsupport cli ${TEST_LIBRARIES})
+-target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")
+-
+ if(WITH_GUI_TESTS)
+     add_subdirectory(gui)
+ endif(WITH_GUI_TESTS)
diff --git a/app-admin/keepassxc/keepassxc-2.7.4.ebuild b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
new file mode 100644
index 000000000000..eced3151172f
--- /dev/null
+++ b/app-admin/keepassxc/keepassxc-2.7.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
+HOMEPAGE="https://keepassxc.org/
+	https://github.com/keepassxreboot/keepassxc/"
+
+if [[ "${PV}" != *9999 ]] ; then
+	if [[ "${PV}" == *_beta* ]] ; then
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
+		S="${WORKDIR}/${P/_/-}"
+	else
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	fi
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
+	[[ "${PV}" != 9999 ]] && EGIT_BRANCH="master"
+fi
+
+LICENSE="LGPL-2.1 GPL-2 GPL-3"
+SLOT="0"
+IUSE="X autotype browser doc keeshare +network test yubikey"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="autotype? ( X )"
+
+RDEPEND="
+	app-crypt/argon2:=
+	dev-libs/botan:2=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
+	sys-libs/readline:0=
+	sys-libs/zlib:=
+	X? ( dev-qt/qtx11extras:5 )
+	autotype? (
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	keeshare? ( sys-libs/zlib:=[minizip] )
+	yubikey? (
+		dev-libs/libusb:1
+		sys-apps/pcsc-lite
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	doc? ( dev-ruby/asciidoctor )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+src_prepare() {
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *9999 ]] && [[ ! -f .version ]] ; then
+		printf '%s' "${PV}" > .version || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# https://github.com/keepassxreboot/keepassxc/issues/5801
+	filter-flags -flto*
+
+	local mycmakeargs=(
+		# Gentoo users enable ccache via e.g. FEATURES=ccache or
+		# other means. We don't want the build system to enable it for us.
+		-DWITH_CCACHE=OFF
+		-DWITH_GUI_TESTS=OFF
+		-DWITH_TESTS="$(usex test)"
+		-DWITH_XC_AUTOTYPE="$(usex autotype)"
+		-DWITH_XC_DOCS="$(usex doc)"
+		-DWITH_XC_BROWSER="$(usex browser)"
+		-DWITH_XC_FDOSECRETS=ON
+		-DWITH_XC_KEESHARE="$(usex keeshare)"
+		-DWITH_XC_NETWORKING="$(usex network)"
+		-DWITH_XC_SSHAGENT=ON
+		-DWITH_XC_UPDATECHECK=OFF
+		-DWITH_XC_YUBIKEY="$(usex yubikey)"
+		-DWITH_XC_X11="$(usex X)"
+	)
+	if [[ "${PV}" == *_beta* ]] ; then
+		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
+	fi
+	cmake_src_configure
+}
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 6ab4b1005f4b..cfb1268c42ff 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -5,4 +5,4 @@ AUX metalog.initd-r1 651 BLAKE2B 7b7739ca48acd3ce646478b51639c14f7cf131a698570f7
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-20220214.tar.gz 40898 BLAKE2B 7ef04b9e0cd1ba878a11d988ec4b4bffa3d733f86c6b8cec57d32dcf837fe48a001a233a2b09378443b26f6e69869b8de7afeb25f11bb7729b66e1aa3a305f67 SHA512 44a1443e8f9e92460f128aa35125d50ae247ba4f2ce8fd8cc32b96a491e29963cdc27be12a6db28f286e2d5a2bc6243e126a77ae3eb642e7c969d58446a18fcd
 EBUILD metalog-20220214.ebuild 1608 BLAKE2B ac154c3a01f80ecc0ebb64ce9bb37b69e5335a5f53d9531872faa82164700442299b9d172f16e975f5f27cc9e32b9a0f815b56e96008003d683413733cf10213 SHA512 7db94f90f6e6e2f43032d6b01a20e79f1749cb8c9eaed5ddf5795ec387f23c9cbff5503eb4f1d0993d905c90f0e03938ed5af71e0d3a61572e0870ce859129ba
-MISC metadata.xml 335 BLAKE2B 79615a8fc010da3c58df284f7c0490ca2a56bf0a31761090e4fdbde48f70f98660ab5e682f272a21cd820fb3b52a75b48d42f63d5b5debc5fa767f62eea8a938 SHA512 6ccfe49519ce8c5d9d76bf305993e09c76c2d095e0eea30c3de32947dbe80d6c99385a8bb743f4c78697324d9ae24bfb97b2f79385e5cca16dd753c448f517dd
+MISC metadata.xml 390 BLAKE2B 84c414c7f1c23c5eff546e465a36844c13f5f774c0e53117a1d3584af4f16a1bebeba681f6714af316437f2125ee2f65f0a1fb110699438e8d6a28f4aa0fd6f8 SHA512 5656e552504213e621d2804cc877f623feb243a166b7da0507a3ac1d934db9d438b6d087ba9d7b0d2c38551227bd0c190e42374771bdc4422fc263b894101998
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index acdb1bbf3594..61646ab7d054 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">metalog</remote-id>
+		<remote-id type="github">hvisage/metalog</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/openrc-settingsd/Manifest b/app-admin/openrc-settingsd/Manifest
index 8771a624d8b9..887582652d97 100644
--- a/app-admin/openrc-settingsd/Manifest
+++ b/app-admin/openrc-settingsd/Manifest
@@ -1,3 +1,3 @@
 DIST openrc-settingsd-v1.1.0.tar.bz2 41781 BLAKE2B 1a508c5751a3b2c734b533ebdf72d4c5fa97b67743caf5e47f06fc505a286e92167715e0ec706528a4e9a74d0aed9d78d6b6b2d542c1df3781d5bd76ff700b91 SHA512 f63aa624097a806094c51a6da8fc6f4962c3302ea0acf02be17744db9d5caf4cfd68294a8e8916e62eeeca722cadc571715b9751730f9d9cf1f9be66e93510f7
 EBUILD openrc-settingsd-1.1.0.ebuild 1477 BLAKE2B a7dab01a14659405662a156514646cb8eeb338e132e577e562e129e3da2d4b7d022d4fd9ef47db48d36f9e9f8e1fa3fc709c002c54e1516cf2de6d3a8d649017 SHA512 cad7413f725f60200ca8bdee649cf35432450513c1be10d3ee2a14fa1e063ffb798101f3d23425786eb241dee91af3b9bbcf144582ce2cb136f0b0cc8e5d1d4d
-MISC metadata.xml 376 BLAKE2B f8dda587a8dc49454836f273cafa051b2f62ed0e0931e56f69ede04e40d88c79ed9202f62c33d68b68a54cd5c8ae3422d0909e9a5311e9c570aa35085276165e SHA512 77df97d0d15b5212f2432702b7bac3b2254f2139b4123be6fb79f41c21094907624e4e1fe3e9a303dc3b5bb2c122c1fedb94eca003e10bede624ddb17c4589ac
+MISC metadata.xml 489 BLAKE2B 9da8f8d72d161ece48f9f2bd5ac900836bf5be45de25e604b3742b3aa38820f2fb6b4039062a8701a1aa0e9b6f5893f389b99e178dd31f70ec008928587f661c SHA512 aeab0c7da85043d609af29f344fdefb7d8fcf62b7bdd113dd56131c99d82e738a2ea7d261b4de365443d9dd1747bce4069ec3e0fdcfe2de91fe117726024e127
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index e9500dd5af81..c24b007e3b95 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="systemd">Use the versions of dbus and polkit files provided by
-		<pkg>sys-apps/systemd</pkg></flag>
-</use>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <use>
+    <flag name="systemd">Use the versions of dbus and polkit files provided by <pkg>sys-apps/systemd</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="gitlab">postmarketOS/openrc-settingsd</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index e19e190da4a1..daf686afd287 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -6,4 +6,4 @@ DIST sysklogd-2.4.4.tar.gz 451938 BLAKE2B 218d9487440ab3fa395f596e5e4a9fa95df9df
 EBUILD sysklogd-2.3.0.ebuild 2112 BLAKE2B 1f8cb90a6f5ab144eaebc6625b6ab1bffe003a1e3a1ce8e182da214f9bb77ddcfd2a59b95192f8b68230a2315003792bafd68aa9470b7e8412d3e735de32fd55 SHA512 0c2ab19307e93aee1773fd759c734de47869b555b2abe968e3db5ebfb6ad9bbc01c94d2be128fe7e1553a584bd69bbdb59919cd495a6d272022f49ddb486c39b
 EBUILD sysklogd-2.4.4.ebuild 2100 BLAKE2B 9445ba98080898d1423312f377c871742a2d3c1cc14555418743cbe567d2e165dd1aca21ec8ce713e679a343140b914e140ea95c4d3eb58e7c704511d1a4ce9b SHA512 6098d606062db317788d64b74d0acdc5425c7dae3180c4a08bdca4c182482d3a02c05511604f00adb09175a10a6a99456c482f2aea1dc11921eaa98045902f39
 EBUILD sysklogd-9999.ebuild 2106 BLAKE2B a8385ac39db7d3a9b2b92d338f4aab266f2773d6f53ef8fe479417477172fa25330cc61e95a51d7e640edf2488f5c3229161cfc8f5067c4cfa2d8034cef3da37 SHA512 b7e2e4f7b55e9d55ee01d4bc6541f87a8f9e4ab5c57d9a7686a9cfd4ec4591b6183e7f8b6a4574586c88e65c2abea60292d284ca44086fbe57ae0f1a70aacab6
-MISC metadata.xml 444 BLAKE2B 9225bc0d7317c6040d656f84c24818e3172741e79d3b2af8806061fe89d00ee1d278b2cf6168c3a1ee4bdf91bcb68ec08162e2340a7a9fffff2c4827b95b3543 SHA512 51daa61fe2af9155c526d2ba89e840867bcbdeb3c346c305fc812c1e8016c86e82c89578ab02c9ff46810a8a45894f4a0384097d07b7c571f0f55cfa2822cc28
+MISC metadata.xml 527 BLAKE2B c425ac629ecb84dc5e6df9d943d5366594bcfc95eac4f529720c97825f4192d4ecba8d3f5174110e654775faf368a73ef91117eb63123d09f5f6ae9880d6ddb6 SHA512 9a4deed01fed81180553cdac43d0a03967fea0aa2a1ce1747faf592abee998c8fde4744b5cd90adc3dbc324e62df7479c686297364010aeeafc09128981fee27
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 820601cdf92a..deb7717010d8 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -9,4 +9,7 @@
 		<flag name="logger">Build the logger program</flag>
 		<flag name="logrotate">use <pkg>app-admin/logrotate</pkg> for rotating logs rather than custom cron scripts</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">troglobit/sysklogd</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/system-config-printer/Manifest b/app-admin/system-config-printer/Manifest
index b662d8db02a8..bdea13d95416 100644
--- a/app-admin/system-config-printer/Manifest
+++ b/app-admin/system-config-printer/Manifest
@@ -2,4 +2,4 @@ DIST system-config-printer-1.5.16.tar.xz 1382124 BLAKE2B 37548bd470f8e80026e014d
 DIST system-config-printer-1.5.18.tar.xz 1396808 BLAKE2B 910e853829ee876edc597a3103b5ab857b3b8c1cb87096f25213b1088e35d9f4d320dad61f55b530283a7650b07abe028a53b4e144b33b1b66c733cb2caa8011 SHA512 33dc9c52d92f4234e055fb10a99cadd58424dcdb62554797b44bdd5319f1c3662bd2fa33417ac3a3f5ec51216d64e81e1897f3e671eb49f6be34057d7c38f3f4
 EBUILD system-config-printer-1.5.16-r1.ebuild 2074 BLAKE2B 6064a0cccc81f78fab6769164ddc870adbf2e2472421f162c0d6aa7bec9a67a8ed1cb19e7327bf8835b051a710fe5aeaca49b04722db40950631c23368728990 SHA512 0d077bc93964462ff9a79ebfcce6c5bef72e15bea4790549c9318bed814a7bf6b2702a7acd57c680010c1e76abb316099e54e53fd427985c6359c80a9ff1a3e6
 EBUILD system-config-printer-1.5.18.ebuild 2079 BLAKE2B c71d502bb5cb4e41b2e43faf2db3cd1e73cf0a12271a7aa7ae57d0052e36ff91ddc16af1fa2f4c0e0193c344190096356e91e4130bbfda4a54560f743505b82a SHA512 ebea287b17f3528335eba688f436a0518e5944af93ceaf3ce41892c5c8bf32c88760383ad3d44a5421024c0e0bec061b56a7b7bdd3e2b81bee35f1b7ce0fae3a
-MISC metadata.xml 464 BLAKE2B 6b9e1c83ddd541fa865336261d248c43e24354dbe1fdb585436bdaacd6cbbca9949b54961c0ad32220326b168650c377862640c50c2f40ad61106fbbb59fa3c4 SHA512 20f80adda8d894d92410585732a88565196b6cd10177bf5ed93966cf450d6dced89f46a840fd5c5ce26a9d7ac2fc42e59fbb8f789eb1f7f594e95da7a0cf60b8
+MISC metadata.xml 597 BLAKE2B 4691f7f385a864b26ed00b5d05310d45aa52d1cbcfb118ec4b1323df470a761162bb7c037cc8eec253f1dd5302d0036379044e83257ba6be43d878b28ebf11e6 SHA512 e4b52d3a4070116472e4fb617796a7cdaef0b3cfc825ccdc39392b5ba63afdedad4232a9eacf89c209a3202d95c2c0cadf17ae8d3698d2e2258310cebfa89744
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index b1e4e8c877ae..e34a1cb28469 100644
--- a/app-admin/system-config-printer/metadata.xml
+++ b/app-admin/system-config-printer/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>reavertm@gentoo.org</email>
-	<name>Maciej Mrozowski</name>
-</maintainer>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
+  <maintainer type="person">
+    <email>reavertm@gentoo.org</email>
+    <name>Maciej Mrozowski</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">OpenPrinting/system-config-printer</remote-id>
+  </upstream>
 </pkgmetadata>