8 files changed, 153 insertions, 23 deletions
diff --git a/app-admin/ryzen_monitor/Manifest b/app-admin/ryzen_monitor/Manifest
index f2f8a5821e58..ee751332af82 100644
--- a/app-admin/ryzen_monitor/Manifest
+++ b/app-admin/ryzen_monitor/Manifest
@@ -1 +1,4 @@
 DIST ryzen_monitor-1.0.4.tar.gz 33716 BLAKE2B f755cc946b26ea5566c1bd304f84e3a3aee80383d151ec8e702919837d04287d4b3b4000b4f9587003cb20b2be45d4af727eb941c0080772b5f94104d68f8b78 SHA512 93cb55b64db75596da88d8f1f3c5eab38cce52d7ae9bb8b7895d62d39ec0b4c0157bad3ed688c32cc0aecf09eb211614b81159a31c704a0f028751ded46723c5
+DIST ryzen_monitor-1.0.5.tar.gz 37372 BLAKE2B 021b417a60a284020e7f9e96348f5e0745aede68e01c1b560e2205c4738fd504d4565bbc5b9c6824ea697a8c0a1d981722f9e6e178a8cfa9213b2e703c5f6b72 SHA512 8e1f02f59f40a3e4fe84c805a1053939a20d21e5c40223bb6b7c41716eff361b86e87fc67fd90078d3ffa9d78d2016284af5362aad2212b9cf35979427906ca8
+DIST ryzen_monitor-1.0.6_pre20220901.tar.gz 37992 BLAKE2B 550e3f4da0d5d22a503953c0746c35c2508915e7722230678943a0227a3a0f8b675a044b0e742fb4b1e77ed8abbb5b6ce5bd256e4ed4cd434076a739a761a5a2 SHA512 1f09759ef7c68c5240bbcaf756d6ed87047f452522352a47d07d7121bc21a230fd679fd4b400728919f489009b162ded050aaa8c3eb0cace15bebe9049cfdb87
+DIST ryzen_smu-v0.1.5.tar.bz2 415723 BLAKE2B 0fed89aad85a5080d4c1a6ecdaaef6ffe2b70f0cebbf58392c725f1aa626151e4b5335096bd63cf73ff29d6f5768ce6e0a844dc7030e8c1e4dc5e04990521651 SHA512 5793beae8204a16800ed876da2a07d2f477a21cef706fed6076e1dcc6e74118b7c45a330e264302d644fdb49f7c44e4fca53dc67e43b2f2a62b3b1ea4ad00d8f
diff --git a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch b/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
deleted file mode 100644
index efe7fc5e45ff..000000000000
--- a/app-admin/ryzen_monitor/files/CFLAGS_override_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5142282..4c0dbb8 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -3,7 +3,7 @@ STRIP = strip
- 
- CFLAGS = -O3 -mtune=native -march=native
--CFLAGS += -Ilib
-+override CFLAGS += -Ilib
- LDFLAGS = -lm
- 
- SFLAGS = --strip-all
- 
diff --git a/app-admin/ryzen_monitor/files/fix-Makefile.patch b/app-admin/ryzen_monitor/files/fix-Makefile.patch
new file mode 100644
index 000000000000..8488b285f360
--- /dev/null
+++ b/app-admin/ryzen_monitor/files/fix-Makefile.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Makefile b/src/Makefile
+index 5142282..8c8f3a0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,11 +1,8 @@
+ CC = gcc
+-STRIP = strip
+ 
+ CFLAGS = -O3 -mtune=native -march=native
+-CFLAGS += -Ilib
+-LDFLAGS = -lm
+-
+-SFLAGS = --strip-all
++override CFLAGS += -Ilib
++override LDFLAGS += -lm
+ 
+ OUT = ryzen_monitor
+ 
+@@ -20,7 +17,6 @@ all: $(OUT)
+ 
+ $(OUT): $(OBJ)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $(OUT) $(OBJ)
+-	$(STRIP) $(SFLAGS) $(OUT)
+ 
+ clean:
+ 	rm -rf *.o lib/*.o
diff --git a/app-admin/ryzen_monitor/metadata.xml b/app-admin/ryzen_monitor/metadata.xml
index 8072ef2372e4..9b7061eac788 100644
--- a/app-admin/ryzen_monitor/metadata.xml
+++ b/app-admin/ryzen_monitor/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
+	<maintainer type="person" proxied="yes">
+		<email>negril.nx+gentoo@gmail.com</email>
+		<name>Paul Zander</name>
 	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hattedsquirrel/ryzen_monitor</remote-id>
+		<remote-id type="gitlab">leogx9r/ryzen_smu</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
index 9ac20aa45272..5d9fb162e31b 100644
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4.ebuild
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,20 +6,18 @@ EAPI=7
 inherit toolchain-funcs
 
 SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
-DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU "
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
 HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
 
 SLOT="0"
 LICENSE="AGPL-3"
-IUSE=""
 
-DEPEND=""
 RDEPEND="app-admin/ryzen_smu"
 
 PATCHES=(
-	"${FILESDIR}"/CFLAGS_override_fix.patch
+	"${FILESDIR}"/fix-Makefile.patch
 )
 
 src_compile() {
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..114ebd84d7ca
--- /dev/null
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SMU_PN="ryzen_smu"
+SMU_PV="0.1.5"
+inherit toolchain-funcs
+
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
+HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
+SRC_URI="
+	https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/leogx9r/${SMU_PN}/-/archive/v${SMU_PV}/${SMU_PN}-v${SMU_PV}.tar.bz2
+"
+
+LICENSE="AGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/ryzen_smu"
+
+src_unpack() {
+	unpack "${P}.tar.gz" "${SMU_PN}-v${SMU_PV}.tar.bz2"
+}
+
+src_prepare() {
+	rm "src/lib/"* || die
+	cp -a "${WORKDIR}/${SMU_PN}-v${SMU_PV}/lib/libsmu."{c,h} "src/lib/" || die
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/ryzen_monitor
+}
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
new file mode 100644
index 000000000000..ca726d03e03d
--- /dev/null
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="amd64 x86"
+
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
+HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
+
+SLOT="0"
+LICENSE="AGPL-3"
+
+RDEPEND="app-admin/ryzen_smu"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/ryzen_monitor
+}
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild
new file mode 100644
index 000000000000..910c64f20721
--- /dev/null
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.6_pre20220901.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GIT_COMMIT="7529c7cfc2688d9781912c84adfc0343d83dc78c"
+SMU_PN="ryzen_smu"
+SMU_PV="0.1.5"
+inherit toolchain-funcs
+
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
+HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
+SRC_URI="
+	https://github.com/hattedsquirrel/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/leogx9r/${SMU_PN}/-/archive/v${SMU_PV}/${SMU_PN}-v${SMU_PV}.tar.bz2
+"
+
+LICENSE="AGPL-3 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-admin/ryzen_smu"
+
+S="${WORKDIR}/${PN}-${GIT_COMMIT}"
+
+src_unpack() {
+	unpack "${P}.tar.gz" "${SMU_PN}-v${SMU_PV}.tar.bz2"
+}
+
+src_prepare() {
+	rm "src/lib/"* || die
+	cp -a "${WORKDIR}/${SMU_PN}-v${SMU_PV}/lib/libsmu."{c,h} "src/lib/" || die
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/ryzen_monitor
+}