diff --git a/net-wireless/portapack-mayhem/Manifest b/net-wireless/portapack-mayhem/Manifest
index 4f5f74d1e..bf617f428 100644
--- a/net-wireless/portapack-mayhem/Manifest
+++ b/net-wireless/portapack-mayhem/Manifest
@@ -1,4 +1,4 @@
 DIST mayhem_v1.3.1_COPY_TO_SDCARD.7z 492947796 BLAKE2B 61ae3b8533d36e39dfa6aae7521c8dd41f58e8c3cb061c7cfa8afd780faabd8fb5101f72aaa5626b5e9bb60dff4fb29544b3befe6a4895498d3c96fb75fb8002 SHA512 0d2dd718334f2607ac70bb0863cea312ba74ad910f5fe46ee95d8f1cd94e4dd79485289e84c65607f1880bcd5071904ba53144194f62eaf4850363e89616e93e
 DIST mayhem_v1.3.1_FIRMWARE.7z 3759146 BLAKE2B 60b88047fe01c22288f9f5891d36932726bb99925d11ec082a8cd0f2e32676fd014542afb7e24bd256307126113f67f4dd668d12dfd73e75d4a01013eb2a34c2 SHA512 9788294f5a87c315d342ae73c13769eb8396b9169c7f630dc4b5a5b5b0013efc95271f3f2ad3486590554acb1eddf2bf04d04440e4652b44cdba309d47c38e4b
-DIST mayhem_v1.4.2_COPY_TO_SDCARD.7z 492986879 BLAKE2B c61f46481b383ad07c220ce5e611a9d8e211117a8e68eefc60a707a4b6b275b8d2d3806816650cfb26befd007e4aa43aac8a9398747ec10f9c209afa84077b87 SHA512 9b8bbb4538a19e0a0e92b00042c4a205ee994895ef649373516ee0b326c83946f5f045509c6668aa97b58346d4707cb2ef9202a260c6703cc6f7a13c0e038012
-DIST mayhem_v1.4.2_FIRMWARE.7z 3809563 BLAKE2B cc1f0bb94080610160d210e494ec19b143ba92a29ddd5d2aab0f5a948d0e2086a6c55ac53a8114fad2d55c2e7fb0b19f496ee3438719d0b25529707606e78a8d SHA512 834b94e552f216c63feac8f79fd946f476b18761f48b497857ea2dbe52c7ad1077cb4860c2685ceda05284bfd6027e5717d4e6466ebc87d9dd56cd7104adb03f
+DIST mayhem_v1.5.0_COPY_TO_SDCARD.7z 501171056 BLAKE2B 2b5c9357afa318360f00c19853fe1841346f348df8ad336c55db981c67f36867a11e0564a22dc90209284b5335ce27741fc5fa0696137cd8a2c352fa67d25e89 SHA512 805f284f47038242defd8cf24a149328348d64419c71b7e94b2ab27b4dd27db4980a2ea2b17b5171bf253b487a596e861b134da4f331d8706aa626065ba6e8c8
+DIST mayhem_v1.5.0_FIRMWARE.zip 4540914 BLAKE2B 819ba1ad07482f8541f59ac7ce68869aaa3c7a50c8b01fba827efdd24068d66151aa8e2529d7423db8a0d462bef3428e9c7ac296812d22a8e84d9da329c816fe SHA512 f025800d57d8d2df51b45c03a1b96839a1b54e17e7ad6280706388e5643bf56d47945ed4bb1c789ca76b95a796c00b0d786cbf8806841974073f8d1ee41bf803
diff --git a/net-wireless/portapack-mayhem/portapack-mayhem-1.4.2.ebuild b/net-wireless/portapack-mayhem/portapack-mayhem-1.5.0.ebuild
similarity index 85%
rename from net-wireless/portapack-mayhem/portapack-mayhem-1.4.2.ebuild
rename to net-wireless/portapack-mayhem/portapack-mayhem-1.5.0.ebuild
index dedddb6f5..da643f1fd 100644
--- a/net-wireless/portapack-mayhem/portapack-mayhem-1.4.2.ebuild
+++ b/net-wireless/portapack-mayhem/portapack-mayhem-1.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Custom firmware for the HackRF SDR + PortaPack H1 addon"
 HOMEPAGE="https://github.com/eried/portapack-mayhem"
@@ -14,12 +14,13 @@ if [ "${PV}" == "9999" ]; then
 	inherit cmake git-r3
 	EGIT_REPO_URI="https://github.com/eried/portapack-mayhem.git"
 	EGIT_BRANCH="next"
-	DEPEND="sys-devel/gcc-arm-none-eabi"
+	BDEPEND="sys-devel/gcc-arm-none-eabi"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_FIRMWARE.7z
+	SRC_URI="https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_FIRMWARE.zip
 			sdcard-files? ( https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_COPY_TO_SDCARD.7z )"
-	DEPEND="app-arch/p7zip"
+	BDEPEND="app-arch/p7zip"
+	inherit unpacker
 fi
 
 PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1
@@ -29,14 +30,14 @@ src_unpack() {
 	if [ "${PV}" = 9999 ]; then
 		git-r3_src_unpack
 	else
-		#upstream tarballs unpack into currect directory
+		#upstream distfiles unpack into current directory
 		mkdir ${P}
 		pushd ${P}
-		unpack mayhem_v${PV}_FIRMWARE.7z
+		unpack mayhem_v${PV}_FIRMWARE.zip
 		if use sdcard-files; then
 			mkdir sdcard
 			pushd sdcard
-			unpack mayhem_v${PV}_COPY_TO_SDCARD.7z
+			unpacker mayhem_v${PV}_COPY_TO_SDCARD.7z
 		fi
 	fi
 }
diff --git a/net-wireless/portapack-mayhem/portapack-mayhem-9999.ebuild b/net-wireless/portapack-mayhem/portapack-mayhem-9999.ebuild
index dedddb6f5..da643f1fd 100644
--- a/net-wireless/portapack-mayhem/portapack-mayhem-9999.ebuild
+++ b/net-wireless/portapack-mayhem/portapack-mayhem-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Custom firmware for the HackRF SDR + PortaPack H1 addon"
 HOMEPAGE="https://github.com/eried/portapack-mayhem"
@@ -14,12 +14,13 @@ if [ "${PV}" == "9999" ]; then
 	inherit cmake git-r3
 	EGIT_REPO_URI="https://github.com/eried/portapack-mayhem.git"
 	EGIT_BRANCH="next"
-	DEPEND="sys-devel/gcc-arm-none-eabi"
+	BDEPEND="sys-devel/gcc-arm-none-eabi"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_FIRMWARE.7z
+	SRC_URI="https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_FIRMWARE.zip
 			sdcard-files? ( https://github.com/eried/portapack-mayhem/releases/download/v${PV}/mayhem_v${PV}_COPY_TO_SDCARD.7z )"
-	DEPEND="app-arch/p7zip"
+	BDEPEND="app-arch/p7zip"
+	inherit unpacker
 fi
 
 PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1
@@ -29,14 +30,14 @@ src_unpack() {
 	if [ "${PV}" = 9999 ]; then
 		git-r3_src_unpack
 	else
-		#upstream tarballs unpack into currect directory
+		#upstream distfiles unpack into current directory
 		mkdir ${P}
 		pushd ${P}
-		unpack mayhem_v${PV}_FIRMWARE.7z
+		unpack mayhem_v${PV}_FIRMWARE.zip
 		if use sdcard-files; then
 			mkdir sdcard
 			pushd sdcard
-			unpack mayhem_v${PV}_COPY_TO_SDCARD.7z
+			unpacker mayhem_v${PV}_COPY_TO_SDCARD.7z
 		fi
 	fi
 }