diff --git a/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild b/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
index 97b415203a..817ec4977f 100644
--- a/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
+++ b/dev-libs/octetos-coreutils/octetos-coreutils-0.13.0_alpha.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/azaeldevel/octetos-coreutils.git"
 else
-	inherit autotools
 	SRC_URI="https://github.com/azaeldevel/${PN}/archive/${MYPV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-python/DAWG-Python/metadata.xml b/dev-python/DAWG-Python/metadata.xml
index c861e547f3..57eac8149f 100644
--- a/dev-python/DAWG-Python/metadata.xml
+++ b/dev-python/DAWG-Python/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Shaoyu Tseng</name>
 	</maintainer>
 	<upstream>
-	  <remote-id type="pypi">DAWG-Python</remote-id>
-	  <remote-id type="github">pytries/DAWG-Python</remote-id>
+		<remote-id type="pypi">DAWG-Python</remote-id>
+		<remote-id type="github">pytries/DAWG-Python</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild b/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
index 5f99864895..36fdf0ec8a 100644
--- a/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
+++ b/dev-python/uharfbuzz/uharfbuzz-0.16.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/harfbuzz/uharfbuzz"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental]"
+RDEPEND=">=media-libs/harfbuzz-2.8.1[experimental(-)]"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/net-news/feedreader/Manifest b/net-news/feedreader/Manifest
index b48f194935..dd53d61f5c 100644
--- a/net-news/feedreader/Manifest
+++ b/net-news/feedreader/Manifest
@@ -1 +1 @@
-DIST v2.11.0.tar.gz 1197626 BLAKE2B f7ce52ed2a61f8fa405852fe321d3ffafca60b206e3ba4493f15cace179a7f80a407fd32e46f932af6186cc91af5995a5a252bb9babede701f45b3ef403dbb38 SHA512 913fdbf61d1143320a455e843ef6f7223fbd5a371167745889880549e510ac2cdeaaa8256fc23508a94bd2da22003c9949a1e2a10e7f027c9f12aa113d6465c6
+DIST feedreader-2.11.0.tar.gz 1197626 BLAKE2B f7ce52ed2a61f8fa405852fe321d3ffafca60b206e3ba4493f15cace179a7f80a407fd32e46f932af6186cc91af5995a5a252bb9babede701f45b3ef403dbb38 SHA512 913fdbf61d1143320a455e843ef6f7223fbd5a371167745889880549e510ac2cdeaaa8256fc23508a94bd2da22003c9949a1e2a10e7f027c9f12aa113d6465c6
diff --git a/net-news/feedreader/feedreader-2.11.0.ebuild b/net-news/feedreader/feedreader-2.11.0.ebuild
index 9bb0a616a6..d5c2205c30 100644
--- a/net-news/feedreader/feedreader-2.11.0.ebuild
+++ b/net-news/feedreader/feedreader-2.11.0.ebuild
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Simple News Feed Reader for feeds aggregated by Tiny Tiny RSS or feedly"
 HOMEPAGE="https://github.com/jangernert/FeedReader"
-SRC_URI="https://github.com/jangernert/${MY_PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/jangernert/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild b/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
index f0b57b1264..6f74739303 100644
--- a/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
+++ b/sys-cluster/libbsctools/libbsctools-1.0.6-r2.ebuild
@@ -24,8 +24,8 @@ src_prepare() {
 src_install() {
 	MAKEOPTS="-j1" emake DESTDIR="${D}" install
 	dodoc NEWS README AUTHORS
-        mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
-        docompress -x "/usr/share/doc/${PF}/examples"
+		mv "${ED}/usr/share/example" "${ED}/usr/share/doc/${PF}/examples" || die
+		docompress -x "/usr/share/doc/${PF}/examples"
 	find "${D}" -name '*.la' -delete || die
 	find "${D}" -name '*.a' -delete || die
 }
diff --git a/sys-cluster/synapse/metadata.xml b/sys-cluster/synapse/metadata.xml
index d67e3064c8..0c185982ba 100644
--- a/sys-cluster/synapse/metadata.xml
+++ b/sys-cluster/synapse/metadata.xml
@@ -5,11 +5,6 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<use>
-		<flag name="libi">Use libi as tree instantiation method instead of ssh</flag>
-		<flag name="threadsafe">Build threasafe version of lightweight MRNet and XPlat libraries</flag>
-		<flag name="slurm">Use slurm as libi tree instantiation method instead of ssh</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://github.com/bsc-performance-tools/synapse/issues</bugs-to>
 		<remote-id type="github">bsc-performance-tools/synapse</remote-id>
diff --git a/sys-fs/erofs-utils/erofs-utils-1.3.ebuild b/sys-fs/erofs-utils/erofs-utils-1.3.ebuild
index ee37d4a497..5188e99b15 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.3.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.3.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Userspace tools for EROFS images"
 HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-SRC_URI="${HOMEPAGE}/snapshot/${P}.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"