diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 026930fe97..76fdb3f86d 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,2 +1,2 @@
-DIST fastfetch-1.7.2.tar.gz 426097 BLAKE2B 5f9714b735605d4cc4cf8179f048c4cff24db0010f91e080f5e6c0f41329cbc155cdb883775ccb98bda77bfd4efb1f2b79f0adad4a2694d338b0027a31f170b1 SHA512 9f3051d8b9bc22ef93a2e6993c553c5a18d475c8cbb16a63087706aa823a0a4806c49aabb3cdbf5f240f9c9325ea5cb7db2498adcc87c9e44b77d26f6c28a39f
 DIST fastfetch-1.7.5.tar.gz 449086 BLAKE2B b446abd550208c726d58b5e282107f5f7492bbd04439efda19194fd74bf87d2760a845c78431de124b925a52b74de0896197c80f65508fae2704e4786848a303 SHA512 134e088b3faa551108f65e693e8dad3c6def29b0086c86330cc7738854fddb49f30a2cb7cd61c12195723ddd47f33823906af3d8bff746e1da006b6fda45f85b
+DIST fastfetch-1.8.0.tar.gz 495237 BLAKE2B 151f45ea6753dc8333767beebb633732f2d375e4f9ce9019e30c2edbddf0f554864591e4536563df4f12494ce7a3e2e20e7492bcb66de896b1ad080570300378 SHA512 cbba45bb5338adf26bf188184e290fbf1a67791caee1432acd1030bd11622484506c9a5f267f7abca953c3a4f2e7d2ee5725c7e178a6284fdbfe05633b9db387
diff --git a/app-misc/fastfetch/fastfetch-1.7.2.ebuild b/app-misc/fastfetch/fastfetch-1.8.0.ebuild
similarity index 91%
rename from app-misc/fastfetch/fastfetch-1.7.2.ebuild
rename to app-misc/fastfetch/fastfetch-1.8.0.ebuild
index 7536a14ff9..c9038f0156 100644
--- a/app-misc/fastfetch/fastfetch-1.7.2.ebuild
+++ b/app-misc/fastfetch/fastfetch-1.8.0.ebuild
@@ -7,16 +7,19 @@ inherit cmake
 
 DESCRIPTION="Fast system information tool"
 HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/LinusDierheimer/fastfetch.git"
+	[[ ${PV} == *9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *d ]] && EGIT_BRANCH=dev
+	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/LinusDierheimer/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan wayland xcb xfce xrandr"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
@@ -79,6 +82,7 @@ src_configure() {
 		-DENABLE_OSMESA=$(usex osmesa)
 		-DENABLE_OPENCL=$(usex opencl)
 		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_LIBCJSON=no
 	)
 
 	cmake_src_configure
diff --git a/media-sound/loudgain/loudgain-0.6.8.ebuild b/media-sound/loudgain/loudgain-0.6.8.ebuild
index 9ad6f1468f..550bb844e6 100644
--- a/media-sound/loudgain/loudgain-0.6.8.ebuild
+++ b/media-sound/loudgain/loudgain-0.6.8.ebuild
@@ -26,6 +26,7 @@ DEPEND="${COMMON_DEPEND}"
 src_prepare() {
 	sed -e 's/^SET(CMAKE_C_FLAGS "/SET(CMAKE_C_FLAGS "${CMAKE_C_CFLAGS} /' \
 		-e 's/^SET(CMAKE_CXX_FLAGS "/SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /' \
+		-e 's/^\(\s*COMPILE_FLAGS.*\) -g\([\s"]\)$/\1\2/' \
 		-i CMakeLists.txt || die "cannot patch CMakeLists.txt"
 	cat CMakeLists.txt