gentoo resync : 13.10.2019

4 files changed, 88 insertions, 4 deletions

diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 1678c77b570c..b544ca901b03 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,6 +4,7 @@ AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53
 AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r4.ebuild 1772 BLAKE2B 791a089b3da139f5511447fa9d8e428b6e4a30d6b14488b0d68649c17c838f27a1708c2e09483b0230f86bfceb09e737405f35dfb718f8e641cc3ce942caf7d0 SHA512 fd498387c1f74667570d46ffa7dfd8cbb59ef004054c9296b889cad0a273e5d76825ec6ee5cf087015f1f6ca95edf62c44c65739225da425778d85325e4a4ac6
-EBUILD dmalloc-5.5.2-r6.ebuild 1938 BLAKE2B 8c85ec02cc25cb8f022731181d23591b1781d7d54b35c24631dbc6ce7b309bbee17c05f67eeeb3f56d0b777c5b06c41acc5b64db8e2f5dcba5e5ec26e25299e8 SHA512 aed2ed6e1402a2669a031fa98a9969ec0e0613299a7e138c66e0b0bd33762825662ed59f151bf979ae96716027acd41c134de2d2f6f7236748536dec37d0c7fc
+EBUILD dmalloc-5.5.2-r4.ebuild 1750 BLAKE2B 9669a1d5b365f1d24c3ff6ca4e3df5f5af97a779c5f046eed3f0f13f8a85325e642872859c3900459120ee29338b9bb559ae73eb7cc5211e91dfb8a64edfc3de SHA512 b9f4531a4db6864f217fd61338b4fcb0111a36ade6a663c65445ca33a6b49cc1188ac73490d2c9c3c3b03b61e71c2aa9f912f63931853f6563261e3b4c31d42f
+EBUILD dmalloc-5.5.2-r6.ebuild 1916 BLAKE2B 431e238b85cb9fbb37a082202a33c715f5249e2da0252302d2b681b14c093b6590d258cf3e0190a66ce905933258bb8d9f802d42d006c5056eb162f4893dd364 SHA512 4bfa2ea6d13ad1cfa1524a1fc20dcfaee27d06153793c7947a6f4dee9a6ff59e2df3c18a6ea11ac2496cdab625fb57e3df8fc04cb16b200abca3846d4d90576b
+EBUILD dmalloc-5.5.2-r7.ebuild 1867 BLAKE2B a749d69dca06f652fe1bd4c34780957aeb99f190b276fa797170df4c6d901b269139e48a8780ed8f181f025ef20c30fdf168a350f4e4ae4c76e8c82bf89598b6 SHA512 f2abaece08c31f0803987ce919a7c9a5e6535dfca251381b25c5fd31db2204f2351826100a4a2c18600fa594d01cf2e2c5fe75ff47ed77e05ee7210a25e54e64
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
index cfc84a7048d0..e4aec86af70b 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
index db39b903e2d4..f154f33e3ad0 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://dmalloc.com/releases/${P}.tgz"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="static-libs threads"
 
 DEPEND="sys-apps/texinfo"
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
new file mode 100644
index 000000000000..8c427e5ca7b3
--- /dev/null
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib toolchain-funcs
+
+DESCRIPTION="A Debug Malloc Library"
+HOMEPAGE="http://dmalloc.com"
+SRC_URI="http://dmalloc.com/releases/${P}.tgz"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs threads"
+
+DEPEND="sys-apps/texinfo"
+DOCS=( NEWS README docs/NOTES docs/TODO )
+PATCHES=(
+	# - Build objects twice, once -fPIC for shared.
+	# - Use DESTDIR.
+	# - Fix SONAME and NEEDED.
+	"${FILESDIR}"/${P}-Makefile.in.patch
+	# - Broken test, always returns false.
+	"${FILESDIR}"/${P}-cxx.patch
+	"${FILESDIR}"/${P}-ar.patch
+	# strdup() strndup() macros
+	"${FILESDIR}"/${P}-string-macros.patch
+)
+
+src_prepare() {
+	default
+
+	# - Add threads support.
+	use threads && eapply "${FILESDIR}"/${P}-threads.patch
+
+	# Respect CFLAGS/LDFLAGS. #337429
+	sed -i \
+		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
+		-e 's|ar cr|$(AR) cr|g' \
+		Makefile.in || die
+
+	# Run autoconf for -cxx.patch.
+	eautoconf
+}
+
+src_configure() {
+	tc-export AR
+	econf --enable-cxx --enable-shlib $(use_enable threads)
+}
+
+src_compile() {
+	default
+
+	cd docs
+	makeinfo dmalloc.texi || die
+}
+
+src_test() {
+	emake heavy
+}
+
+src_install() {
+	default
+
+	newdoc ChangeLog.1 ChangeLog
+	dodoc docs/dmalloc.pdf
+	dodoc RELEASE.html docs/dmalloc.html
+	doinfo docs/dmalloc.info
+
+	# add missing symlinks, lazy
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*}
+
+	for lib in cxx th thcxx; do
+		dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so
+		dosym lib${PN}${lib}.so.${PV} \
+			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
+	done
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
+	fi
+}