Dropped multi-stack patch since it's even broken on x86 (and on ppc/amd64, bug #203530) and there's no way to sanely fix it. Did some more corrections.

(Portage version: 2.1.4_rc14)

4 files changed, 20 insertions, 12 deletions

diff --git a/dev-util/leaktracer/ChangeLog b/dev-util/leaktracer/ChangeLog
index 87610b2f113a..bc5158c2a8a2 100644
--- a/dev-util/leaktracer/ChangeLog
+++ b/dev-util/leaktracer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/leaktracer
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/ChangeLog,v 1.11 2007/12/24 09:56:30 dev-zero Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/ChangeLog,v 1.12 2008/01/03 21:03:48 dev-zero Exp $
+
+*leaktracer-2.4-r2 (03 Jan 2008)
+
+  03 Jan 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -leaktracer-2.4-r1.ebuild, +leaktracer-2.4-r2.ebuild:
+  Dropped multi-stack patch since it's even broken on x86 (and on ppc/amd64,
+  bug #203530) and there's no way to sanely fix it. Did some more corrections.
 
 *leaktracer-2.4-r1 (24 Dec 2007)
 
diff --git a/dev-util/leaktracer/files/digest-leaktracer-2.4-r1 b/dev-util/leaktracer/files/digest-leaktracer-2.4-r1
deleted file mode 100644
index 176a91e62a71..000000000000
--- a/dev-util/leaktracer/files/digest-leaktracer-2.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e00ade602757621f7147e24ebbaf1c7 leaktracer-2.4-gentoo_p1.tbz2 18392
-RMD160 57f5264766d553f599044a4d2f0f010d91a2927c leaktracer-2.4-gentoo_p1.tbz2 18392
-SHA256 f29c4b0b9ff57602bcfc37cdd3e574085882ba1a8f32c381d05f6acedd91fb75 leaktracer-2.4-gentoo_p1.tbz2 18392
diff --git a/dev-util/leaktracer/files/digest-leaktracer-2.4-r2 b/dev-util/leaktracer/files/digest-leaktracer-2.4-r2
new file mode 100644
index 000000000000..cdc64f2bd939
--- /dev/null
+++ b/dev-util/leaktracer/files/digest-leaktracer-2.4-r2
@@ -0,0 +1,3 @@
+MD5 86cb23d1431d17979f1a0ecd324e902d leaktracer-2.4-gentoo_p2.tbz2 11957
+RMD160 e4269993c063c77cbfe7e693244668bdc6db6864 leaktracer-2.4-gentoo_p2.tbz2 11957
+SHA256 21ed81f47654ae03211c1ee0655bf0f1d5cdbe433fbe3424d0b4738506deced8 leaktracer-2.4-gentoo_p2.tbz2 11957
diff --git a/dev-util/leaktracer/leaktracer-2.4-r1.ebuild b/dev-util/leaktracer/leaktracer-2.4-r2.ebuild
index 9858d04b4f3d..92b95e9d9212 100644
--- a/dev-util/leaktracer/leaktracer-2.4-r1.ebuild
+++ b/dev-util/leaktracer/leaktracer-2.4-r2.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/leaktracer-2.4-r1.ebuild,v 1.2 2007/12/24 11:50:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/leaktracer/leaktracer-2.4-r2.ebuild,v 1.1 2008/01/03 21:03:48 dev-zero Exp $
 
 inherit eutils multilib toolchain-funcs
 
 # Upstream-package has no version in it's name.
 # We therefore repackage it directly, together with the patches.
-PATCH_LEVEL="1"
+PATCH_LEVEL="2"
 
 DESCRIPTION="trace and analyze memory leaks in C++ programs"
 HOMEPAGE="http://www.andreasen.org/LeakTracer/"
 SRC_URI="mirror://gentoo/${P}-gentoo_p${PATCH_LEVEL}.tbz2"
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
@@ -35,22 +35,23 @@ src_unpack() {
 	epatch
 
 	sed -i \
-		-e "s|%LIB%|$(get_libdir)|" \
+		-e "s|%LIBDIR%|$(get_libdir)|" \
 		LeakCheck || die "sed for setting lib path failed"
 }
 
 src_compile() {
-	emake CXX=$(tc-getCXX) LDFLAGS=${LDFLAGS} || die "emake failed"
+	emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
 	dobin LeakCheck leak-analyze || die "dobin failed"
 	dolib.so LeakTracer.so || die "dolib.so failed"
 	dohtml README.html
-	dodoc README "${WORKDIR}/patches/multi-stack.readme"
+	dodoc README test.cc
 }
 
 pkg_postinst() {
 	elog "To use LeakTracer, run LeakCheck my_prog and then leak-analyze my_prog leak.out"
 	elog "Please reffer to README file for more info."
 }
+