dev-libs/dmalloc: multilib--, static-libs--

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 25 insertions, 17 deletions

diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
index fb49d37d57e2..2a8cb6021859 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib toolchain-funcs
+
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="https://dmalloc.com"
@@ -11,10 +12,12 @@ SRC_URI="https://dmalloc.com/releases/${P}.tgz"
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs threads"
+IUSE="threads"
+
+BDEPEND="sys-apps/texinfo"
 
-DEPEND="sys-apps/texinfo"
 DOCS=( NEWS README docs/NOTES docs/TODO )
+
 PATCHES=(
 	# - Build objects twice, once -fPIC for shared.
 	# - Use DESTDIR.
@@ -45,7 +48,11 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
-	econf --enable-cxx --enable-shlib $(use_enable threads)
+
+	econf \
+		--enable-cxx \
+		--enable-shlib \
+		$(use_enable threads)
 }
 
 src_compile() {
@@ -77,7 +84,5 @@ src_install() {
 			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
 	done
 
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
 }
diff --git a/dev-libs/dmalloc/dmalloc-999999.ebuild b/dev-libs/dmalloc/dmalloc-999999.ebuild
index 8408576bf003..e94bdfb50036 100644
--- a/dev-libs/dmalloc/dmalloc-999999.ebuild
+++ b/dev-libs/dmalloc/dmalloc-999999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools git-r3 multilib toolchain-funcs
+
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="A Debug Malloc Library"
 HOMEPAGE="https://dmalloc.com"
@@ -10,16 +11,17 @@ EGIT_REPO_URI="https://github.com/j256/dmalloc"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS=""
-IUSE="static-libs threads"
+IUSE="threads"
 
 BDEPEND="
 	app-text/texi2html
 	sys-apps/texinfo
 "
+
 DOCS=(
 	ChangeLog.txt README.md TODO dmalloc.html
 )
+
 PATCHES=(
 	# - Build objects twice, once -fPIC for shared.
 	# - Use DESTDIR.
@@ -49,13 +51,16 @@ src_prepare() {
 
 src_configure() {
 	tc-export AR
-	econf --enable-cxx --enable-shlib $(use_enable threads)
+	econf \
+		--enable-cxx \
+		--enable-shlib \
+		$(use_enable threads)
 }
 
 src_compile() {
 	default
 
-#	makeinfo dmalloc.texi || die
+	#makeinfo dmalloc.texi || die
 }
 
 src_test() {
@@ -77,7 +82,5 @@ src_install() {
 			/usr/$(get_libdir)/lib${PN}${lib}.so.5
 	done
 
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
+	rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
 }