Build objects twice, once -fPIC for shared and once without for static. REALLY fix soname handling. Also includes the previous fix for DESTDIR. Restore ~amd64 since it's usable again.

Package-Manager: portage-2.1.4_rc11

6 files changed, 446 insertions, 5 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index c847fcc4540a..62bc2cdc3445 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/dmalloc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.33 2007/12/27 15:03:12 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.34 2007/12/27 17:42:19 drac Exp $
+
+*dmalloc-5.5.2-r1 (27 Dec 2007)
+
+  27 Dec 2007; Samuli Suominen <drac@gentoo.org>
+  +files/dmalloc-5.5.2-Makefile.in.patch, +files/dmalloc-5.5.2-cxx.patch,
+  +dmalloc-5.5.2-r1.ebuild:
+  Build objects twice, once -fPIC for shared and once without for static.
+  REALLY fix soname handling. Also includes the previous fix for DESTDIR.
+  Restore ~amd64 since it's usable again.
 
   27 Dec 2007; Samuli Suominen <drac@gentoo.org> dmalloc-5.4.2.ebuild,
   dmalloc-5.5.2.ebuild:
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index d3af5ed582ef..43ef4102768b 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -18,10 +18,18 @@ AUX dmalloc-5.4.2-sandbox.patch 2961 RMD160 f6fb37c3928e9b26f31ed471f61a3ee783cd
 MD5 d2bee893329cf15e900c4b653a533a0c files/dmalloc-5.4.2-sandbox.patch 2961
 RMD160 f6fb37c3928e9b26f31ed471f61a3ee783cdedf5 files/dmalloc-5.4.2-sandbox.patch 2961
 SHA256 626ea71be0d1e5433ba8f2e13f6033f9abfe386b35ad68966d131da105f528a3 files/dmalloc-5.4.2-sandbox.patch 2961
+AUX dmalloc-5.5.2-Makefile.in.patch 14015 RMD160 fa1abc717d769b83290f196f5b0302141202fda7 SHA1 e6200156c2744d2f4890be03c622c7706397df50 SHA256 a52b91c5bd0ab75773f121c35b398564096b39da684ea4ad691687e08d2e2467
+MD5 4079451e0cb1ab126b549dea2ac45ed6 files/dmalloc-5.5.2-Makefile.in.patch 14015
+RMD160 fa1abc717d769b83290f196f5b0302141202fda7 files/dmalloc-5.5.2-Makefile.in.patch 14015
+SHA256 a52b91c5bd0ab75773f121c35b398564096b39da684ea4ad691687e08d2e2467 files/dmalloc-5.5.2-Makefile.in.patch 14015
 AUX dmalloc-5.5.2-SONAME.patch 725 RMD160 be1c7b304487931e1233ec0560baacc428f926ea SHA1 fd3551ed0ed7a922533c7cab5e63843e7b6d013d SHA256 8fee842ff7bd1c1207fee05a4e1a6103c5e5f3eb3f9f1fa3ff60300e80ba196e
 MD5 82853f8cef039c8c6bd57ebf14430a9b files/dmalloc-5.5.2-SONAME.patch 725
 RMD160 be1c7b304487931e1233ec0560baacc428f926ea files/dmalloc-5.5.2-SONAME.patch 725
 SHA256 8fee842ff7bd1c1207fee05a4e1a6103c5e5f3eb3f9f1fa3ff60300e80ba196e files/dmalloc-5.5.2-SONAME.patch 725
+AUX dmalloc-5.5.2-cxx.patch 715 RMD160 63cdd7923f5b78b3dd1d04c25154ce3a91dd4474 SHA1 e36c84def65434d67a666ba16963b4ab98cff296 SHA256 c488baec7cb90a57b0256459c7e38fd6e0cddef0682a60ae98bfedca9292897d
+MD5 771bb5e35d5b00c942a7a8e464d979d6 files/dmalloc-5.5.2-cxx.patch 715
+RMD160 63cdd7923f5b78b3dd1d04c25154ce3a91dd4474 files/dmalloc-5.5.2-cxx.patch 715
+SHA256 c488baec7cb90a57b0256459c7e38fd6e0cddef0682a60ae98bfedca9292897d files/dmalloc-5.5.2-cxx.patch 715
 AUX dmalloc-5.5.2-respect-DESTDIR.diff 4381 RMD160 24b0ed6f0f4c99c5aaa45d1dc0e9d00257798ee3 SHA1 a895b2056186a601224ccec9c9124f19b873ba77 SHA256 6313a7ac8c43d16e9e1f5332190ef86b5a1df8b378ef985e3a87dd5642be6364
 MD5 edf92700dbc505247b2355cddd1ad2c8 files/dmalloc-5.5.2-respect-DESTDIR.diff 4381
 RMD160 24b0ed6f0f4c99c5aaa45d1dc0e9d00257798ee3 files/dmalloc-5.5.2-respect-DESTDIR.diff 4381
@@ -42,14 +50,18 @@ EBUILD dmalloc-5.4.2.ebuild 1044 RMD160 6c1e67c7af243674355b869605e584da10be5ff2
 MD5 1e305192d70bf1bef23d7333da906258 dmalloc-5.4.2.ebuild 1044
 RMD160 6c1e67c7af243674355b869605e584da10be5ff2 dmalloc-5.4.2.ebuild 1044
 SHA256 0f08583bc8a5194a6e31815a6caa77cfa66fcb7fc927469da7beafe3a180cd72 dmalloc-5.4.2.ebuild 1044
+EBUILD dmalloc-5.5.2-r1.ebuild 1254 RMD160 b8c344a4b265fc20ef29bd98a713ed6a2a60ecc3 SHA1 c07b7d04033b42d6d24a81fabff4e36074814d99 SHA256 142a4a0e778ffdbd79166f3c202a3eb80a25ddb1c453765101b3225bcb28e5fa
+MD5 6e617546826921ca74e41db0706c2d43 dmalloc-5.5.2-r1.ebuild 1254
+RMD160 b8c344a4b265fc20ef29bd98a713ed6a2a60ecc3 dmalloc-5.5.2-r1.ebuild 1254
+SHA256 142a4a0e778ffdbd79166f3c202a3eb80a25ddb1c453765101b3225bcb28e5fa dmalloc-5.5.2-r1.ebuild 1254
 EBUILD dmalloc-5.5.2.ebuild 1390 RMD160 873b6f7b47d523a935764ce6583922c0317b0707 SHA1 55c5c5fbbf35a1a60bdadf5ecca6a3b40020f718 SHA256 54b65d933b00cd5809cac80478e232c315a3ddcde594800b0b91aec36e61323d
 MD5 aae32afa28765eb27e35f54d82457bd4 dmalloc-5.5.2.ebuild 1390
 RMD160 873b6f7b47d523a935764ce6583922c0317b0707 dmalloc-5.5.2.ebuild 1390
 SHA256 54b65d933b00cd5809cac80478e232c315a3ddcde594800b0b91aec36e61323d dmalloc-5.5.2.ebuild 1390
-MISC ChangeLog 4509 RMD160 c16b12bff37565853d46037a54ead7e2ec35a958 SHA1 481ac6212bf15ef7277e09337d636aa55ca70353 SHA256 9ddb75fe91a20f99fec606c2f22acadfe5db527590070cc77a45a0ea8204963c
-MD5 cc2eb8ca4b17c8e531bd94daad62dc78 ChangeLog 4509
-RMD160 c16b12bff37565853d46037a54ead7e2ec35a958 ChangeLog 4509
-SHA256 9ddb75fe91a20f99fec606c2f22acadfe5db527590070cc77a45a0ea8204963c ChangeLog 4509
+MISC ChangeLog 4884 RMD160 7849e0ef1584035f02f10f6dd132492c2de084a4 SHA1 4f276386bb387530efe20189ec963721c77df652 SHA256 4a514ce65552050ce41b140f10a2167d53f37e2cb1bbba710b0eb09bca5fc739
+MD5 a0f700376210afa77b4ac8626a667170 ChangeLog 4884
+RMD160 7849e0ef1584035f02f10f6dd132492c2de084a4 ChangeLog 4884
+SHA256 4a514ce65552050ce41b140f10a2167d53f37e2cb1bbba710b0eb09bca5fc739 ChangeLog 4884
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -66,3 +78,6 @@ SHA256 e851fd2b3db4f4633494e5d733aa164712f959a8402d9c46042b9eb425a3418e files/di
 MD5 b540abd2632dab2b61fa4f158998e50d files/digest-dmalloc-5.5.2 232
 RMD160 a46552d869a1fbc4f4f7d8a54de58b656dad658a files/digest-dmalloc-5.5.2 232
 SHA256 9af32696ccbebdd9fc2f53f33af7de974b9eca08a5a4a82cefbe642a23039ac4 files/digest-dmalloc-5.5.2 232
+MD5 b540abd2632dab2b61fa4f158998e50d files/digest-dmalloc-5.5.2-r1 232
+RMD160 a46552d869a1fbc4f4f7d8a54de58b656dad658a files/digest-dmalloc-5.5.2-r1 232
+SHA256 9af32696ccbebdd9fc2f53f33af7de974b9eca08a5a4a82cefbe642a23039ac4 files/digest-dmalloc-5.5.2-r1 232
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild
new file mode 100644
index 000000000000..cf0a91ea4160
--- /dev/null
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild,v 1.1 2007/12/27 17:42:19 drac Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="A Debug Malloc Library"
+HOMEPAGE="http://dmalloc.com"
+SRC_URI="http://dmalloc.com/releases/${P}.tgz"
+
+LICENSE="CCPL-Attribution-ShareAlike-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# - Build objects twice, once -fPIC for shared.
+	# - Use DESTDIR.
+	# - Fix SONAME and NEEDED.
+	epatch "${FILESDIR}"/${P}-Makefile.in.patch
+	# - Broken test, always returns false.
+	epatch "${FILESDIR}"/${P}-cxx.patch
+	# - Run autoconf for -cxx.patch.
+	eautoconf
+}
+
+src_compile() {
+	econf --enable-cxx --enable-threads --enable-shlib
+	emake || die "emake failed."
+	cd docs && makeinfo dmalloc.texi
+}
+
+src_test() {
+	emake heavy || die "emake check failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	newdoc ChangeLog.1 ChangeLog
+	dodoc NEWS README docs/NOTES docs/TODO
+	insinto /usr/share/doc/${PF}
+	doins docs/dmalloc.pdf
+	dohtml RELEASE.html docs/dmalloc.html
+	doinfo docs/dmalloc.info
+}
diff --git a/dev-libs/dmalloc/files/digest-dmalloc-5.5.2-r1 b/dev-libs/dmalloc/files/digest-dmalloc-5.5.2-r1
new file mode 100644
index 000000000000..979781dc57ea
--- /dev/null
+++ b/dev-libs/dmalloc/files/digest-dmalloc-5.5.2-r1
@@ -0,0 +1,3 @@
+MD5 f92e5606c23a8092f3d5694e8d1c932e dmalloc-5.5.2.tgz 666608
+RMD160 2cfe4daa453337e0fae0656bdbdaad1214d6243d dmalloc-5.5.2.tgz 666608
+SHA256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz 666608
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch
new file mode 100644
index 000000000000..d842990d5c2c
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-Makefile.in.patch
@@ -0,0 +1,344 @@
+diff -ur dmalloc-5.5.2.orig/Makefile.in dmalloc-5.5.2/Makefile.in
+--- dmalloc-5.5.2.orig/Makefile.in	2007-05-14 20:26:14.000000000 +0300
++++ dmalloc-5.5.2/Makefile.in	2007-12-27 19:23:54.000000000 +0200
+@@ -41,7 +41,7 @@
+ 
+ # thread version of the library
+ LIB_TH	= lib$(MODULE)th.a
+-LIB_TH_SL = lib$(MODULE)th.@shlibext@
++LIB_TH_SL = lib$(MODULE)th.@shlibext@.5.5.2
+ @TH_ON@BUILD_ALL_1 = threads
+ @TH_ON@INSTALL_LIB_1 = installth
+ @SL_ON@BUILD_THREADS_1 = $(LIB_TH_SL)
+@@ -50,8 +50,8 @@
+ @TH_ON@@SL_ON@INSTALL_LIB_2 = installthsl
+ 
+ # C++ version of the library
+-LIB_CXX	= lib$(MODULE)xx.a
+-LIB_CXX_SL = lib$(MODULE)xx.@shlibext@
++LIB_CXX	= lib$(MODULE)cxx.a
++LIB_CXX_SL = lib$(MODULE)cxx.@shlibext@.5.5.2
+ @CXX_ON@BUILD_ALL_3 = $(LIB_CXX)
+ @CXX_ON@INSTALL_LIB_3 = installcxx
+ @SL_ON@BUILD_CXX_3 = $(LIB_CXX_SL)
+@@ -61,7 +61,7 @@
+ 
+ # threads + C++
+ LIB_TH_CXX = lib$(MODULE)thcxx.a
+-LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@
++LIB_TH_CXX_SL = lib$(MODULE)thcxx.@shlibext@.5.5.2
+ @TH_ON@@CXX_ON@BUILD_ALL_5 = $(LIB_TH_CXX)
+ @TH_ON@@CXX_ON@INSTALL_LIB_5 = installthcxx
+ @TH_ON@BUILD_CXX_5 = $(LIB_TH_CXX)
+@@ -76,7 +76,7 @@
+ @CXX_ON@@SL_ON@INSTALL_THREADS_6 = installthcxxsl
+ 
+ # shared versions of the libraries
+-LIB_SL = lib$(MODULE).@shlibext@
++LIB_SL = lib$(MODULE).@shlibext@.5.5.2
+ @SL_ON@BUILD_ALL_7 = $(LIB_SL)
+ @SL_ON@INSTALL_LIB_7 = installsl
+ @SL_ON@BUILD_TH_CXX_7 = $(LIB_TH_CXX_SL)
+@@ -145,9 +145,13 @@
+ 
+ HFLS = dmalloc.h
+ OBJS = arg_check.o compat.o dmalloc_rand.o dmalloc_tab.o env.o heap.o
++OBJS_SL = arg_check_sl.o compat_sl.o dmalloc_rand_sl.o dmalloc_tab_sl.o env_sl.o heap_sl.o
+ NORMAL_OBJS = chunk.o error.o malloc.o
++NORMAL_OBJS_SL = chunk_sl.o error_sl.o malloc_sl.o
+ THREAD_OBJS = chunk_th.o error_th.o malloc_th.o
++THREAD_OBJS_SL = chunk_th_sl.o error_th_sl.o malloc_th_sl.o
+ CXX_OBJS = dmallocc.o
++CXX_OBJS_SL = dmallocc_sl.o
+ 
+ CFLAGS = $(CCFLAGS)
+ TEST = $(MODULE)_t
+@@ -160,9 +164,9 @@
+ 
+ clean :
+ 	rm -f $(A_OUT) core *.o *.t
+-	rm -f $(LIBRARY) $(LIB_TH) $(LIB_CXX) $(LIB_TH_CXX) $(TEST) $(TEST_FC)
+-	rm -f $(LIB_TH_SL) $(LIB_CXX_SL) $(LIB_TH_CXX_SL) $(LIB_SL)
++	rm -f $(TEST) $(TEST_FC)
+ 	rm -f $(UTIL) dmalloc.h
++	rm -f lib$(MODULE)*.*
+ 
+ realclean : clean
+ 
+@@ -174,65 +178,65 @@
+ #	rm -f configure
+ 
+ installdirs :
+-	$(srcdir)/mkinstalldirs $(includedir) $(libdir) $(bindir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
+ 
+ installincs : $(HFLS)
+-	$(srcdir)/mkinstalldirs $(includedir)
+-	$(INSTALL_DATA) $(HFLS) $(includedir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
++	$(INSTALL_DATA) $(HFLS) $(DESTDIR)$(includedir)
+ 
+ installthsl : $(LIB_TH_SL)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIB_TH_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL) $(LIB_TH_SL) $(DESTDIR)$(shlibdir)
+ 
+ installth : $(INSTALL_THREADS)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIB_TH) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL) $(LIB_TH) $(DESTDIR)$(libdir)
+ @CXX_OFF@	@echo "Enter 'make installthcxx' to install the threaded C++ library"
+ @SL_OFF@	@echo "Enter 'make installthsl' to install the threaded shared-library"
+ 
+ installthcxxsl : $(LIB_TH_CXX_SL)
+-	$(srcdir)/mkinstalldirs $(shlibdir)
+-	$(INSTALL_PROGRAM) $(LIB_TH_CXX_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL) $(LIB_TH) $(DESTDIR)$(libdir)
+ 
+ installthcxx : $(INSTALL_TH_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIB_TH_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL) $(LIB_TH_CXX) $(DESTDIR)$(libdir)
+ @SL_OFF@	@echo "Enter 'make installthcxxsl' to install the threaded C++ shared-library"
+ 
+ installcxxsl : $(LIB_CXX_SL)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIB_CXX_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL) $(LIB_CXX_SL) $(DESTDIR)$(shlibdir)
+ 
+ installcxx : $(INSTALL_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIB_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL) $(LIB_CXX) $(DESTDIR)$(libdir)
+ @TH_OFF@	@echo "Enter 'make installthcxx' to install the threaded C++ library"
+ @SL_OFF@	@echo "Enter 'make installcxxsl' to install the C++ shared-library"
+ 
+ installsl : $(LIB_SL)
+-	$(srcdir)/mkinstalldirs $(shlibdir)
+-	$(INSTALL_PROGRAM) $(LIB_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL) $(LIB_SL) $(DESTDIR)$(shlibdir)
+ @CXX_OFF@	@echo "Enter 'make installcxxsl' to install the C++ shared-library"
+ @TH_OFF@	@echo "Enter 'make installthsl' to install thread shared-library"
+ 
+ installlib : $(INSTALL_LIB)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_PROGRAM) $(LIBRARY) $(libdir)
+-	@RANLIB@ $(libdir)/$(LIBRARY)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
++	@RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY)
+ @SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
+ @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
+ @TH_OFF@	@echo "Enter 'make installth' to install thread library"
+ 
+ installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE) \
+ 		$(srcdir)/docs/$(PDFFILE)
+-	$(srcdir)/mkinstalldirs $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(docdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(PDFFILE) $(DESTDIR)$(docdir)
+ 
+ install : installincs installlib $(UTIL)
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) $(UTIL) $(bindir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir)
+ 	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)"
+ 
+ dmalloc.h.2 : $(srcdir)/configure
+@@ -255,10 +259,8 @@
+ # NOTE: you may have to edit the configure.ac script to get this to
+ # work on your operating system.  Please send feedback to the author
+ # via: http://256.com/gray/email.html
+-$(LIB_SL) : $(LIBRARY)
+-	rm -f $@ $@.t
+-	@shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS)
+-	mv $@.t $@
++$(LIB_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL)
++	$(CC) -shared -Wl,-soname,libdmalloc.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL)
+ 
+ $(LIBRARY) : $(OBJS) $(NORMAL_OBJS)
+ 	ar cr $@ $?
+@@ -268,32 +270,26 @@
+ 	ar cr $@ $?
+ 	@RANLIB@ $@
+ 
+-$(LIB_TH_SL) : $(LIB_TH)
+-	rm -f $@ $@.t
+-	@shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS)
+-	mv $@.t $@
++$(LIB_TH_SL) : $(OBJS_SL) $(THREAD_OBJS_SL)
++	$(CC) -shared -Wl,-soname,libdmallocth.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL)
+ 
+ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+ 	ar cr $@ $?
+ 	@RANLIB@ $@
+ 
+-$(LIB_CXX_SL) : $(LIB_CXX)
+-	rm -f $@ $@.t
+-	@shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS)
+-	mv $@.t $@
++$(LIB_CXX_SL) : $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL)
++	$(CC) -shared -Wl,-soname,libdmalloccxx.so.5 -o $@ $(OBJS_SL) $(NORMAL_OBJS_SL) $(CXX_OBJS_SL)
+ 
+ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+ 	ar cr $@ $?
+ 	@RANLIB@ $@
+ 
+-$(LIB_TH_CXX_SL) : $(LIB_TH_CXX)
+-	rm -f $@ $@.t
+-	@shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS)
+-	mv $@.t $@
++$(LIB_TH_CXX_SL) : $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL)
++	$(CC) -shared -Wl,-soname,libdmallocthcxx.so.5 -o $@ $(OBJS_SL) $(THREAD_OBJS_SL) $(CXX_OBJS_SL)
+ 
+-threadssl : $(LIB_TH_SL)
++threadssl : $(LIB_TH_SL)$(ver)
+ 
+-threadscxxsl : $(LIB_TH_CXX_SL)
++threadscxxsl : $(LIB_TH_CXX_SL)$(ver)
+ 
+ threadscxx : $(BUILD_TH_CXX)
+ @SL_OFF@	@echo "Enter 'make threadscxxsl' to build the threaded C++ shared-library"
+@@ -302,7 +298,7 @@
+ @CXX_OFF@	@echo "Enter 'make threadscxx' to build the threaded C++ library"
+ @SL_OFF@	@echo "Enter 'make threadssl' to build the threaded shared library"
+ 
+-cxxsl :  $(LIB_CXX_SL)
++cxxsl :  $(LIB_CXX_SL)$(ver)
+ 
+ cxx : $(BUILD_CXX)
+ @SL_OFF@	@echo "Enter 'make cxxsl' to build the cxx shared library"
+@@ -371,6 +367,11 @@
+ 	$(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
+ 		-o ./$@
+ 
++dmallocc_sl.o : $(srcdir)/dmallocc.cc
++	rm -f $@
++	$(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \
++		-o ./$@
++
+ #
+ # auto configure settings - uncomment if you are doing configure
+ # development on the library
+@@ -395,38 +396,109 @@
+ 
+ arg_check.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \
+   dmalloc_loc.h error.h arg_check.h
++arg_check_sl.o: arg_check.c conf.h settings.h dmalloc.h chunk.h debug_tok.h \
++  dmalloc_loc.h error.h arg_check.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ chunk.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
+   dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
+   error_val.h heap.h
++chunk_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
++  dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
++  error_val.h heap.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
++compat_sl.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
+   debug_tok.h dmalloc_loc.h env.h error_val.h version.h
++dmalloc_sl.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \
++  debug_tok.h dmalloc_loc.h env.h error_val.h version.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
+   dmalloc_argv_loc.h compat.h
++dmalloc_argv_sl.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \
++  dmalloc_argv_loc.h compat.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
+   dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h
++dmalloc_fc_t_sl.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \
++  dmalloc_rand.h debug_tok.h dmalloc_loc.h error_val.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc_rand.o: dmalloc_rand.c dmalloc_rand.h
++dmalloc_rand_sl.o: dmalloc_rand.c dmalloc_rand.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc_t.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \
+   dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \
+   error_val.h heap.h
++dmalloc_t_sl.o: dmalloc_t.c conf.h settings.h compat.h dmalloc.h \
++  dmalloc_argv.h dmalloc_rand.h arg_check.h debug_tok.h dmalloc_loc.h \
++  error_val.h heap.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ dmalloc_tab.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \
+   dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h
++dmalloc_tab_sl.o: dmalloc_tab.c conf.h settings.h chunk.h compat.h dmalloc.h \
++  dmalloc_loc.h error.h error_val.h dmalloc_tab.h dmalloc_tab_loc.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ env.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \
+   debug_tok.h env.h error.h
++env_sl.o: env.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h \
++  debug_tok.h env.h error.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ error.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
+   dmalloc_loc.h env.h error.h error_val.h version.h
++error_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
++  dmalloc_loc.h env.h error.h error_val.h version.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ heap.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
+   dmalloc_loc.h error.h error_val.h heap.h
++heap_sl.o: heap.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
++  dmalloc_loc.h error.h error_val.h heap.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ malloc.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
+   debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
+   malloc_funcs.h return.h
++malloc_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
++  debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
++  malloc_funcs.h return.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ protect.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \
+   heap.h protect.h
++protect_sl.o: protect.c conf.h settings.h dmalloc.h dmalloc_loc.h error.h \
++  heap.h protect.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ chunk_th.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
+   dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
+   error_val.h heap.h
++chunk_th_sl.o: chunk.c conf.h settings.h dmalloc.h chunk.h chunk_loc.h \
++  dmalloc_loc.h compat.h debug_tok.h dmalloc_rand.h dmalloc_tab.h error.h \
++  error_val.h heap.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ error_th.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
+   dmalloc_loc.h env.h error.h error_val.h version.h
++error_th_sl.o: error.c conf.h settings.h dmalloc.h chunk.h compat.h debug_tok.h \
++  dmalloc_loc.h env.h error.h error_val.h version.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
+ malloc_th.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
+   debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
+   malloc_funcs.h return.h
++malloc_th_sl.o: malloc.c conf.h settings.h dmalloc.h chunk.h compat.h \
++  debug_tok.h dmalloc_loc.h env.h error.h error_val.h heap.h \
++  malloc_funcs.h return.h
++	rm -f $@
++	$(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch
new file mode 100644
index 000000000000..c4d0b22f9c0a
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-cxx.patch
@@ -0,0 +1,20 @@
+diff -ur dmalloc-5.5.2.orig/configure.ac dmalloc-5.5.2/configure.ac
+--- dmalloc-5.5.2.orig/configure.ac	2007-05-14 20:26:14.000000000 +0300
++++ dmalloc-5.5.2/configure.ac	2007-12-27 18:13:18.000000000 +0200
+@@ -55,11 +55,12 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
++# fixme. always returns false.
+ # see if we actually have a CXX program
+-if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
+-    AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX)
+-    enable_cxx=no
+-fi
++#if test "$ac_cv_prog_CXX" = "" -o ! -x "$ac_cv_prog_CXX"; then
++#    AC_MSG_WARN(could not find C++ compiler $ac_cv_prog_CXX)
++#    enable_cxx=no
++#fi
+ 
+ # hopefully we have a stdc c-compiler
+ if test "$ac_cv_prog_cc_stdc" = "no" ; then