From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1267045-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id E92E11382C5
	for <garchives@archives.gentoo.org>; Sat,  3 Apr 2021 23:07:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1577AE0831;
	Sat,  3 Apr 2021 23:07:44 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id E4D29E0831
	for <gentoo-commits@lists.gentoo.org>; Sat,  3 Apr 2021 23:07:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 34079340B46
	for <gentoo-commits@lists.gentoo.org>; Sat,  3 Apr 2021 23:07:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C10D4A8
	for <gentoo-commits@lists.gentoo.org>; Sat,  3 Apr 2021 23:07:40 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1617489785.85a677251bb7a08cf311f40ba0ca7d35111f813b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/dmalloc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild dev-libs/dmalloc/dmalloc-999999.ebuild
X-VCS-Directories: dev-libs/dmalloc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 85a677251bb7a08cf311f40ba0ca7d35111f813b
X-VCS-Branch: master
Date: Sat,  3 Apr 2021 23:07:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4194a586-c327-4db7-bda6-955450ea3371
X-Archives-Hash: 2859da9d26595cfbec09e2b64cea3ce4

commit:     85a677251bb7a08cf311f40ba0ca7d35111f813b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 22:43:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 22:43:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a67725

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

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

 dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild | 21 +++++++++++++--------
 dev-libs/dmalloc/dmalloc-999999.ebuild   | 21 ++++++++++++---------
 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 fb49d37d57e..2a8cb602185 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 8408576bf00..e94bdfb5003 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
 }