Version bump; improve ebuild to not build tests; add USE flags for debug, minimal and the (new) largepages option; don't even install the documentation with the original build system, so that we don't have to remove it; only build shared libraries, and remove .la files — build time is vastly reduced this way.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 105 insertions, 42 deletions

diff --git a/dev-util/google-perftools/ChangeLog b/dev-util/google-perftools/ChangeLog
index ab95fc8b316f..9abef00e1e33 100644
--- a/dev-util/google-perftools/ChangeLog
+++ b/dev-util/google-perftools/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/google-perftools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.3 2010/01/31 00:33:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.4 2010/08/05 23:40:37 flameeyes Exp $
+
+*google-perftools-1.6 (05 Aug 2010)
+
+  05 Aug 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -google-perftools-1.4.ebuild, +google-perftools-1.6.ebuild, metadata.xml:
+  Version bump; improve ebuild to not build tests; add USE flags for debug,
+  minimal and the (new) largepages option; don't even install the
+  documentation with the original build system, so that we don't have to
+  remove it; only build shared libraries, and remove .la files — build
+  time is vastly reduced this way.
 
 *google-perftools-1.5 (31 Jan 2010)
 
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index f4acb5b803f7..36348f232aa2 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST google-perftools-1.4.tar.gz 1155625 RMD160 e760384be31a4c60acb70b6306e6a9aded96b03e SHA1 1f96130420fe31347f6aa201ed76dfcf6e5d4286 SHA256 5c4b3bd18b87296bdbe6a49987ffeb084fa7ca305de4bf06d578901829927e82
 DIST google-perftools-1.5.tar.gz 1159627 RMD160 3c014fa2c2b140374f56678cd10f4427080f4f99 SHA1 84c44c2576d8b06cd179f3c4bbd5a613dc63ce68 SHA256 90651f93d3ceeba568ad0a4e5c5867ef7191433d290cdbca16a12ae3e6fac004
-EBUILD google-perftools-1.4.ebuild 1006 RMD160 dc6333d74d72a6c8277d9a87e25e40cade0cc24d SHA1 ba8c09278e1399e4d55987f28199a788bcf22799 SHA256 8e06c9e606d030f1dbfcad43de9cad376a69cbdb9238b96cc7fef33e0ea5f078
+DIST google-perftools-1.6.tar.gz 1193915 RMD160 91d67c33abf8ef5ce69c1c71af39564a476ed972 SHA1 b2892d388f35ef09059283b30f7c0a15c66950b4 SHA256 40455b35235da304ad664b05ffbb44a1f65f4ec903e532cf365b2fae9edf1f5e
 EBUILD google-perftools-1.5.ebuild 1007 RMD160 fc8a1fe590a0309d20f8c8899051e5c2c89cc3a4 SHA1 1975e2d17f64abe5e382fa3e250bd67bbb83aac3 SHA256 d7e80093e3fb85415d14aa36031e4a609d9f28c2747240e3484ba9c55a77da12
-MISC ChangeLog 771 RMD160 746e62a92e9cb8a508bc3fa61c887c1433ed4ca5 SHA1 abbe490bac2c703d2a1d07fa789d2cffe91491c9 SHA256 16e7856c3b41ab332e1d243fdd9c0658eb1f8105fd2eca4343263c43cf00ea8c
-MISC metadata.xml 233 RMD160 da5a1d3b7836dcebb5fec29696b5bfb583fe346c SHA1 1c7142c677598358888a6cfc6f6f65df2e8b6901 SHA256 4d1294dc1b2a6f96aa637a0b8d340bc67191103af0f15197d07fc62446b4a709
+EBUILD google-perftools-1.6.ebuild 1874 RMD160 4d4e43940885f52795f569d086b2c20313037b7b SHA1 70808e31494580df01081a74281cd59f56345e03 SHA256 3cdfa94d8728b915ec02f2df98d648f00e737c776041a65cfda7db06f1bd393e
+MISC ChangeLog 1264 RMD160 de8d5719c149223a01b3c5ac84f7704e2d2bce2c SHA1 d7fec034da11f425431b8aaae948c4b8ac594ea1 SHA256 902dfd21f0fe1e6350182a2f8d14e7e04e262fdbaf8856e50c51234de292296a
+MISC metadata.xml 797 RMD160 7ade14965543a7c05141b7607456d33c9a1033db SHA1 1233782ee45dc0f5d4054d3f9714d21d58325f18 SHA256 f5f6ebc4799060b646c4a9a9514c0d1975eadfe26636aafa851c72996dcd5fb3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAktkz9sACgkQAiZjviIA2XhuIQCgxLHloJ6lIhxVpB9B3mAaSxCx
-paEAn1mPznCI1oD7uD5xKKN2TdHy/pmE
-=eonz
+iEYEARECAAYFAkxbTBsACgkQAiZjviIA2XiZeACgx07mfL8KSRyN3ChrvljzT9Eb
+DpsAn0/lBZXA0dlQLPSmCeDa+6lPxFUh
+=wwJA
 -----END PGP SIGNATURE-----
diff --git a/dev-util/google-perftools/google-perftools-1.4.ebuild b/dev-util/google-perftools/google-perftools-1.4.ebuild
deleted file mode 100644
index 43df6d016d5d..000000000000
--- a/dev-util/google-perftools/google-perftools-1.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 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.4.ebuild,v 1.2 2009/10/26 18:01:40 swegener Exp $
-
-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=""
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-# tests get stuck in a deadlock due to sandbox interactions.
-# bug #290249.
-RESTRICT=test
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-
-	# Remove the already-installed documentation, since it does not
-	# follow our guidelines (doesn't use ${PF}, is not configurable
-	# and so on so forth).
-	rm -r "${D}"/usr/share/doc/${P} || die
-
-	dodoc README AUTHORS ChangeLog TODO README.windows || die
-	pushd doc
-	dohtml -r * || die
-	popd
-}
diff --git a/dev-util/google-perftools/google-perftools-1.6.ebuild b/dev-util/google-perftools/google-perftools-1.6.ebuild
new file mode 100644
index 000000000000..26092e3c5da7
--- /dev/null
+++ b/dev-util/google-perftools/google-perftools-1.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2010 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.6.ebuild,v 1.1 2010/08/05 23:40:37 flameeyes Exp $
+
+EAPI=2
+
+inherit toolchain-funcs
+
+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 get stuck in a deadlock due to sandbox interactions.
+# bug #290249.
+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_configure() {
+	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
+
+	econf \
+		--disable-static \
+		--disable-dependency-tracking \
+		--enable-fast-install \
+		$(use_enable debug debugalloc) \
+		$(use_enable minimal)
+}
+
+src_compile() {
+	emake ${makeopts} || die "emake 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
+}
diff --git a/dev-util/google-perftools/metadata.xml b/dev-util/google-perftools/metadata.xml
index 2d083ce3bc66..5470e6606cb0 100644
--- a/dev-util/google-perftools/metadata.xml
+++ b/dev-util/google-perftools/metadata.xml
@@ -5,4 +5,23 @@
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
+
+  <use>
+    <flag name="largepages">
+      Use (experimental) larger pages for tcmalloc, this increases
+      memory usage, but should speed up the allocation/free
+      operations.
+    </flag>
+
+    <flag name="debug">
+      Build a set of libraries with debug support (so-called
+      debugalloc). These are available by default but are not needed
+      unless you're actually developing using tcmalloc.
+    </flag>
+
+    <flag name="minimal">
+      Only build the tcmalloc_minimal library, ignoring the heap
+      checker and the profilers.
+    </flag>
+  </use>
 </pkgmetadata>