gentoo resync : 25.08.2020

3 files changed, 96 insertions, 0 deletions

diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 9c687882abc9..9d7b0259e87e 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -3,6 +3,8 @@ AUX dmalloc-5.5.2-ar.patch 390 BLAKE2B d339b90b38b045ef929a661aa2fb0c95e35a89bd8
 AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53eb9faf7ccbd022ea9e596ebcefe0038fa894bf2782e08c53dab3a8d89fc43153e9bef34a2c84771fcf497bd5 SHA512 370ff73c4af16d7b4cb5e15a88f3cafcc16494df7df50c4494b1e34ed687f1385b774431cc94a9ba75ef96f2828f75501ee2d0addc9d3e34d4f718ac94ae5f6d
 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
+AUX dmalloc-999999-texi2html.patch 355 BLAKE2B 3b599bdfa45f6c781b446d72cab79acb6f6b59e0c648989c1012b625f4e07ed5b0934cd4c21865af154a1745e1ce2b72bf90f738efa40d7c2654e5e2723b389c SHA512 e29aba00d3e5edf0639685858215736f3aed4baa9f7b79577a69bf5e2e51a0072e92befe7ad0e24a68ea35e184271c15312b5acea145ff1a186eb0d35a985c72
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
 EBUILD dmalloc-5.5.2-r7.ebuild 1856 BLAKE2B 5b53473108b3734739b190bcbb6de70223f995c56eb2970c60711e2fe0381acc64fe63c7077bc827e9c9fab93787887d1cc11eaa45fc0f6c3b5d356c31a67f35 SHA512 2f38656b920367281a179afb298c7fc2a4cbe7f3db56001f9812711c6836ad18e579c7e78427d110b329a528b443bf40852aaae92819b2aa8e13d88dcbd18f57
+EBUILD dmalloc-999999.ebuild 1715 BLAKE2B a531973e0e40ca54c17ae6f9b48b8b6b6cd211d4c1e97a0ee8ee22295433c28542344bcaec213cf7576cb3fdae1b3afb10a21ef4e3c783d57a2df5ac514f653c SHA512 a82821e40cb40fe7a88b6b840138894a1cd7823a716a369115bbae82ea046dbae1cf202cb0c6c789e177954133dcd70120091b6b1c8e29df2ad2aa595873ece2
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-999999.ebuild b/dev-libs/dmalloc/dmalloc-999999.ebuild
new file mode 100644
index 000000000000..d0ea9940859a
--- /dev/null
+++ b/dev-libs/dmalloc/dmalloc-999999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools git-r3 multilib toolchain-funcs
+
+DESCRIPTION="A Debug Malloc Library"
+HOMEPAGE="https://dmalloc.com"
+EGIT_REPO_URI="https://github.com/j256/dmalloc"
+
+LICENSE="CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="static-libs 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.
+	# - Fix SONAME and NEEDED.
+	"${FILESDIR}"/${PN}-5.5.2-Makefile.in.patch
+	# - Broken test, always returns false.
+	"${FILESDIR}"/${PN}-5.5.2-cxx.patch
+	"${FILESDIR}"/${PN}-5.5.2-ar.patch
+	"${FILESDIR}"/${PN}-999999-texi2html.patch
+)
+
+src_prepare() {
+	default
+
+	# - Add threads support.
+	use threads && eapply "${FILESDIR}"/${PN}-5.5.2-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
+
+#	makeinfo dmalloc.texi || die
+}
+
+src_test() {
+	emake heavy
+}
+
+src_install() {
+	default
+
+	doinfo dmalloc.info
+
+	# add missing symlinks, lazy
+	dosym lib${PN}.so.5.5.2 /usr/$(get_libdir)/lib${PN}.so
+	dosym lib${PN}.so.5.5.2 /usr/$(get_libdir)/lib${PN}.so.5
+
+	for lib in cxx th thcxx; do
+		dosym lib${PN}${lib}.so.5.5.2 /usr/$(get_libdir)/lib${PN}${lib}.so
+		dosym lib${PN}${lib}.so.5.5.2 \
+			/usr/$(get_libdir)/lib${PN}${lib}.so.5
+	done
+
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
+	fi
+}
diff --git a/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch b/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch
new file mode 100644
index 000000000000..1e7e4ccd1eb1
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-999999-texi2html.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -285,7 +285,7 @@
+ 
+ dmalloc.html : $(srcdir)/dmalloc.texi
+ 	rm -f $@ $@.t
+-	texi2html  --output=$@.t -number -monolithic $(srcdir)/dmalloc.texi
++	texi2html  --output=$@.t --number-footnotes --number-sections -monolithic $(srcdir)/dmalloc.texi
+ 	mv $@.t $@
+ 
+ settings.h : $(srcdir)/settings.dist $(srcdir)/configure