Do not install pprof use google-pertools instead

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 39 insertions, 11 deletions

diff --git a/dev-libs/jemalloc/ChangeLog b/dev-libs/jemalloc/ChangeLog
index 2e08e88b2b39..53b57af63762 100644
--- a/dev-libs/jemalloc/ChangeLog
+++ b/dev-libs/jemalloc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/jemalloc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.4 2011/04/11 15:04:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/ChangeLog,v 1.5 2011/04/11 15:50:23 anarchy Exp $
+
+*jemalloc-2.2.1-r1 (11 Apr 2011)
+
+  11 Apr 2011; Jory A. Pratt <anarchy@gentoo.org> -jemalloc-2.2.1.ebuild,
+  +jemalloc-2.2.1-r1.ebuild, +files/jemalloc-2.2.1-no-pprof.patch:
+  Do not install pprof, use google-perftools instead
 
 *jemalloc-2.2.1 (11 Apr 2011)
 
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index cafaccfa7d12..c2eaf2378438 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -1,5 +1,6 @@
+AUX jemalloc-2.2.1-no-pprof.patch 702 RMD160 92b697551e7b24cd7f4974b0ab037952b3b0c2ff SHA1 d9c05608769393ad4999cc3e5910a54b3bd7e5ee SHA256 8e5a36505a90eab85bf746d4eb5a27d473ce25396104a0dd01d25368dd0c099d
 AUX jemalloc-strip-optimization.patch 800 RMD160 a55b49895ceb9cc48f6fe12215b45f5a8c2e7b15 SHA1 ec662a39f02c5f42344ba987e881828c0df0c580 SHA256 a14ee193968e87d0d87a8146050dcad5a33042af119070dbfbac7d4eba9923ce
 DIST jemalloc-2.2.1.tar.bz2 224017 RMD160 3319ecc7ead788b8df9889156daa067b89331233 SHA1 a900107f944c74468eac2b697f6fab2ae7c01aa3 SHA256 022bee369b65b72f9cda684513f5b41ce0c5d9de8c2ff5be0f31ef3e5f055862
-EBUILD jemalloc-2.2.1.ebuild 938 RMD160 cfadb6925a3167b65c984bb081ea4658466037c7 SHA1 ca9f30ed645ce7e4d76e79f923767306701f5c7c SHA256 752a4d5eb8f244e55640e9a0c77a63369656d25c16de63330191c1c2fe4b52f4
-MISC ChangeLog 945 RMD160 05cc926a32b2efb52418dd502f47d22da25987f8 SHA1 a30f2dda9104fe30636eaed3be70f79ae11b88fd SHA256 e1323b7bf9156a3e34e33a5cbe84a7d23a7e1eb38fab5c7af7c2a09f9c961569
-MISC metadata.xml 414 RMD160 bb98cdf93203dcc175b618895c8662ce1cbba956 SHA1 583105f24aed24787dfce96494205eaf9ebdce66 SHA256 b458048c550c170ab50b25d37198c84130841717989c6ad7d3f95ba6213cfa7e
+EBUILD jemalloc-2.2.1-r1.ebuild 866 RMD160 4c8b5b825e0376d7c545f6abf8f58c4faa000b0e SHA1 a677c4464f62b43a14be45aaa07e7b3e14663bb8 SHA256 70d2a68154f58ff7c74ca4af347c5fad4d6d11cd933f70225a1eff5291ce5a0d
+MISC ChangeLog 1174 RMD160 5283c966f559931840928a127d2201a6eb2c58a1 SHA1 3028f0c4ad0db5b35ce8b8d644597d62feff5fcc SHA256 64208f9d354c99d780cddb01affbaaff42a64b37764c06cad58e784fe807069d
+MISC metadata.xml 356 RMD160 cbb4582163bc26d5b05649c245c8a5596ace01eb SHA1 c958290d95adafba1aa76ebdf09c002decddb2b9 SHA256 1b1a10ebdd274e8b4c365e29a9a69e4f79d15eb427def15dc12921f97784756b
diff --git a/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
new file mode 100644
index 000000000000..e10aab4d4f38
--- /dev/null
+++ b/dev-libs/jemalloc/files/jemalloc-2.2.1-no-pprof.patch
@@ -0,0 +1,24 @@
+--- a/Makefile.in	2011-04-11 10:42:32.084403330 -0500
++++ b/Makefile.in	2011-04-11 10:43:23.490760665 -0500
+@@ -42,7 +42,6 @@
+ endif
+ 
+ # Lists of files.
+-BINS := @srcroot@bin/pprof
+ CHDRS := @objroot@include/jemalloc/jemalloc@install_suffix@.h \
+ 	@objroot@include/jemalloc/jemalloc_defs@install_suffix@.h
+ CSRCS := @srcroot@src/jemalloc.c @srcroot@src/arena.c @srcroot@src/atomic.c \
+@@ -141,13 +140,6 @@
+ 	$(CC) -o $@ $< -L@objroot@lib -ljemalloc@install_suffix@
+ endif
+ 
+-install_bin:
+-	install -d $(BINDIR)
+-	@for b in $(BINS); do \
+-	echo "install -m 755 $$b $(BINDIR)"; \
+-	install -m 755 $$b $(BINDIR); \
+-done
+-
+ install_include:
+ 	install -d $(INCLUDEDIR)/jemalloc
+ 	@for h in $(CHDRS); do \
diff --git a/dev-libs/jemalloc/jemalloc-2.2.1.ebuild b/dev-libs/jemalloc/jemalloc-2.2.1-r1.ebuild
index 593c3ac9494d..67bb23a83393 100644
--- a/dev-libs/jemalloc/jemalloc-2.2.1.ebuild
+++ b/dev-libs/jemalloc/jemalloc-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.1.ebuild,v 1.1 2011/04/11 15:04:22 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/jemalloc/jemalloc-2.2.1-r1.ebuild,v 1.1 2011/04/11 15:50:23 anarchy Exp $
 
 EAPI="2"
 
@@ -14,13 +14,14 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug profile stats"
+IUSE="debug stats"
 
 DEPEND=""
 RDEPEND=""
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-strip-optimization.patch"
+	epatch "${FILESDIR}/${PN}-2.2.1-no-pprof.patch"
 
 	eautoreconf
 }
@@ -29,14 +30,11 @@ src_configure() {
 	econf \
 		--with-jemalloc-prefix=j \
 		$(use_enable debug) \
-		$(use_enable profile prof) \
 		$(use_enable stats) \
 		|| die "configure failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install
-
-	# Rename pproff to prevent collision
-	mv "${D}"/usr/bin/pprof "${D}"/usr/bin/jpprof
 }
+
diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index 543b1a220574..a53e4b43c49d 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -6,7 +6,6 @@
 		Jemalloc is a general-purpose scalable concurrent allocator
 	</longdescription>
 	<use>
-		<flag name='profile'>Enable allocation profiling</flag>
 		<flag name='stats'>Enable statistics calculation/reporting</flag>
 	</use>
 </pkgmetadata>