Version bump (both 1.10 and 2.0, the latter masked). Remove old versions.

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

5 files changed, 71 insertions, 58 deletions

diff --git a/dev-util/google-perftools/ChangeLog b/dev-util/google-perftools/ChangeLog
index f66e0cf0819d..a7452d52aa5f 100644
--- a/dev-util/google-perftools/ChangeLog
+++ b/dev-util/google-perftools/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/google-perftools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.17 2012/06/25 06:28:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.18 2012/07/06 00:57:34 flameeyes Exp $
+
+*google-perftools-2.0 (06 Jul 2012)
+*google-perftools-1.10 (06 Jul 2012)
+
+  06 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +google-perftools-1.10.ebuild, +google-perftools-2.0.ebuild,
+  -files/google-perftools-1.7-syntax.patch, -google-perftools-1.6.ebuild,
+  -google-perftools-1.7.ebuild:
+  Version bump  (both 1.10 and 2.0, the latter masked). Remove old versions.
 
   25 Jun 2012; Jeff Horelick <jdhore@gentoo.org> google-perftools-1.8.3.ebuild:
   marked x86 per bug 418445
@@ -89,4 +98,3 @@
   Initial import of google's perftools package, from Sven Wegener
   (swegener)'s overlay, upon request by Pavel Stratil. Tests restricted as
   per bug #290249.
-
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index f6a1bea79805..c6f266d17776 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,11 +1,24 @@
-AUX google-perftools-1.7-syntax.patch 558 SHA256 3c26a876c790f2421502dacda1041e461e322b850e0f17568ea0b65b2aa71f41 SHA512 f8276a15edd9f3cea6640a475fd2a2570cf5599dc60edc80f976f49ef06fe1c9589888525939686b852cc995ed3a7eb539439641b754ac4e6eafead0503b37f5 WHIRLPOOL 715c98b81335495cc85983e2e62e1d9f4e8e6d4866fd5f1790532364e15279762f7cb5ed89b29da2d2e7f2daace2265a40f29709540ada9d39ffe46ff5aa8f47
-DIST google-perftools-1.6.tar.gz 1193915 SHA256 40455b35235da304ad664b05ffbb44a1f65f4ec903e532cf365b2fae9edf1f5e SHA512 1c02fe247ff5106e801b4824ed7043c829ef338f8838dee137e6d863504ace808ed843e673c3b46be7f44fb8dbe2c4a805a28c8e3421a64801c26a5210814796 WHIRLPOOL 7e7204ea8c9147a06aef15dfb9933bcc2cd125a92e116c3184fab270fc53c05d891fe0690f4cfc4da5e033d9179124d1b3d1b46720ae1174ce87e97af5dc8826
-DIST google-perftools-1.7.tar.gz 1207931 SHA256 65326e3328a84c97d9de79d3f7dfdda6c78d9310217bfb8ac0a0845759e69b15 SHA512 610b7c93d21266ffa62858a754d7f1dcd8a5612114f3cf1a32456d9c838f08d5bb984ccdb98e9cd5037f4a232879b96b0430dc7e372d7e47d165a990d0c13e82 WHIRLPOOL c10731b19bf8e6a76c2f21c9d863e708556f676b9d4b58c6f162b3a0d0baf4391711baff3d51136472cfe8b6c711dbc0a343d571fb09158c306519329f3d862f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST google-perftools-1.10.tar.gz 1257663 SHA256 bc458dfb65a2b1ba6ac0ee2f81705d6224c5aeeced7262cd15f6c84066ab2090 SHA512 ba95b319476c55eee87f882e0c1a091ed03f2fb34eae92c6a69e992c9b69d5ece347617a739150006ea833ca12ff39bda2b563534517ad391925b9d056435454 WHIRLPOOL 2078fdaf7dbe78946a7d32a6d94cac0268c82f1315a93e0d1212d665ef6dff600086f51994344f1ee714a9a398d39b5ba0c7fcc04262710c3dc5f731b711bdf0
 DIST google-perftools-1.8.3.tar.gz 1265062 SHA256 6ad744b34abb24312631740d9912f4667993b02e5f59b91246c31a2a911a9d59 SHA512 c6938391d182982ba6a87cd3d023e5fdf3501c42aecb951504e2fc97ce9e5bb2a6e6a577504ddbe89220b45ae47e58ce3e68f84aa45ff238d949dee4fc765b51 WHIRLPOOL 70ef15f25451a0f3eddb92e948e6d7d2e46a7ee8684636ddff312d5f0dda1429a7fe3f1f6756f0a979e4957b09c47513ddad9504415795e9e82ba51188672fdc
 DIST google-perftools-1.9.tar.gz 1245683 SHA256 e56e6b46781ad0fb87f225dc06e0b5634a7ee526bce72d0e7ab9cd704939733b SHA512 5361b875b2800445d16065127d3fb9fef77f738f634634e4f63b71141ec9ab5bace20875601f255e604d9d0d6dfd404a3c2a9501b2e98002f7918d5fa6e49b51 WHIRLPOOL 6a0a0bc87c5693e3e3a9e4f17a4a85a2e7ae1053d0a745ce1875ceb7877c57f2b250371e58cbe1ccd971911fceec34702b9d084bec67a60e0d34a98279002d94
-EBUILD google-perftools-1.6.ebuild 1883 SHA256 4a9f007db3124900c1a9c3f1067a24d354b4e5dfc5a137d9a38a89f19a4969a1 SHA512 d47f82d2790650e0e1d22928c0cb501da03b4b2f33ba90358f481e2e7a9447be01e7f4af67f52f11fd859d1c3d68c9df229d0064f8bca8af577427e684735595 WHIRLPOOL c78ce035f1c2af825fdffc6b202abb4b9977a3a1d356370d5b10d0749562f9e336f0bedca1d75e30e2f2837cafffa88440644f3b8a5474d58cc32f3b12aafc6d
-EBUILD google-perftools-1.7.ebuild 2187 SHA256 239dc885918bc88a9d221396ecdd5b9668e3b506f74276c349a35076ef2118b7 SHA512 3da3634e12baef1f759f77e84932df0d5b6e0219b29b497c272cf46dbda084420c1f1b5088922b35253aaefef77d9cbf178d1c195a3b9634f5380544b748021f WHIRLPOOL fa1e92ab7ad6c589bebb684f48e86b5f3e31cb06a5b90469cf5929e593ffe1a57123aafbde85552e12354dc05a6ba826653cea026b991a6544edc876dad9b2c4
+DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
+EBUILD google-perftools-1.10.ebuild 1961 SHA256 e96d04ce730228e1e890fd6d495157a23338e8984ce3b63c3a05005d770c90a1 SHA512 2496412abccd5357b67ecf39f5c71e9310bea222abb151b475d6fc007b9e90f205b2f79ac5637495a4857dbbe4a2d3bce054e761251ce6dc156fb5198c43a458 WHIRLPOOL 447852feb456a844c01ddedf81d803b5775eeb948462fcd0581c00fb741ca22cf6376343dbc70cd215dc163f94d719d9941b583ffc8725559e2779e9cea216b1
 EBUILD google-perftools-1.8.3.ebuild 2135 SHA256 2c11a92f50262cc008e0910c7c45a1dcf2cf821d6716652a5ad1d9cb97f322f6 SHA512 45616015e84bb925cba006ed96f8715272d4cf7aab632cb95bf9b1f71f36309cfee6e2169f2d31e68469c0632772f8e2c3565b606be93f8420f4d6e6d073c345 WHIRLPOOL 6ceab6a0edd1c000c53ed719da0bdefaf9e505eb600b472ae960626609fb7c4e8a35dec0ea3a38e005cd867aa2fbe54c231a8cdcceb47c9bae71d848de3a3806
 EBUILD google-perftools-1.9.ebuild 1972 SHA256 0ccca132ce78a88162576742222d264cd17f0c3d686b6d8938808a68adc8ab4b SHA512 ece690359d44f08abbe4f69c17ef98d35a62c481c12085129eb6b28a5fff8e21f1b32108061e1bffaa21e3eaca816b37f734d36dd5c9476eef4b838c04ed10bc WHIRLPOOL 95067b4b5936dc464448ecb78d5b876777960adc9bb4b7172d28dbf75f1474c208c21a63567e8f0a3be661db05f5276d567dea375a0077c344344100139eb172
-MISC ChangeLog 3301 SHA256 620f27627480bea17bdfec879be9bf6dcfc92f5c2a76f9d668648fb1ce6a5f2c SHA512 a121ec2503c90a4675750f3c0fb5df259d034f63aef82a20705b1a5a4c9d74fa19882839ee91b9b3857cc9c0e3c4c0f8fda92b1fe1fd54be7f1a845146592ba9 WHIRLPOOL 6c6ad070683ed82babfdae1ab9e82bd9d034cbe6bcc933ebd5f6c873c5710a7c6fb1de68b1d5097183cbe450aa5de6d28ea6c1d12bb423a435f03d206bc295ae
+EBUILD google-perftools-2.0.ebuild 2012 SHA256 258ce26763ed1a6e13b056f719e5f7b53550ce7ca61a1ca28b971c97a4a95339 SHA512 ce87dc1b29ecfb0506a247645d222b15a6bb81d592ceaf87c53d19d2e24bbc59d06d460127d160789dddbc30287fa891fd732067df1f6a1ad0cb2dae0165e3f1 WHIRLPOOL 4c718ecef736ef5282cd83707e5cb9c80706d9d4cea9f943724f9f328ebd57ad20f874c0a3e6cf371ae88e3099bb1f6f2ee282c86316e356c199629cefe3e3c5
+MISC ChangeLog 3680 SHA256 c246eb4f8f2c86ed88d8a2f91b7d796fca001e558f2153c50777ddac9cfe8d90 SHA512 49e85bc91ecbbec53ff81b2b79af0fea77ed282f7462e85e1664cb7714f0233314b0bc5b013e4eeff60a2593749e120711a8695f4d54cbdfcd9b5e4b7d8d8d82 WHIRLPOOL 6a81d9d6434460a7a405ec6d37001804e61ee9cc6903fc2894852a6d55a85360536cdae4ff4f99418a1c8c182dc473a82482a855504b37a014f821fc4ec2533a
 MISC metadata.xml 774 SHA256 bbe347d13e3f9956f9746f532aeb9bdee168509114053d2d0e8212aba51ca649 SHA512 c3b7dd68c57518617c41b435bc660cc6874dd043eff716e54672397ee1c3120126e6814a84a56e64b1ce03dbbf628fca370a491221e2008fb70b301c7a562510 WHIRLPOOL 9d94a18600a269b3589437e9d769ce2a37ed36d4e0e722aebaed4283694266cc0ff53430a9a831e8e3652d82348938d94c8ea6b0a91de8581cbe7ae629ff08c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP9jgIAAoJEBzRPIrUMBNCtqMH/itRLCu5snHlyJC4XQCATD25
+YI38bDZXAQuuKNo44rdmOVrOhoYeLdc1fdtov2csRQNqJWvw1njSmCgDjAaETZnZ
+Vhr3/krikAdzinC7xy3mR8Je3GC94YEm25ZqhpGKbgvKPbDSPWV51XuCtdfitvZ9
+Ek9i8u728hOqbLyOm9oKqM1PVQ995G1tBux47VV2l5g0yVDKL/h/CFuSIx/o3534
+f2IdPzrUzLe1MWmC0leSijprkh1HxOBFFL3jh3Kg0kto++cgkQF0TJxU4lYDl7k+
+LhUHCMNmdCLutEVpTfi8PyevnRChZNytY3mHRxG/zZFUe7gUH/pSsgmRYqwfBYc=
+=7EyC
+-----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
deleted file mode 100644
index c9226a98a625..000000000000
--- a/dev-util/google-perftools/files/google-perftools-1.7-syntax.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.6.ebuild b/dev-util/google-perftools/google-perftools-1.10.ebuild
index 81ecedfba82a..8d102c4ba6a7 100644
--- a/dev-util/google-perftools/google-perftools-1.6.ebuild
+++ b/dev-util/google-perftools/google-perftools-1.10.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2012 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.4 2012/06/07 21:32:04 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.10.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 
-inherit flag-o-matic toolchain-funcs
+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"
+HOMEPAGE="http://code.google.com/p/gperftools/"
+SRC_URI="http://gperftools.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="largepages +debug minimal" # test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+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.
@@ -30,8 +26,7 @@ pkg_setup() {
 	# 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 && \
+	use test || \
 		makeopts="${makeopts} noinst_PROGRAMS= "
 
 	# don't install _anything_ from the documentation, since it would
@@ -42,6 +37,8 @@ pkg_setup() {
 src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
 
+	append-flags -fno-strict-aliasing
+
 	econf \
 		--disable-static \
 		--disable-dependency-tracking \
@@ -51,17 +48,29 @@ src_configure() {
 }
 
 src_compile() {
-	emake ${makeopts} || die "emake failed"
+	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} || die "emake install failed"
+	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 || die
+	dodoc README AUTHORS ChangeLog TODO NEWS
 	pushd doc
-	dohtml -r * || die
+	dohtml -r *
 	popd
 }
diff --git a/dev-util/google-perftools/google-perftools-1.7.ebuild b/dev-util/google-perftools/google-perftools-2.0.ebuild
index 4225079fac7b..8b17ece415ef 100644
--- a/dev-util/google-perftools/google-perftools-1.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
 
-EAPI=2
+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/google-perftools/"
-SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
+HOMEPAGE="http://code.google.com/p/gperftools/"
+SRC_URI="http://gperftools.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="largepages +debug minimal" # test"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="largepages +debug minimal test"
 
 DEPEND="sys-libs/libunwind"
 RDEPEND="${DEPEND}"
 
-# tests end up in an infinite loop, even without sandbox
-RESTRICT=test
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
@@ -29,8 +30,7 @@ pkg_setup() {
 	# 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 && \
+	use test || \
 		makeopts="${makeopts} noinst_PROGRAMS= "
 
 	# don't install _anything_ from the documentation, since it would
@@ -38,10 +38,6 @@ pkg_setup() {
 	makeopts="${makeopts} dist_doc_DATA= "
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-syntax.patch"
-}
-
 src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
 
@@ -56,7 +52,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake ${makeopts} || die "emake failed"
+	emake ${makeopts}
 }
 
 src_test() {
@@ -68,17 +64,17 @@ src_test() {
 			;;
 	esac
 
-	emake check || die "tests failed"
+	emake check
 }
 
 src_install() {
-	emake DESTDIR="${D}" install ${makeopts} || die "emake install failed"
+	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 || die
+	dodoc README AUTHORS ChangeLog TODO NEWS
 	pushd doc
-	dohtml -r * || die
+	dohtml -r *
 	popd
 }