8 files changed, 13 insertions, 50 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 5074547cad09..306fa8f545fe 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 51c747d1776c..bba4ff93026d 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,4 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
-DIST cpuid-20230505.src.tar.gz 148584 BLAKE2B 6f1e6f9666b22d3df8e93ff695a650d2cd6d8c12531ede58d2f9517bbd03e2bd833645a7ea26df23c2edee78507b2ffb9697684c3d702c5aae48dca6e97222f8 SHA512 695b7bab729526021decef57e938d74188bfa4e918435367550f950373760e726b60a278ccb92c91013624a06c077124182f51077b50f60b1dbabf4ff1740461
 DIST cpuid-20230614.src.tar.gz 149777 BLAKE2B 5ebfd7d055f2b67cd158dd6eaa5467a5776170a879a4323e2dc103e8b84f4cf72523d5ae5272d2f89ae6555f597d903bdf149f279f9565bf88a1e26b0e574606 SHA512 46698e5565d1c558e50b9526154489d82ada64ea5dbcebc01e3cd34b79b2b646f324deaf7d63678cd477d227e902437c3ff6c7998b4385ddd373aa1fc76ff70c
-EBUILD cpuid-20230505.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
-EBUILD cpuid-20230614.ebuild 602 BLAKE2B 432fc76d642caacbe4160969eb9af0d50b5f5a8bf2741eacca6ebbdb21b435f5c800b6b9bf78fb87a08d5e74810b754a129447ac5aeb094f641d219ebb23601f SHA512 274de9b03d2a816315f2f45d0512979cd03dfac584a059ec3027a66ef57ce5697600852542f141d11b7a84e451e2c74718801a98d671381b9c833608efbb2b3f
+EBUILD cpuid-20230614.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20230505.ebuild b/sys-apps/cpuid/cpuid-20230505.ebuild
deleted file mode 100644
index fab516d7110f..000000000000
--- a/sys-apps/cpuid/cpuid-20230505.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-BDEPEND="
-	app-arch/gzip
-	dev-lang/perl
-"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20230614.ebuild b/sys-apps/cpuid/cpuid-20230614.ebuild
index 18c1efcd3afe..fab516d7110f 100644
--- a/sys-apps/cpuid/cpuid-20230614.ebuild
+++ b/sys-apps/cpuid/cpuid-20230614.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 BDEPEND="
 	app-arch/gzip
diff --git a/sys-apps/uam/Manifest b/sys-apps/uam/Manifest
index 7ce303767030..e3415a8daf6b 100644
--- a/sys-apps/uam/Manifest
+++ b/sys-apps/uam/Manifest
@@ -1,4 +1,4 @@
 DIST uam-0.3.2.tar.bz2 60508 BLAKE2B 35accde4ae392f33af0d1c0f30069975e30691927dff33ac754d00f1de7b30d1b789e9797637f9701913796b5993add4b2405294fa47b1fbd6f8d6e1946b1ad8 SHA512 4a4ee9286b3762227fc5a03a10998cb3b4a2f110cd648bb2ed45f400e31218a17d3929c83450e9190255bda1f22f4001a7f33842999b79c27aa12fc11f286273
-EBUILD uam-0.3.2-r1.ebuild 1277 BLAKE2B 7c8a7d45b9abdc764cad516d4bcfdec3981867f546cc7a1c1f70e4225ca96777f6413be986d6c651453b274fbd457d8eaf0f6ebd2dd96372ea783a20c73f3144 SHA512 5a8fd72fdce2e75f4855c25ba3ae68a5de0cf7c61b3706c3ee3cd52da03ea6f44c1062e72feea337dbd6234e84e7c262d5acf06d3abe307daf2cdcf40048d864
-EBUILD uam-9999.ebuild 1314 BLAKE2B 68fea581b335c0cbbd63d8662e7133d101a7d15a626209b55bb06cecb32ca4929c5c9557d3faa176d1e7746bc0482d66f02f0aae49932cdfada801b168a5dd5d SHA512 2a376133d0cf8413247b5435812fe98a8ecc52d069ff16696eeacbdec6451245afbf5f1f71b2a0aae98e1a6bad6b4ea533aa24ec5217e70dadfee1dfbee6536d
-MISC metadata.xml 715 BLAKE2B 58906b3e217f2cd605f0d9dca56288bcd45644b8d210e8be852b7373108c75d611817a18e86cbf0ca3d9681d050da5d74e66d5552330eb37f7ceb660bd1bdf9a SHA512 3b3734e26be1807269c56cd7b65221ec7e96bf556073400233094c5ced9e312ffb5699eb7d0a523ca4fef6d2dc134df88da626ed6c42312554274395a9cc67de
+EBUILD uam-0.3.2-r1.ebuild 1277 BLAKE2B 54e58123395000cdae558231a64056661498be5228b02bd415e4dd478e9b04d47fff5e894f211940357ed34b68ed4d710ceebd58fadf15b1093200b365e6a725 SHA512 ed4f88ba6bb613f6fd839fe03d37850ec601c62f60614e04f3bd9e479547983845dff39bd9c5e212959255f1427a9e0f9effc76df5734968300b31546ba05679
+EBUILD uam-9999.ebuild 1311 BLAKE2B 022e072fb7ff30443175966480f7644d3d2eed4b369455195dd09b7faa564be9a3d8cddc8d9a3b9392bc3618bbe4527b338f99f08818fefd989c721b6895a1cc SHA512 1b6380047583171250b2cbbf5d00d34a2bba9419433c748ea5e20e6881c686569195a4bb67e070b7a8cd2271ffd6900be8d0919f85b3dda730bb43a3f7e88ecd
+MISC metadata.xml 715 BLAKE2B 8d4411787386e62f7a852473b7662a7b62189058bd14024465bec3ed46132d1ddf11e5fe305c5865e92c4e072453744c5f783ca94764e6825faf7e10c8562d9e SHA512 536adf66f3ed007fe9910db52219542c9867caecfd4d255bc4bdbc842307bc55615dfb95d9131f86ca721bded8c815d5bd1c9f9ca10941c5c7f82a5502451f25
diff --git a/sys-apps/uam/metadata.xml b/sys-apps/uam/metadata.xml
index 96811fbf503a..580155d522cb 100644
--- a/sys-apps/uam/metadata.xml
+++ b/sys-apps/uam/metadata.xml
@@ -15,7 +15,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://github.com/mgorny/uam/issues/</bugs-to>
-		<remote-id type="github">mgorny/uam</remote-id>
+		<bugs-to>https://github.com/projg2/uam/issues/</bugs-to>
+		<remote-id type="github">projg2/uam</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/uam/uam-0.3.2-r1.ebuild b/sys-apps/uam/uam-0.3.2-r1.ebuild
index a8c27ad33943..2514adb19864 100644
--- a/sys-apps/uam/uam-0.3.2-r1.ebuild
+++ b/sys-apps/uam/uam-0.3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit udev
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://github.com/mgorny/uam/"
-SRC_URI="https://github.com/mgorny/uam/releases/download/${P}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/projg2/uam/"
+SRC_URI="https://github.com/projg2/uam/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/sys-apps/uam/uam-9999.ebuild b/sys-apps/uam/uam-9999.ebuild
index 3a247b31bd2c..a0bdb67f668f 100644
--- a/sys-apps/uam/uam-9999.ebuild
+++ b/sys-apps/uam/uam-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools git-r3 udev
 
 DESCRIPTION="Simple udev-based automounter for removable USB media"
-HOMEPAGE="https://github.com/mgorny/uam/"
+HOMEPAGE="https://github.com/projg2/uam/"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/mgorny/uam.git"
+EGIT_REPO_URI="https://github.com/projg2/uam.git"
 
 LICENSE="BSD"
 SLOT="0"