Re-add support for static-libs; use autotools-utils; add subslot.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 39 insertions, 126 deletions

diff --git a/dev-util/google-perftools/ChangeLog b/dev-util/google-perftools/ChangeLog
index b6d18b2316c3..a27189230496 100644
--- a/dev-util/google-perftools/ChangeLog
+++ b/dev-util/google-perftools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/google-perftools
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.24 2013/02/03 15:09:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.25 2013/02/20 19:54:18 flameeyes Exp $
+
+*google-perftools-2.0-r2 (20 Feb 2013)
+
+  20 Feb 2013; Diego E. Pettenò <flameeyes@gentoo.org>
+  +google-perftools-2.0-r2.ebuild, -google-perftools-2.0-r1.ebuild,
+  -google-perftools-2.0.ebuild:
+  Re-add support for static-libs; use autotools-utils; add subslot.
 
   03 Feb 2013; Agostino Sarubbo <ago@gentoo.org> google-perftools-2.0-r1.ebuild:
   Add ~ppc, wrt bug #429710
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index d2a0bd4a6548..1844c6004db3 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gperftools-2.0+glibc-2.16.patch 604 SHA256 abb19fd87ce092fc0cb0a4a5964834ec97b12d2462bc2b8bd8668c4ca71fcea5 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964 WHIRLPOOL 75866b1e0e17ccc206459b31e284f7892d7e03c4cd862f8f6d66b374887aab938e9d79115228b7a7258f6bddd2439348fb48f67581744b9fdad1b4f6ae8079ef
 AUX gperftools-2.0-32bit-barrier.patch 792 SHA256 224776d529f1a1d11a036f16f04d4f01e3fd805d6fdd361c7d4b714f5bfbb87c SHA512 a39fd183d76a76e5c4cb3915f966e008250b4c72098bd2a9d13f10e01efd8dd1e36a51e0d4ef5f712d20398fa8605aa40e2529af085e80f918a1e227d7c92def WHIRLPOOL dafa07810d202816462603457395491a7d5901c0faf3134383635ef9a267aeba9f6635e687659dd1634ef7219970334a485350d6f8cad33f6792d87b779c21a3
 DIST google-perftools-1.8.3.tar.gz 1265062 SHA256 6ad744b34abb24312631740d9912f4667993b02e5f59b91246c31a2a911a9d59 SHA512 c6938391d182982ba6a87cd3d023e5fdf3501c42aecb951504e2fc97ce9e5bb2a6e6a577504ddbe89220b45ae47e58ce3e68f84aa45ff238d949dee4fc765b51 WHIRLPOOL 70ef15f25451a0f3eddb92e948e6d7d2e46a7ee8684636ddff312d5f0dda1429a7fe3f1f6756f0a979e4957b09c47513ddad9504415795e9e82ba51188672fdc
 DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
 EBUILD google-perftools-1.8.3.ebuild 2261 SHA256 c31d089d7bf50f957502b40e73abf54001aef377f1706367ac923fe82433947f SHA512 b2efc9e75456153f28021edd69bb83e573695497f9c3aff0b2040b9a5b5a704fd8cb91fb3a1ec2ac8f7f22c5e0dd87f63969452ec9ab20ec9d1fde334bba427d WHIRLPOOL 578af200896795e9a87fffda11e0ca998eee20770dc61566662331d9f4aa746faaebb3c0137cb8a25ccfdfa01db1bfa6d2eada9e9cc9506b72635364a2a6ad7f
-EBUILD google-perftools-2.0-r1.ebuild 2291 SHA256 1e7dd0da2945469fb852cc3738532e8bf577b6f0991f8b7478a5bffde129fbc1 SHA512 18efc5b9b49db219fc8251ffc8fccbb937e63d6c52bb5ef2cea2a207605d9299bf7bf277516ee71311fcfd11b07153648092ace330ccc59bdf890a7f6bb4f3af WHIRLPOOL 02835394e5c3327259bfd557cb78832e8c458c651c0f5232cd9f03e0268a4c45fa800f600dd541244cbfe859d4798978f5a5ad82645311c3186d41ea332f6b4c
-EBUILD google-perftools-2.0.ebuild 2237 SHA256 e57853ade9573ce30bb28aa5d9d17bbb7ce0f2356f30a26c6b655847cdad09b8 SHA512 4a9aacc342b4900cb5c93352e508f0f4c911ccd7ba595278fcdb3d1b240a68c69bc37e6f97a72f5de6957e22a7a1fba5b99bc630de08c8530c0af01ff17be5fd WHIRLPOOL 76deb14070db1d1cf4fc5997b5a02a7dd12565cae7381ee2f6b2c87e400a2692d59ee79a57d0345418c0b1aa2aa8fbf745319d2d013503dbeba61450fecf7239
-MISC ChangeLog 4839 SHA256 65014de0bd8c4729fba6100b798b02a37ddc993709e03b6b27171cc972d97f10 SHA512 5896f683cb750bd124d0fc4e751d6fa5499046801eeb9873ee7518d9f00fd2113b7599887bfcbd01867d1f2941f379c9f311828db9b516454d38384350595a8c WHIRLPOOL 70b0264447bdf69dc7ccb1d8c251ec11896f81db4d4c594be9d86f8a6183343300f105817adcd8e6e6a125e949eb6bb988fdf9c188a1b2a407505b1d295724dd
+EBUILD google-perftools-2.0-r2.ebuild 1898 SHA256 3fa849494f25ef423e3d4d59aa19347e431e7a57b30e64d9d7fe8682bdeda84a SHA512 50e4ac20f60cfd1911fc0d5843a13c4896bacb29fab8402bca6be695a5455f53fe98d076138d054a8d7b78298e8cb9c6ba014cd392ee5ce6cfc44ce9d3344ea2 WHIRLPOOL ccdf058cd6864ddd9f174176a65a485f11753558ebb3098537b8f99f951347589f5d905063e0afdaca6c3899457cb05ef966cb89d92d1eb1c0f82835df6a98d2
+MISC ChangeLog 5110 SHA256 3152fb6e8aa7a13755ab363545eee884e339d05b1b5591b40048ef1c52615fe4 SHA512 982878ed15a4ca838a70fe0a31db9fc41eb56e7275de9e97fa4f02286f6096cadd72422e491ada121654df67a948c198ad61d717a5d02fa8bc71869fd7f38553 WHIRLPOOL ddcbd0fceb21f6f8554256b451bf3ebec8617215afaa21a931dbe8bc3441cc8952c4a011244c60c07152a6543b682d4a46e76bc39e49033b1acb528fb2657cac
 MISC metadata.xml 774 SHA256 bbe347d13e3f9956f9746f532aeb9bdee168509114053d2d0e8212aba51ca649 SHA512 c3b7dd68c57518617c41b435bc660cc6874dd043eff716e54672397ee1c3120126e6814a84a56e64b1ce03dbbf628fca370a491221e2008fb70b301c7a562510 WHIRLPOOL 9d94a18600a269b3589437e9d769ce2a37ed36d4e0e722aebaed4283694266cc0ff53430a9a831e8e3652d82348938d94c8ea6b0a91de8581cbe7ae629ff08c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRJSnzAAoJEBzRPIrUMBNChEUH/irYzbxBn+2kIobYdY0TCGNR
+Uf7vkIQ/nc7uICB/vzK5jnkVE8um5ugXgf6w1ujxaIppJfgrj6rEQGYxLBPili88
+WYY/+2Auw0G3V8PsMixagQ+TOauAFXUbv/YQCFP4t8v3bYn+4tko6QY07nHsXvVA
+csxJHm0bzCNRN71c7GuvAiLi670779FfjoPjRJk3pKZF5YjOTP+6PjoyJaYLCQ5E
+yQ0SGJnEKblS9EBnYlsIMUFii51SREE7fVyG2+hZWeytN2ag5ro46xdIZoikrF+q
+mjNzayoxImfH+YBqqE20o3iT7p8c6ew9L5x68pq6zakq1/c0V8OCoh5cLX6w3DM=
+=12SC
+-----END PGP SIGNATURE-----
diff --git a/dev-util/google-perftools/google-perftools-2.0-r1.ebuild b/dev-util/google-perftools/google-perftools-2.0-r1.ebuild
deleted file mode 100644
index 58c62b20d634..000000000000
--- a/dev-util/google-perftools/google-perftools-2.0-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0-r1.ebuild,v 1.2 2013/02/03 15:09:08 ago Exp $
-
-EAPI=4
-
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="http://code.google.com/p/gperftools/"
-SRC_URI="http://gperftools.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-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}/${MY_P}+glibc-2.16.patch"
-	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		$(use_enable debug debugalloc) \
-		$(use_enable minimal)
-}
-
-src_compile() {
-	emake ${makeopts}
-}
-
-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
-}
-
-src_install() {
-	emake DESTDIR="${D}" install ${makeopts}
-
-	# Remove libtool files since we dropped the static libraries
-	find "${D}" -name '*.la' -delete
-
-	dodoc README AUTHORS ChangeLog TODO NEWS
-	pushd doc
-	dohtml -r *
-	popd
-}
diff --git a/dev-util/google-perftools/google-perftools-2.0.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
index 6df04415bd00..dbb01111beab 100644
--- a/dev-util/google-perftools/google-perftools-2.0.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
@@ -1,32 +1,34 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.5 2013/01/20 23:32:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0-r2.ebuild,v 1.1 2013/02/20 19:54:18 flameeyes Exp $
 
-EAPI=4
+EAPI=5
 
 MY_P="gperftools-${PV}"
 
-inherit toolchain-funcs eutils flag-o-matic
+inherit toolchain-funcs eutils flag-o-matic autotools-utils
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="http://code.google.com/p/gperftools/"
 SRC_URI="http://gperftools.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0/4"
 # contains ASM code, with support for
 # freebsd x86/amd64
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
 KEYWORDS="-* ~arm ~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
+IUSE="largepages +debug minimal test static-libs"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+HTML_DOCS="doc"
+
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
 	# of them on both compile and install.
@@ -36,32 +38,25 @@ pkg_setup() {
 	# 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= "
+		MAKEOPTS+=" noinst_PROGRAMS= "
 }
 
 src_prepare() {
 	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
+	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
 }
 
 src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		$(use_enable debug debugalloc) \
+	local myeconfargs=(
+		--htmldir=/usr/share/doc/${PF}/html
+		$(use_enable debug debugalloc)
 		$(use_enable minimal)
-}
+	)
 
-src_compile() {
-	emake ${makeopts}
+	autotools-utils_src_configure
 }
 
 src_test() {
@@ -73,17 +68,5 @@ src_test() {
 			;;
 	esac
 
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install ${makeopts}
-
-	# Remove libtool files since we dropped the static libraries
-	find "${D}" -name '*.la' -delete
-
-	dodoc README AUTHORS ChangeLog TODO NEWS
-	pushd doc
-	dohtml -r *
-	popd
+	autotools-utils_src_test
 }