Fixed threads support. Trivial patch for build process.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3-rt7 i686

6 files changed, 32 insertions, 62 deletions

diff --git a/dev-libs/dmalloc/ChangeLog b/dev-libs/dmalloc/ChangeLog
index 5c64e6930704..f91667e11909 100644
--- a/dev-libs/dmalloc/ChangeLog
+++ b/dev-libs/dmalloc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/dmalloc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.40 2008/01/19 20:18:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/ChangeLog,v 1.41 2008/09/24 12:49:31 b33fc0d3 Exp $
+
+  24 Sep 2008; <b33fc0d3@gentoo.org> +files/dmalloc-5.5.2-threads.patch,
+  metadata.xml, -dmalloc-5.5.2-r1.ebuild, dmalloc-5.5.2-r2.ebuild:
+  Fixed threads support. Removed older revision.
 
 *dmalloc-5.5.2-r2 (19 Jan 2008)
 
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index 8db5181af74b..b02f5ea3ed82 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -1,7 +1,7 @@
 AUX dmalloc-5.5.2-Makefile.in.patch 14022 RMD160 22917b8235f32522731198f5dd00e852c9c34e11 SHA1 0e46fe842a7b918ed740c4910f9d804a36253ff1 SHA256 b4eb76731fd732da31945e9b04efe7c30e1f3bef15f19ddc9d88375fb8619b99
 AUX dmalloc-5.5.2-cxx.patch 715 RMD160 63cdd7923f5b78b3dd1d04c25154ce3a91dd4474 SHA1 e36c84def65434d67a666ba16963b4ab98cff296 SHA256 c488baec7cb90a57b0256459c7e38fd6e0cddef0682a60ae98bfedca9292897d
+AUX dmalloc-5.5.2-threads.patch 270 RMD160 98152bed013a47b32cb62b1ee10ec011a2ca0091 SHA1 83dfdddf510c1185606fbe8fd9acde5e2abb81bc SHA256 f80e3cf1293f5ebeee8d8f83e0bf5ecad606c27ddc9a2fd8908d5af649720433
 DIST dmalloc-5.5.2.tgz 666608 RMD160 2cfe4daa453337e0fae0656bdbdaad1214d6243d SHA1 20719de78decbd724bc3ab9d6dce2ea5e5922335 SHA256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a
-EBUILD dmalloc-5.5.2-r1.ebuild 1250 RMD160 2f98b5ec06e2558d1160a0e7cd39e25d64b57efe SHA1 cc6ad9381f7765612bf37d925eeaebe44bf90c41 SHA256 b2809dff1ae27acc89da9677c25c935fedbaec38fc773e991ef458d9a4d89c48
-EBUILD dmalloc-5.5.2-r2.ebuild 1447 RMD160 f8e18d274d309e5f5dabedac398ff4101d017b91 SHA1 d7262bde117736867b75d953e92e9bcd11cc4c7e SHA256 0fa68b796a3f22c90e33deb6481be6bda7a1f9a2a0eabb6cdadecfcdf014ed4f
-MISC ChangeLog 5916 RMD160 cdce3b0bcf5b33e3f73efaea8a71d12c1c917fa8 SHA1 5b901d771b87573db51af2712f53218b93386ec7 SHA256 5fa7309b66474dec2bf2a68add5378f05c72c20ea1b92a3940984667e36464d8
-MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+EBUILD dmalloc-5.5.2-r2.ebuild 1578 RMD160 561db4b1bb93a597340c141f074e96d44cae0bcd SHA1 940a94e0c61ff449bc96a16b7e0e11936d81e7cb SHA256 efe68af16df157fdfb2db251e1613bf665e9ed9891868ca0d125e385a9c8b2bb
+MISC ChangeLog 6110 RMD160 8e7bb8704a7139cecc1dcc869f74b79c54c1210a SHA1 483e61a42095158f45931f1fb392f8a46936d6f1 SHA256 604e60e5ef55745c7ce1112587a077b3a037ace4714291940198d789f9d4bb02
+MISC metadata.xml 227 RMD160 b2048dd10eb97101195ac3458b8134c7e30f9935 SHA1 fee20235f039de14ce629d191649e0ff52bc72f2 SHA256 ad43dba87787c82c0081501a006ef7e53b72708cff8bf108d322cf03cea2c4b6
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild
deleted file mode 100644
index 65339e3300ef..000000000000
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.5 2007/12/29 17:22:33 armin76 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/dmalloc-5.5.2-r2.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r2.ebuild
index 14385d26ef6c..f84b163de88c 100644
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r2.ebuild
+++ b/dev-libs/dmalloc/dmalloc-5.5.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/01/19 20:18:36 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/dmalloc/dmalloc-5.5.2-r2.ebuild,v 1.2 2008/09/24 12:49:31 b33fc0d3 Exp $
 
 inherit autotools eutils multilib
 
@@ -11,7 +11,7 @@ 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=""
+IUSE="threads"
 
 DEPEND=""
 
@@ -24,22 +24,27 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-Makefile.in.patch
 	# - Broken test, always returns false.
 	epatch "${FILESDIR}"/${P}-cxx.patch
+	# - Add threads support. 
+	use threads && epatch "${FILESDIR}"/${P}-threads.patch
 	# - Run autoconf for -cxx.patch.
 	eautoconf
 }
 
 src_compile() {
-	econf --enable-cxx --enable-threads --enable-shlib
-	emake || die "emake failed."
+	econf --enable-cxx \
+		--enable-shlib \
+		$(use_enable threads) || die "econf failed!"
+
+	emake || die "emake failed!"
 	cd docs && makeinfo dmalloc.texi
 }
 
 src_test() {
-	emake heavy || die "emake check failed."
+	emake heavy || die "emake check failed!"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed!"
 
 	newdoc ChangeLog.1 ChangeLog
 	dodoc NEWS README docs/NOTES docs/TODO
diff --git a/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch
new file mode 100644
index 000000000000..4016be0a21c0
--- /dev/null
+++ b/dev-libs/dmalloc/files/dmalloc-5.5.2-threads.patch
@@ -0,0 +1,11 @@
+--- ./dmalloc-5.5.2/settings.dist.orig	2008-09-23 09:24:56.000000000 +0200
++++ ./dmalloc-5.5.2/settings.dist	2008-09-23 09:25:27.000000000 +0200
+@@ -409,7 +409,7 @@
+  */
+ 
+ #ifndef LOCK_THREADS
+-#define LOCK_THREADS 0
++#define LOCK_THREADS 1
+ #endif
+ 
+ #if LOCK_THREADS
diff --git a/dev-libs/dmalloc/metadata.xml b/dev-libs/dmalloc/metadata.xml
index 9f3fdee2246b..6e86a06946c8 100644
--- a/dev-libs/dmalloc/metadata.xml
+++ b/dev-libs/dmalloc/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>b33fc0d3@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>