Version bump, thanks to Luca Longinotti in bug #357591.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 112 insertions, 6 deletions

diff --git a/dev-util/google-perftools/ChangeLog b/dev-util/google-perftools/ChangeLog
index de84e6a27b71..c50a12511436 100644
--- a/dev-util/google-perftools/ChangeLog
+++ b/dev-util/google-perftools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/google-perftools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.7 2011/01/09 21:01:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.8 2011/03/06 12:50:36 flameeyes Exp $
+
+*google-perftools-1.7 (06 Mar 2011)
+
+  06 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +google-perftools-1.7.ebuild, +files/google-perftools-1.7-syntax.patch:
+  Version bump, thanks to Luca Longinotti in bug #357591.
 
   09 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -google-perftools-1.5.ebuild:
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 3aea678176a2..db7fdd5a3f63 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX google-perftools-1.7-syntax.patch 558 RMD160 f402bb6dc39aa75ffa4038a374f580a9ff31321b SHA1 e420ddb2499c14b12738bf68b7a65a8283f3fd4e SHA256 3c26a876c790f2421502dacda1041e461e322b850e0f17568ea0b65b2aa71f41
 DIST google-perftools-1.6.tar.gz 1193915 RMD160 91d67c33abf8ef5ce69c1c71af39564a476ed972 SHA1 b2892d388f35ef09059283b30f7c0a15c66950b4 SHA256 40455b35235da304ad664b05ffbb44a1f65f4ec903e532cf365b2fae9edf1f5e
+DIST google-perftools-1.7.tar.gz 1207931 RMD160 176451ef2bf6c9090f2446678ff2cca957eb4f42 SHA1 e3a65f71aee9270572f7aafa421858e39da1a9a8 SHA256 65326e3328a84c97d9de79d3f7dfdda6c78d9310217bfb8ac0a0845759e69b15
 EBUILD google-perftools-1.6.ebuild 1869 RMD160 231a04a3bf8fd836d33e8b9f9e812a1e6227ae46 SHA1 23d4c51e789f4da4796dbfbd0339962be701bea2 SHA256 2db01bd2e17a13181cfe53ac5c29c121b0ee5e6e428ae9d7df6f171b3c32b681
-MISC ChangeLog 1598 RMD160 3c3b717e34ecfd66218702039b5bfc79141a203e SHA1 6c439763b11835e56f285a445d9bd422186d7f34 SHA256 a2c712360b1cc4d3a0307cd6b005e639009183e3cc18e3284cb8e72dc2227c00
+EBUILD google-perftools-1.7.ebuild 2187 RMD160 d47fdd2e97b7bc1a915d6b5338ff19af3a609b10 SHA1 0e488f02d4d5a5e3e12fff31e06f6aadc84a82ec SHA256 239dc885918bc88a9d221396ecdd5b9668e3b506f74276c349a35076ef2118b7
+MISC ChangeLog 1824 RMD160 f5109241e5bab077104ad37ffc339f13b1a66e62 SHA1 f0697878defaede5254d3926d71acba54627e342 SHA256 cef43bee0b0d943978344343d3250f67aec25cb5345da81d8355a68c39a0263e
 MISC metadata.xml 797 RMD160 7ade14965543a7c05141b7607456d33c9a1033db SHA1 1233782ee45dc0f5d4054d3f9714d21d58325f18 SHA256 f5f6ebc4799060b646c4a9a9514c0d1975eadfe26636aafa851c72996dcd5fb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0qIiUACgkQAiZjviIA2XiQqwCeIBfQ1E67PuCVycWDKxzxfSj4
-9AcAoMhjhpK5SAyp9qKBnN0bCRbFXteJ
-=hIAM
+iEYEARECAAYFAk1zg0wACgkQAiZjviIA2XijNwCgjgLtVKmYuz87mWqFtf0RShGb
+urwAoMBGvGWRNJTFsecmKJh/Qt1u7FX2
+=Ushf
 -----END PGP SIGNATURE-----
diff --git a/dev-util/google-perftools/files/google-perftools-1.7-syntax.patch b/dev-util/google-perftools/files/google-perftools-1.7-syntax.patch
new file mode 100644
index 000000000000..c9226a98a625
--- /dev/null
+++ b/dev-util/google-perftools/files/google-perftools-1.7-syntax.patch
@@ -0,0 +1,13 @@
+Index: google-perftools-1.7/src/google/malloc_hook_c.h
+===================================================================
+--- google-perftools-1.7.orig/src/google/malloc_hook_c.h
++++ google-perftools-1.7/src/google/malloc_hook_c.h
+@@ -40,7 +40,7 @@
+ #include <stddef.h>
+ #include <sys/types.h>
+ 
+-// Annoying stuff for windows -- makes sure clients can import these functions
++/* Annoying stuff for windows -- makes sure clients can import these functions */
+ #ifndef PERFTOOLS_DLL_DECL
+ # ifdef _WIN32
+ #   define PERFTOOLS_DLL_DECL  __declspec(dllimport)
diff --git a/dev-util/google-perftools/google-perftools-1.7.ebuild b/dev-util/google-perftools/google-perftools-1.7.ebuild
new file mode 100644
index 000000000000..4225079fac7b
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-1.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.7.ebuild,v 1.1 2011/03/06 12:50:36 flameeyes Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
+HOMEPAGE="http://code.google.com/p/google-perftools/"
+SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="largepages +debug minimal" # test"
+
+DEPEND="sys-libs/libunwind"
+RDEPEND="${DEPEND}"
+
+# tests end up in an infinite loop, even without sandbox
+RESTRICT=test
+
+pkg_setup() {
+	# set up the make options in here so that we can actually make use
+	# of them on both compile and install.
+
+	# Avoid building the unit testing if we're not going to execute
+	# tests; this trick here allows us to ignore the tests without
+	# touching the build system (and thus without rebuilding
+	# autotools). Keep commented as long as it's restricted.
+
+	# use test && \
+		makeopts="${makeopts} noinst_PROGRAMS= "
+
+	# don't install _anything_ from the documentation, since it would
+	# install it in non-standard locations, and would just waste time.
+	makeopts="${makeopts} dist_doc_DATA= "
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-syntax.patch"
+}
+
+src_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+
+	append-flags -fno-strict-aliasing
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		$(use_enable debug debugalloc) \
+		$(use_enable minimal)
+}
+
+src_compile() {
+	emake ${makeopts} || die "emake failed"
+}
+
+src_test() {
+	case "${LD_PRELOAD}" in
+		*libsandbox*)
+			ewarn "Unable to run tests when sanbox is enabled."
+			ewarn "See http://bugs.gentoo.org/290249"
+			return 0
+			;;
+	esac
+
+	emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install ${makeopts} || die "emake install failed"
+
+	# Remove libtool files since we dropped the static libraries
+	find "${D}" -name '*.la' -delete
+
+	dodoc README AUTHORS ChangeLog TODO NEWS || die
+	pushd doc
+	dohtml -r * || die
+	popd
+}