13 files changed, 17 insertions, 112 deletions
diff --git a/app-text/lesspipe/lesspipe-2.05.ebuild b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
index cee412a1d9fe..a795a3880db9 100644
--- a/app-text/lesspipe/lesspipe-2.05.ebuild
+++ b/app-text/lesspipe/lesspipe-2.05-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 RESTRICT="test"
 
 BDEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
 
 src_configure() {
 	# Not an autoconf script.
diff --git a/dev-libs/serd/serd-0.30.14.ebuild b/dev-libs/serd/serd-0.30.14-r1.ebuild
index bfe7ae8ea8f1..2fe8c5383963 100644
--- a/dev-libs/serd/serd-0.30.14.ebuild
+++ b/dev-libs/serd/serd-0.30.14-r1.ebuild
@@ -48,19 +48,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( AUTHORS NEWS README.md )
 	einstalldocs
 }
diff --git a/dev-libs/sord/sord-0.16.12.ebuild b/dev-libs/sord/sord-0.16.12-r1.ebuild
index 9d71ccd834fc..02f84963e6bd 100644
--- a/dev-libs/sord/sord-0.16.12.ebuild
+++ b/dev-libs/sord/sord-0.16.12-r1.ebuild
@@ -52,19 +52,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( AUTHORS NEWS README.md )
 	einstalldocs
 }
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index 9d71ccd834fc..02f84963e6bd 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -52,19 +52,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( AUTHORS NEWS README.md )
 	einstalldocs
 }
diff --git a/dev-util/repolite/repolite-0.2.0-r1.ebuild b/dev-util/repolite/repolite-0.2.0-r2.ebuild
index 7786cd608778..38159f7e9aa9 100644
--- a/dev-util/repolite/repolite-0.2.0-r1.ebuild
+++ b/dev-util/repolite/repolite-0.2.0-r2.ebuild
@@ -28,8 +28,6 @@ RESTRICT="test"  # no tests :(
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/munch[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
 	dev-vcs/git
 "
 BDEPEND="
diff --git a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
index 121927e8d619..4e3371a8aa6f 100644
--- a/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.14.0.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="app-text/recode:=
 	!games-misc/fortune-mod-tao"
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="app-text/App-XML-DocBook-Builder
 	test? (
 		dev-perl/File-Find-Object
diff --git a/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
index d7c5bdcc3b1d..c823a080f815 100644
--- a/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
+++ b/games-misc/fortune-mod/fortune-mod-3.14.1-r1.ebuild
@@ -20,7 +20,7 @@ RDEPEND="
 	app-text/recode:=
 	!games-misc/fortune-mod-tao
 "
-DEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/App-XML-DocBook-Builder
 	dev-lang/perl
diff --git a/media-libs/lilv/lilv-0.24.16.ebuild b/media-libs/lilv/lilv-0.24.16-r1.ebuild
index 4ef4e590a74d..5df9c7793256 100644
--- a/media-libs/lilv/lilv-0.24.16.ebuild
+++ b/media-libs/lilv/lilv-0.24.16-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit meson-multilib python-single-r1 bash-completion-r1
+inherit meson-multilib python-single-r1
 
 DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
 HOMEPAGE="http://drobilla.net/software/lilv/"
@@ -59,26 +59,15 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	meson_src_install
 	python_optimize
 }
 
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( AUTHORS NEWS README.md )
 	einstalldocs
 
-	sed -i "/lv2jack/d" utils/lilv.bash_completion
-	newbashcomp utils/lilv.bash_completion lv2info
-
 	dodir /etc/env.d
 	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
 }
diff --git a/media-libs/lilv/lilv-0.24.18.ebuild b/media-libs/lilv/lilv-0.24.18-r1.ebuild
index 4ef4e590a74d..cd2add997f0d 100644
--- a/media-libs/lilv/lilv-0.24.18.ebuild
+++ b/media-libs/lilv/lilv-0.24.18-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit meson-multilib python-single-r1 bash-completion-r1
+inherit meson-multilib python-single-r1
 
 DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
 HOMEPAGE="http://drobilla.net/software/lilv/"
@@ -59,26 +59,16 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_install() {
 	meson_src_install
 	python_optimize
 }
 
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( AUTHORS NEWS README.md )
 	einstalldocs
 
-	sed -i "/lv2jack/d" utils/lilv.bash_completion
-	newbashcomp utils/lilv.bash_completion lv2info
-
-	dodir /etc/env.d
-	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+	newenvd - 60lv2 <<-EOF
+		LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2
+	EOF
 }
diff --git a/media-libs/lv2/lv2-1.18.6-r1.ebuild b/media-libs/lv2/lv2-1.18.6-r2.ebuild
index 938d7ce19a71..bfe5e1c08de9 100644
--- a/media-libs/lv2/lv2-1.18.6-r1.ebuild
+++ b/media-libs/lv2/lv2-1.18.6-r2.ebuild
@@ -66,19 +66,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( NEWS README.md )
 	einstalldocs
 }
diff --git a/media-libs/lv2/lv2-1.18.8.ebuild b/media-libs/lv2/lv2-1.18.8-r1.ebuild
index 2a8d2a903388..4d070eae7261 100644
--- a/media-libs/lv2/lv2-1.18.8.ebuild
+++ b/media-libs/lv2/lv2-1.18.8-r1.ebuild
@@ -67,19 +67,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( NEWS README.md )
 	einstalldocs
 }
diff --git a/media-libs/sratom/sratom-0.6.12.ebuild b/media-libs/sratom/sratom-0.6.12-r1.ebuild
index b1197982968b..7a0ecfc1b275 100644
--- a/media-libs/sratom/sratom-0.6.12.ebuild
+++ b/media-libs/sratom/sratom-0.6.12-r1.ebuild
@@ -50,19 +50,7 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
-mutlilib_src_install_all() {
+multilib_src_install_all() {
 	local DOCS=( NEWS README.md )
 	einstalldocs
 }
diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
index f31724207108..7702cc3283c3 100644
--- a/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
+++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 		-e 's@^\(ARCH\) ?=@\1 =@' \
 		Makefile || die "sed failed"
 
-	if [ "$(get_libdir)" == "lib64" ]; then
+	if [[ "$(get_libdir)" == "lib64" ]]; then
 		sed -i \
 			-e "/^LIB\(32\)/s:=.*:= lib32:" \
 				Makefile