Version bump; applied several fixes provided by Jeff Ames in bug 76288.

(Portage version: 2.0.51-r14)

7 files changed, 267 insertions, 17 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index b856cdc8808f..d8713baf9721 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/dmalloc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.15 2005/01/21 11:24:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.16 2005/01/21 16:48:29 ka0ttic Exp $
+
+*dmalloc-5.4.2 (21 Jan 2005)
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dmalloc-5.3.0-respect-DESTDIR.diff,
+  +files/dmalloc-5.4.2-respect-DESTDIR.diff, dmalloc-5.3.0.ebuild,
+  +dmalloc-5.4.2.ebuild:
+  Version bump; applied several fixes provided by Jeff Ames in bug 76288.
 
   21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> dmalloc-4.8.2-r1.ebuild,
   dmalloc-5.3.0.ebuild:
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index a07b13b72e55..1a54c8d3a3aa 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 c9e882bbe6f048484ad99692baeca136 dmalloc-5.4.2.ebuild 1004
 MD5 6fccdfe7d00f967c2afaf860082039b3 dmalloc-4.8.2-r1.ebuild 834
-MD5 807a49be71c913dafaf4e5d66ed56e73 dmalloc-5.3.0.ebuild 948
-MD5 14edf59b072d9c2590ab564a27c18c45 ChangeLog 2145
+MD5 50a45336ce659675b1aa9eb42ba849ee dmalloc-5.3.0.ebuild 997
+MD5 04bf660d3451e0ae8fdf8cda9c69bb54 ChangeLog 2436
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 ee3cc894963eba0ee4a8a395fd958ba2 files/dmalloc-5.4.2-respect-DESTDIR.diff 4349
 MD5 d7d2c9ed36553b70e9fc9ffae863ff70 files/digest-dmalloc-5.3.0 62
+MD5 df2d7ec5445ffe67bd282af7f73139e0 files/digest-dmalloc-5.4.2 62
 MD5 9e69097981f3eb71bc12b8c3b5789b59 files/dmalloc-5.2.4-fpic.patch 1349
+MD5 2944158ef624e5e2d6d2ca9df1abbc64 files/dmalloc-5.3.0-respect-DESTDIR.diff 4338
 MD5 f50369b9728f749d86934c0b728619ef files/dmalloc-5.3.0-fpic.patch 1440
 MD5 005387d8e427b7c5704d67259d9e32e1 files/digest-dmalloc-4.8.2-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8OcVEZCkKN40op4RAkz5AKCHGD+so4rzGktc6QtFoiOAg++VqgCbBK0i
-3xHjdmkwBXuLsk987EZbVsQ=
-=3Etz
------END PGP SIGNATURE-----
diff --git a/dev-libs/dmalloc/dmalloc-5.3.0.ebuild b/dev-libs/dmalloc/dmalloc-5.3.0.ebuild
index c51340206f35..fa6d9ef85ef1 100644
--- a/dev-libs/dmalloc/dmalloc-5.3.0.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.3.0.ebuild,v 1.8 2005/01/21 11:24:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.3.0.ebuild,v 1.9 2005/01/21 16:48:29 ka0ttic Exp $
 
 inherit debug eutils
 
@@ -19,11 +19,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-fpic.patch
+	epatch ${FILESDIR}/${P}-respect-DESTDIR.diff
 }
 
 src_compile() {
 	econf --enable-threads --enable-shlib || die "configure failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_test() {
@@ -32,10 +33,10 @@ src_test() {
 }
 
 src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
 	newdoc ChangeLog.1 ChangeLog
 	dodoc INSTALL NEWS README docs/NOTES docs/TODO
 	dohtml RELEASE.html docs/dmalloc.html
-
-	make prefix=${D}/usr install || die "make install failed"
 	doinfo docs/dmalloc.info
 }
diff --git a/dev-libs/dmalloc/dmalloc-5.4.2.ebuild b/dev-libs/dmalloc/dmalloc-5.4.2.ebuild
new file mode 100644
index 000000000000..8f221aac3d11
--- /dev/null
+++ b/dev-libs/dmalloc/dmalloc-5.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.4.2.ebuild,v 1.1 2005/01/21 16:48:29 ka0ttic Exp $
+
+inherit debug eutils
+
+DESCRIPTION="A Debug Malloc Library"
+HOMEPAGE="http://dmalloc.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~ia64 ppc ~sparc x86 ~alpha"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-5.3.0-fpic.patch
+	epatch ${FILESDIR}/${P}-respect-DESTDIR.diff
+}
+
+src_compile() {
+	econf --enable-threads --enable-shlib || die "configure failed"
+	emake -j1 || die "emake failed"
+}
+
+src_test() {
+	einfo "Running tests"
+	make heavy || die "make check tests failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newdoc ChangeLog.1 ChangeLog
+	dodoc INSTALL NEWS README docs/NOTES docs/TODO
+	dohtml RELEASE.html docs/dmalloc.html
+	doinfo docs/dmalloc.info
+}
diff --git a/dev-libs/dmalloc/files/digest-dmalloc-5.4.2 b/dev-libs/dmalloc/files/digest-dmalloc-5.4.2
new file mode 100644
index 000000000000..2aaaea355592
--- /dev/null
+++ b/dev-libs/dmalloc/files/digest-dmalloc-5.4.2
@@ -0,0 +1 @@
+MD5 ca8d9d72351679e20b8eff96a7a16bf3 dmalloc-5.4.2.tgz 371228
diff --git a/dev-libs/dmalloc/files/dmalloc-5.3.0-respect-DESTDIR.diff b/dev-libs/dmalloc/files/dmalloc-5.3.0-respect-DESTDIR.diff
new file mode 100644
index 000000000000..e6473871884b
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.3.0-respect-DESTDIR.diff
@@ -0,0 +1,102 @@
+--- Makefile.in-original	2005-01-01 23:14:08.032966560 +0900
++++ Makefile.in	2005-01-01 23:19:16.527068328 +0900
+@@ -173,69 +173,69 @@
+ #	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_DATA) $(LIB_TH_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIB_TH_SL) $(DESTDIR)$(libdir)
+ 
+ installth : $(INSTALL_THREADS)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_TH) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_TH_CXX_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL_DATA) $(LIB_TH_CXX_SL) $(DESTDIR)$(shlibdir)
+ 
+ installthcxx : $(INSTALL_TH_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_TH_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_CXX_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIB_CXX_SL) $(DESTDIR)$(libdir)
+ 
+ installcxx : $(INSTALL_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIBRARY) $(libdir)
+-	@RANLIB@ $(libdir)/$(LIBRARY)
+-@SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(libdir)
++	@RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY)
++@SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(DESTDIR)$(shlibdir)"
+ @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
+ @TH_OFF@	@echo "Enter 'make installth' to install thread library"
+ 
+ installinfo : $(srcdir)/$(INFOFILE)
+-	$(srcdir)/mkinstalldirs $(infodir)
+-	$(INSTALL_DATA) $(srcdir)/$(INFOFILE) $(infodir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
++	$(INSTALL_DATA) $(srcdir)/$(INFOFILE) $(DESTDIR)$(infodir)
+ 
+ installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE)
+-	$(srcdir)/mkinstalldirs $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir)
+ 
+ install : installincs installlib $(UTIL)
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) $(UTIL) $(bindir)
+-	@echo "Enter 'make installinfo' to install $(INFOFILE) in $(infodir)"
+-	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)"
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir)
++	@echo "Enter 'make installinfo' to install $(INFOFILE) in $(DESTDIR)$(infodir)"
++	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)$(docdir)"
+ 
+ dmalloc.h.2 : $(srcdir)/configure
+ 	$(SHELL) $(srcdir)/configure
diff --git a/dev-libs/dmalloc/files/dmalloc-5.4.2-respect-DESTDIR.diff b/dev-libs/dmalloc/files/dmalloc-5.4.2-respect-DESTDIR.diff
new file mode 100644
index 000000000000..85f5a6c2e4e6
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.4.2-respect-DESTDIR.diff
@@ -0,0 +1,102 @@
+--- Makefile.in.orig	2004-10-19 23:51:21.000000000 +0900
++++ Makefile.in	2005-01-02 01:03:37.346279136 +0900
+@@ -174,69 +174,69 @@
+ #	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_DATA) $(LIB_TH_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIB_TH_SL) $(DESTDIR)$(libdir)
+ 
+ installth : $(INSTALL_THREADS)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_TH) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_TH_CXX_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL_DATA) $(LIB_TH_CXX_SL) $(DESTDIR)$(shlibdir)
+ 
+ installthcxx : $(INSTALL_TH_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_TH_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_CXX_SL) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIB_CXX_SL) $(DESTDIR)$(libdir)
+ 
+ installcxx : $(INSTALL_CXX)
+-	$(srcdir)/mkinstalldirs $(libdir)
+-	$(INSTALL_DATA) $(LIB_CXX) $(libdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIB_SL) $(shlibdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(shlibdir)
++	$(INSTALL_DATA) $(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_DATA) $(LIBRARY) $(libdir)
+-	@RANLIB@ $(libdir)/$(LIBRARY)
+-@SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(shlibdir)"
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(libdir)
++	@RANLIB@ $(DESTDIR)$(libdir)/$(LIBRARY)
++@SL_OFF@	@echo "Enter 'make installsl' to install $(LIB_SL) in $(DESTDIR)$(shlibdir)"
+ @CXX_OFF@	@echo "Enter 'make installcxx' to install the C++ library"
+ @TH_OFF@	@echo "Enter 'make installth' to install thread library"
+ 
+ installinfo : $(srcdir)/docs/$(INFOFILE)
+-	$(srcdir)/mkinstalldirs $(infodir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(INFOFILE) $(infodir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(INFOFILE) $(DESTDIR)$(infodir)
+ 
+ installdocs : $(srcdir)/docs/$(HTMLFILE) $(srcdir)/docs/$(TEXIFILE)
+-	$(srcdir)/mkinstalldirs $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(docdir)
+-	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(docdir)
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(HTMLFILE) $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(srcdir)/docs/$(TEXIFILE) $(DESTDIR)$(docdir)
+ 
+ install : installincs installlib $(UTIL)
+-	$(srcdir)/mkinstalldirs $(bindir)
+-	$(INSTALL_PROGRAM) $(UTIL) $(bindir)
+-	@echo "Enter 'make installinfo' to install $(INFOFILE) in $(infodir)"
+-	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(docdir)"
++	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(UTIL) $(DESTDIR)$(bindir)
++	@echo "Enter 'make installinfo' to install $(INFOFILE) in $(DESTDIR)$(infodir)"
++	@echo "Enter 'make installdocs' to install $(DOCFILES) in $(DESTDIR)$(docdir)"
+ 
+ dmalloc.h.2 : $(srcdir)/configure
+ 	$(SHELL) $(srcdir)/configure