diff --git a/dev-util/vala-language-server/metadata.xml b/dev-util/vala-language-server/metadata.xml
new file mode 100644
index 0000000000..7424f3441d
--- /dev/null
+++ b/dev-util/vala-language-server/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- Maintainer Needed -->
+	<use>
+		<flag name="plugins"></flag>
+		<flag name="debug_mem"></flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-util/vala-language-server/vala-language-server-0.48.4.ebuild b/dev-util/vala-language-server/vala-language-server-0.48.4.ebuild
index 3c8fa4af0d..a41089989a 100644
--- a/dev-util/vala-language-server/vala-language-server-0.48.4.ebuild
+++ b/dev-util/vala-language-server/vala-language-server-0.48.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug_mem plugins test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-lang/vala
 	dev-util/gnome-builder
diff --git a/media-gfx/bonzomatic/metadata.xml b/media-gfx/bonzomatic/metadata.xml
index 201d45c82c..4186528551 100644
--- a/media-gfx/bonzomatic/metadata.xml
+++ b/media-gfx/bonzomatic/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="wayland">Build non-system-glfw for wayland instead of X11</flag>
 		<flag name="system-glew">Use the systems installed version of GLEW (upstream-unsupported)</flag>
 		<flag name="system-stb">Use the systems installed version of STB (upstream-unsupported)</flag>
-		<flag name="system-kissfft">Use the systems installed version of Kissfft (upstream-unsupported)</flag>
+		<!-- <flag name="system-kissfft">Use the systems installed version of Kissfft (upstream-unsupported)</flag> -->
 	</use>
 </pkgmetadata>
diff --git a/net-p2p/ipfs-cluster/ipfs-cluster-1.0.1.ebuild b/net-p2p/ipfs-cluster/ipfs-cluster-1.0.1.ebuild
index 7e0c64e895..3d9b5ff25e 100644
--- a/net-p2p/ipfs-cluster/ipfs-cluster-1.0.1.ebuild
+++ b/net-p2p/ipfs-cluster/ipfs-cluster-1.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 go-module systemd
+inherit go-module systemd
 
 DESCRIPTION="Pinset orchestration for IPFS"
 HOMEPAGE="https://ipfscluster.io/"
diff --git a/profiles/desc/gravity_models.desc b/profiles/desc/gravity_models.desc
index d021f4b159..9cc2a3d072 100644
--- a/profiles/desc/gravity_models.desc
+++ b/profiles/desc/gravity_models.desc
@@ -3,10 +3,7 @@
 
 # This file contains descriptions of GRAVITY_MODELS USE_EXPAND flags.
 
-egm84-30 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid
-egm84-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid
-egm96-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid
-egm96-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid
-egm2008-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid
-egm2008-2-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid
-egm2008-1 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid
+egm84 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid
+egm96 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid
+egm2008 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid
+wgs84 -