diff --git a/media-libs/mbelib/Manifest b/media-libs/mbelib/Manifest
index 3363c3d17..88bf2e594 100644
--- a/media-libs/mbelib/Manifest
+++ b/media-libs/mbelib/Manifest
@@ -1,2 +1 @@
-DIST mbelib-1.2.5.tar.gz 38261 SHA256 59d5e821b976a57f1eae84dd57ba84fd980d068369de0bc6a75c92f0b286c504 SHA512 09a28a8500104803e0aa2d541b0985b2b769ae00e09838d5803727c3c8a88097852b12afeaa6fce35ef60b51dd3dc5f149ea442a5418cebd2226728564a22e14 WHIRLPOOL 71f1d3af598dec577610955050d6cb3395a03b6e39e2f0c37897472c2850dbee42a0f19aad3ba88dc109b84f928080052ae615a2d45b549e0896deaa590b880e
-DIST mbelib-1.3.0.tar.gz 398902 SHA256 5a2d5ca37cef3b6deddd5ce8c73918f27936c50eb0e63b27e4b4fc493310518d SHA512 1148b2c2e6e26f92e2d9643a79dc7ed3616e5903268b0a970d97abc9aff9a19241f037f82814109a247251796c652287c557e04dd1da2d827fd068534ac20a99 WHIRLPOOL 0003fd51c81e5ad107e77e63032c57fdf4bcd2a2e6c383f06cfc9a7514c8cf7785dbdfccc6f9781cfec3e0b879dcf9a17bb28c2fb9ea68b4dbb29301d4ad2aba
+DIST mbelib-1.3.0-r1.tar.gz 400754 BLAKE2B 9cd1d15c592d5f8523dc5904b9060967089b119e2c9a9ff5bfce61aeb7cfbdd73a305c9b4bde714cb9cecd8e6b585652e26c1e7f01250484f5d6e0f598093f00 SHA512 5de9408fa37298a8a6d24021fba0d050e9164388a29ef24358340ac7d89f4b3068d5001a534a41ebbeec842e2c8442084cc364f896c70ade2c8b467c483f4c0f
diff --git a/media-libs/mbelib/mbelib-1.2.5.ebuild b/media-libs/mbelib/mbelib-1.2.5.ebuild
deleted file mode 100644
index aeca4645f..000000000
--- a/media-libs/mbelib/mbelib-1.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-HOMEPAGE="https://github.com/szechyjs/mbelib"
-DESCRIPTION="P25 Phase 1 and ProVoice vocoder"
-LICENSE="BSD"
-SLOT=0
-IUSE=static-libs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/szechyjs/mbelib.git"
-	KEYWORDS=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/szechyjs/mbelib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-src_prepare() {
-	sed -i -e "s#X}/lib#X}/$(get_libdir)#" -e "s#N lib#N $(get_libdir)#" "${S}/CMakeLists.txt"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libmbe.a
-}
diff --git a/media-libs/mbelib/mbelib-1.3.0-r1.ebuild b/media-libs/mbelib/mbelib-1.3.0-r1.ebuild
new file mode 100644
index 000000000..063904635
--- /dev/null
+++ b/media-libs/mbelib/mbelib-1.3.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+inherit cmake-utils multilib
+
+HOMEPAGE="https://github.com/szechyjs/mbelib"
+DESCRIPTION="P25 Phase 1 and ProVoice vocoder"
+LICENSE="BSD"
+SLOT=0
+IUSE="test"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/szechyjs/mbelib.git"
+	KEYWORDS=""
+	inherit git-r3
+else
+	COMMIT="9a04ed5c78176a9965f3d43f7aa1b1f5330e771f"
+	SRC_URI="https://github.com/szechyjs/mbelib/archive/9a04ed5c78176a9965f3d43f7aa1b1f5330e771f.tar.gz -> ${P}-r1.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+src_prepare() {
+	sed -i -e '/TARGET_LINK_LIBRARIES(mbe-static m)/d' \
+		-e '/ADD_LIBRARY(mbe-static STATIC ${SRCS})/d' \
+		-e 's#mbe-static ##g' CMakeLists.txt
+	cmake-utils_src_prepare
+}
+src_configure() {
+	mycmakeargs=(
+		CMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
+		-DDISABLE_TEST="$(usex test OFF ON)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/mbelib/mbelib-1.3.0.ebuild b/media-libs/mbelib/mbelib-1.3.0.ebuild
deleted file mode 100644
index 8c38b891b..000000000
--- a/media-libs/mbelib/mbelib-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils multilib
-
-HOMEPAGE="https://github.com/szechyjs/mbelib"
-DESCRIPTION="P25 Phase 1 and ProVoice vocoder"
-LICENSE="BSD"
-SLOT=0
-IUSE=static-libs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/szechyjs/mbelib.git"
-	KEYWORDS=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/szechyjs/mbelib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-src_prepare() {
-	sed -i -e "s#X}/lib#X}/$(get_libdir)#" -e "s#N lib#N $(get_libdir)#" "${S}/CMakeLists.txt"
-	eapply_user
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libmbe.a
-}
diff --git a/media-libs/mbelib/mbelib-9999.ebuild b/media-libs/mbelib/mbelib-9999.ebuild
index aeca4645f..063904635 100644
--- a/media-libs/mbelib/mbelib-9999.ebuild
+++ b/media-libs/mbelib/mbelib-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils multilib
 
@@ -10,22 +10,29 @@ HOMEPAGE="https://github.com/szechyjs/mbelib"
 DESCRIPTION="P25 Phase 1 and ProVoice vocoder"
 LICENSE="BSD"
 SLOT=0
-IUSE=static-libs
+IUSE="test"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/szechyjs/mbelib.git"
 	KEYWORDS=""
 	inherit git-r3
 else
-	SRC_URI="https://github.com/szechyjs/mbelib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="9a04ed5c78176a9965f3d43f7aa1b1f5330e771f"
+	SRC_URI="https://github.com/szechyjs/mbelib/archive/9a04ed5c78176a9965f3d43f7aa1b1f5330e771f.tar.gz -> ${P}-r1.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 src_prepare() {
-	sed -i -e "s#X}/lib#X}/$(get_libdir)#" -e "s#N lib#N $(get_libdir)#" "${S}/CMakeLists.txt"
+	sed -i -e '/TARGET_LINK_LIBRARIES(mbe-static m)/d' \
+		-e '/ADD_LIBRARY(mbe-static STATIC ${SRCS})/d' \
+		-e 's#mbe-static ##g' CMakeLists.txt
+	cmake-utils_src_prepare
 }
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/libmbe.a
+src_configure() {
+	mycmakeargs=(
+		CMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
+		-DDISABLE_TEST="$(usex test OFF ON)"
+	)
+	cmake-utils_src_configure
 }
diff --git a/net-wireless/dsd/Manifest b/net-wireless/dsd/Manifest
index e0bc9000d..2646cdc22 100644
--- a/net-wireless/dsd/Manifest
+++ b/net-wireless/dsd/Manifest
@@ -1 +1 @@
-DIST dsd-1.6.0.tar.gz 40959 BLAKE2B 642e1f55ab562c79e8e448269d33c947ba65c27a97af3e41956597abaf5bcbd45405add5a08b6ef346ca6fd0e2f7aa4a1f58d663b58028bed9053a68bb562949 SHA512 a7a7ddef091efe2bc6a20bb0c21d1ba176d7e9a54dbfca407e8b768ba31e4be533f28842a1985ceb2d7379dc4ff9ad437ac677e3044350b0ad47769c8237cca1
+DIST dsd-1.7.0_pre20180701.tar.gz 437985 BLAKE2B 3acc90d0dac0913dc86920ae732280563da84fa7f1996fefa2b8240dd03dfcbbd89f8133de5fb9b609d76c9fadab8612a95852748dcb35cf7c8e5336822b3c1f SHA512 6cda59541f2ee2ef67bba561297c42e96e765122886e580808c44b7ffa04049ed622e22e8d9d652b6735b7ca15fe149712e4171bf00d21052d2528addb5a58ca
diff --git a/net-wireless/dsd/dsd-1.6.0.ebuild b/net-wireless/dsd/dsd-1.6.0.ebuild
deleted file mode 100644
index ef594260a..000000000
--- a/net-wireless/dsd/dsd-1.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Digital Speech Decoder"
-HOMEPAGE="https://github.com/szechyjs/dsd"
-LICENSE="bsd"
-SLOT="0"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/szechyjs/dsd.git"
-	KEYWORDS=""
-	inherit git-r3
-	DEPEND="=media-libs/mbelib-9999"
-
-else
-	SRC_URI="https://github.com/szechyjs/dsd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-
-DEPEND="${DEPEND}
-	>=sci-libs/itpp-4.3.1
-	media-libs/libsndfile
-	sci-libs/fftw:3.0
-"
-
-src_prepare() {
-	sed -i \
-		-e "s#DEST_BASE=/usr/local#DEST_BASE=${ED}/usr/#" \
-		-e "s#CFLAGS =#CFLAGS ?=#" \
-		-e 's#$(CFLAGS)#$(CFLAGS) $(LDFLAGS)#' \
-		-e '#CFLAGS ?=#a LDFLAGS?=#' \
-		Makefile
-}
-
-src_install() {
-	dodir /usr/bin
-	default
-}
diff --git a/net-wireless/dsd/dsd-1.7.0_pre20180701.ebuild b/net-wireless/dsd/dsd-1.7.0_pre20180701.ebuild
new file mode 100644
index 000000000..8d24d22d2
--- /dev/null
+++ b/net-wireless/dsd/dsd-1.7.0_pre20180701.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Digital Speech Decoder"
+HOMEPAGE="https://github.com/szechyjs/dsd"
+LICENSE="bsd"
+SLOT="0"
+IUSE="test"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/szechyjs/dsd.git"
+	KEYWORDS=""
+	inherit git-r3
+
+else
+	COMMIT="f175834e45a1a190171dff4597165b27d6b0157b"
+	SRC_URI="https://github.com/szechyjs/dsd/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+
+DEPEND="
+	>=media-libs/mbelib-1.3.0-r1
+	media-libs/portaudio
+	>=sci-libs/itpp-4.3.1
+	media-libs/libsndfile
+	sci-libs/fftw:3.0
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DDISABLE_TEST="$(usex test OFF ON)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/dsd/dsd-9999.ebuild b/net-wireless/dsd/dsd-9999.ebuild
index 67a7c7fc6..8d24d22d2 100644
--- a/net-wireless/dsd/dsd-9999.ebuild
+++ b/net-wireless/dsd/dsd-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -10,21 +10,33 @@ DESCRIPTION="Digital Speech Decoder"
 HOMEPAGE="https://github.com/szechyjs/dsd"
 LICENSE="bsd"
 SLOT="0"
+IUSE="test"
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/szechyjs/dsd.git"
 	KEYWORDS=""
 	inherit git-r3
-	DEPEND="=media-libs/mbelib-9999"
 
 else
-	SRC_URI="https://github.com/szechyjs/dsd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="f175834e45a1a190171dff4597165b27d6b0157b"
+	SRC_URI="https://github.com/szechyjs/dsd/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 
-DEPEND="${DEPEND}
+DEPEND="
+	>=media-libs/mbelib-1.3.0-r1
+	media-libs/portaudio
 	>=sci-libs/itpp-4.3.1
 	media-libs/libsndfile
 	sci-libs/fftw:3.0
 "
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DDISABLE_TEST="$(usex test OFF ON)"
+	)
+	cmake-utils_src_configure
+}