summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-06-13 08:43:40 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-06-13 08:43:40 +0000
commit39f149f8bf8d5e28a59d2bd4d8a33e65f285bcae (patch)
tree17ef0666ad9a72ac8824b9b6b1886aa87575bd00 /dev-libs/bitset
parentBump (diff)
downloadhistorical-39f149f8bf8d5e28a59d2bd4d8a33e65f285bcae.tar.gz
historical-39f149f8bf8d5e28a59d2bd4d8a33e65f285bcae.tar.bz2
historical-39f149f8bf8d5e28a59d2bd4d8a33e65f285bcae.zip
Properly handle 'minimal' USE-flag for dev-util/google-perftools dependency
Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64 Manifest-Sign-Key: 0x1F357D42
Diffstat (limited to 'dev-libs/bitset')
-rw-r--r--dev-libs/bitset/ChangeLog6
-rw-r--r--dev-libs/bitset/Manifest18
-rw-r--r--dev-libs/bitset/bitset-2.8.3.ebuild4
-rw-r--r--dev-libs/bitset/bitset-2.8.4.ebuild7
4 files changed, 23 insertions, 12 deletions
diff --git a/dev-libs/bitset/ChangeLog b/dev-libs/bitset/ChangeLog
index 4ac0026d2999..84676fc58d47 100644
--- a/dev-libs/bitset/ChangeLog
+++ b/dev-libs/bitset/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/bitset
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/ChangeLog,v 1.7 2013/06/13 00:50:14 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/ChangeLog,v 1.8 2013/06/13 08:43:39 pinkbyte Exp $
+
+ 13 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> bitset-2.8.3.ebuild,
+ bitset-2.8.4.ebuild:
+ Properly handle 'minimal' USE-flag for dev-util/google-perftools dependency
*bitset-2.8.4 (13 Jun 2013)
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index 0be78bab7aa4..32b9d2a0be56 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -3,14 +3,18 @@ Hash: SHA256
DIST bitset-2.8.3.tar.gz 36787 SHA256 87d9cb74405c4b496ba1bcb334afd60e15be0a17102b0e722337a6604f2e8469 SHA512 7b451139ee9db0b581e552d09f03809185e64f3b1190d887ba58478c4dc10a1ecc687d69cb42045e3c01ad9d065e12aa4f31d14068d7df9f6a8f284344d5b51c WHIRLPOOL d814d155c700817c636047d437c219d436fbcb2492294ee347f48368740866113318b278bf63094f84067f62dab6334b9f2a9607162f106815e013d96240b6e6
DIST bitset-2.8.4.tar.gz 37040 SHA256 7e3a8d7e550ed24f646a3264c7efeb0b267f5f2d0f3177952b2ce5f6866e57b7 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7 WHIRLPOOL 2ed96fb305a8e88bff695b419dc73ecb64ebbdf5944d869a4bd3216ac77a88ede4dd646a6a5f64dc7e6bb77903acfc46e64d67359cc58151df288b86043e812c
-EBUILD bitset-2.8.3.ebuild 857 SHA256 813f91104652f3df403fdb9c06472a54b9c6e82aa74bbdc995fffce1335e1d62 SHA512 b8f9b0b743c59fa55c4da2c8a4c2218ee90c64dbac3e7efaec2b37a8a620059d8447112361995780fb7f530375e65f72d7fe1374143ca9ce5355fd800a86c346 WHIRLPOOL 7c672f107b24f56291d906a88dc9848de0bd5b23cb2804bb1520054a8dc9d8c7eb1d24b7e64a613362f1aa23a6ea2d209ecb63c567b8ff4ad9895892182401a7
-EBUILD bitset-2.8.4.ebuild 866 SHA256 be7c4d726d1216f4a525a839ba71cf1a3bdb127c1f83dc753934e2a00b6c5ce6 SHA512 0b9b04e8d528ae94677afe7659e7cc577f07f1676ebe15df20f01dc6ab5866b9e9cbf23c1651c9f84a30747bc86e40723a948c701b39646784779e5c824ef494 WHIRLPOOL 5ab439d69516a204ff30542dcf10d063ec9b3b922c31a61a0b6c6e276e617fb1bda12444807b149df2d05a3f126688ab554ec471a492f4ad9df960ebca46538b
-MISC ChangeLog 1283 SHA256 038da586e0b2b6c6fa2686a4f1f16ee4f22e3ee5293f633bfa5b2876cd023dce SHA512 17c29bc3f57340e27959e457294327d030ac0995629f449aae5d57fc129e414561eea5a127d6915c8f895518a84069b9c746771894e5186fa75ea6092826352b WHIRLPOOL 4429cd7b64d1e1aad6acafae8bfe8c8ddcbcd23f960edd01c84b5122e83c1942423e124b60b2dd4662c6e2cfaf8f1f496e90c896233aa662f19791463582dabb
+EBUILD bitset-2.8.3.ebuild 872 SHA256 f52b690e7851bc786a90d0fe9478365d9a8487178bb00b3f48045828e9710511 SHA512 c93897e0e674aca456bb3f59fb678e8790fb02969ae1eb77279b0e0025e053a5448a47a1820e6ea6a431fba2ef7da3c969b6ba3f9f1efdf71f3e583a260a693d WHIRLPOOL 99b16c5f2c2e2766b6cb931f6482ffcc01a3396abcff5a8ce7d0c6353375ae9aebe92f3f711a516973671890916fc0f4688e6b0af3498b3733d295d2eefbf23f
+EBUILD bitset-2.8.4.ebuild 1049 SHA256 8d90da043a66abc793ee255718c4a5eab1de400ce82a76a2596311dd46a8d348 SHA512 833947c08327a6f248e529608dda58bb01c58abd015dbfc801e40d8692774082a8bc89df8dd1267e9d31f7eceffa25c8a11e26671c1f0c302fcdb31126b5b605 WHIRLPOOL 389fb8cca3d2ab07ba63573f8e2d9d02c1187186aba125e4fa94e92fa165aba19f0b03e39d64a335a93d42fdf72b9ff327bcfa5fe2bf345a9733536e010c0070
+MISC ChangeLog 1454 SHA256 b7e1504f648e22f1c0cc1589cc6ef78dc18a7d838e1389400550fa8efa1c8019 SHA512 2ef0e8061886cf3988a32dc02904d12af44755522c426f2e5f3d341db20eaa14163ed109dbb0e20f695b6f4d49ee975e81f2072e2cf57d09708912135b242fcd WHIRLPOOL e9130e2038c20a64f6a9b364031ae82fff23ce491bdf95659c53d5ea9a821874307f93c17ae5bf8d62c5a21e44bb630daf7e9e5f403290766e4ce52078443051
MISC metadata.xml 759 SHA256 63c53c0b175fe2c9a18fccd333cddf3189eba7f19bcac625e3abace999dabb4e SHA512 5e49eb57e04e46e3a14a3fdee0ad87ca76091d106273c1c74a3b744957d945eba077cbb0f7afc9c119eba5f6ee29b29c9921367d5b3d0dbe75040882c475e3e1 WHIRLPOOL ff854295a9380fc147514b3136adf0ef23165358e7eab74c7a8af71c3ea15118b0b73e65b439137d7ba91358441b327b5a471f8da3305df0e93860bff44cf57a
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iF4EAREIAAYFAlG5F1AACgkQVxOqA9G7/aDnoQEAks+JG2JPN94EW5jM9PjA1gZZ
-Sw1BsGEmAJYTECNwZ2UA/j1jKs68S6ZXg9iZ3rNEN6it8VkP6kgKyrEKOtjrnKli
-=ioRZ
+iQEcBAEBCAAGBQJRuYZ5AAoJECo/aRed9267oUoH/3XGPG9pbsZk4Vn5P6YjkyhR
+39e6qoID+FYVDnzrm+7UWcLsg4Vj1UeWYRS9bmw2tdCpNFVjbBDkCVyZkVXCMRnp
+1phHGckAqMoVJSxTU9kDFkrpWplFLJC1cWtiJ33SNUMVB3yIv1KD2YzhENu9Pc1k
+kF6jIUP9YPZlP8UtJrULjBcBqeI4N2z9h+P7zyjOiJFJkJdTCJigvuU59vKvbdIe
+ytu0i45fJhk4tPzLoD/3+hiLyMI48LnMnpVk9B3EeiJ+Lrp5pxpW9XUjrXwqaopQ
+dQ/ZU9REySeFUH4VU6J4l+m4TBzvPzQVuYYrxGVHuqzMbgwX8dnJT0iT5IlXuZ4=
+=2KLA
-----END PGP SIGNATURE-----
diff --git a/dev-libs/bitset/bitset-2.8.3.ebuild b/dev-libs/bitset/bitset-2.8.3.ebuild
index a6fd83b0c1d9..2c84a88bb7f4 100644
--- a/dev-libs/bitset/bitset-2.8.3.ebuild
+++ b/dev-libs/bitset/bitset-2.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/bitset-2.8.3.ebuild,v 1.3 2013/04/15 08:51:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/bitset-2.8.3.ebuild,v 1.4 2013/06/13 08:43:38 pinkbyte Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SLOT="0"
IUSE="jemalloc static-libs tcmalloc"
KEYWORDS="amd64 x86"
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
+RDEPEND="tcmalloc? ( dev-util/google-perftools[-minimal] )
jemalloc? ( >=dev-libs/jemalloc-3.2 )"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/bitset/bitset-2.8.4.ebuild b/dev-libs/bitset/bitset-2.8.4.ebuild
index e76b6191d6c3..3f62fcf25cae 100644
--- a/dev-libs/bitset/bitset-2.8.4.ebuild
+++ b/dev-libs/bitset/bitset-2.8.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/bitset-2.8.4.ebuild,v 1.1 2013/06/13 00:50:14 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/bitset/bitset-2.8.4.ebuild,v 1.2 2013/06/13 08:43:39 pinkbyte Exp $
EAPI="5"
@@ -25,9 +25,12 @@ REQUIRED_USE="?? ( jemalloc tcmalloc )"
DOCS=( README.md )
src_configure() {
+ local tcmalloc_lib_name='tcmalloc'
+ has_version dev-util/google-perftools[minimal] && tcmalloc_lib_name='tcmalloc_minimal'
local myeconfargs=(
$(use_with jemalloc) \
- $(use_with tcmalloc)
+ $(use_with tcmalloc) \
+ $(use_with tcmalloc tcmalloc-lib "${tcmalloc_lib_name}")
)
autotools-utils_src_configure
}