Add USE=libatomic to control dependency #453704 by Jeroen Roovers.

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 32 insertions, 12 deletions

diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index 188e2d022e0c..13734882e294 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libunwind
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.30 2012/12/19 17:32:09 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.31 2013/01/25 17:19:56 vapier Exp $
+
+  25 Jan 2013; Mike Frysinger <vapier@gentoo.org> libunwind-1.1.ebuild,
+  metadata.xml:
+  Add USE=libatomic to control dependency #453704 by Jeroen Roovers.
 
   19 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> libunwind-1.1.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 778633f0ea20..0f4c499adbc1 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -11,13 +11,23 @@ DIST libunwind-1.1.tar.gz 1098603 SHA256 9dfe0fcae2a866de9d3942c66995e4b46023044
 EBUILD libunwind-0.99-r1.ebuild 1103 SHA256 962c93f91523135b31c45f726accc1f2d87f2b5877d5fcefa2790861d84bef2f SHA512 e8a335060b4955034ebade25644f171af878960f869742585fbef5a65ed48657d7eaaa7172ea1ab322efe9009135716fe0d34d5a67905f9ed8863fe85cdde3eb WHIRLPOOL 0e0b318c5f9db6252224ac56980141d9512d326d1c18672210a5f4d1e0b71638e3d70c54ffc548a09a2363d09ad6db8ba1861cf116d77e41dfe1d1ddfee25166
 EBUILD libunwind-1.0.1-r1.ebuild 1947 SHA256 e7e609213039ab1103d903ca041fd11bc3e1d0fa91ce4850e4dba1cc93dcc25e SHA512 a07fbafa2f86de9929d96177d6b463d4bda1a19fd3060c2ff37faf084cdc2507833d8fa24dea530bb49b49ccbad41d17fc57b1cae90290481a31e6bfc3392ef1 WHIRLPOOL 0fd1b08e6042b8271bb2641a8827484f55651f20892365189ab98b9b68deca631732620a2a3bab41cf79c8a6ef5bb844a82f373c69a6c5c7c6166ad2e521450d
 EBUILD libunwind-1.0.1.ebuild 1407 SHA256 f23c9405452a13e7238b55bbaff71c7636ef47605a618d3eac55914410ff7036 SHA512 dc01f58db7fd25f14e3075090e000e22c83ce192069880bd36a72d66af16da0865e22b9d15a2329e6a1eecaeeb5474810bbdc1dcc574779c5f5dc09414963630 WHIRLPOOL 9e5cef0cda05c72b20cc5b8d066d2b669c58a8c983e448670c4434a96ac596f77b6e2ec68d61f837de650e6e2b84d916272a1ea63b33fe4e622515a0af63bbfd
-EBUILD libunwind-1.1.ebuild 2074 SHA256 0273078eef75d781fa1dda60df25c5f9aefa54ab0954c0b9838eaf70535ad939 SHA512 b9150acd6c026fbd842c9e09d864023573a6713ffeda75b9eddd50984d2a372e5817746043812e391c87b39fe740f4f12af17451a3d0762a3ff6a3eeec1fc23c WHIRLPOOL 159bd677f353ea57728247cda111f8f658ee08d637d567115d3b7cde90e55bc6d15007ca0e111ba57b26dc8abc1dec9e6f55c05841113708a855f652f023290d
-MISC ChangeLog 4332 SHA256 f727ea1d5fc37ed9ed8d03198c33b4f86f19a21f34c4cfb2f25f69f0f18504d8 SHA512 7df9f099e0c7bc34b456edbece30b3600a3395ea5053b5cbb80a650c59d6b9850cbd8e15271e2b413b93d4f8724d0f560af6699d9f60b126a6772bd2d641e640 WHIRLPOOL dc08baad1750b3cc59e0288da2adc16160039248e860d9bbfbadb8239c61a5d1084cbb37701c8555edf875e319e20801303a6e9efb1db9046d44e8e6e51e8da7
-MISC metadata.xml 308 SHA256 7cc6384c4b235b1f508c714d3a35a8944cb7a550d93132d1bc328c936364c461 SHA512 777fe5edcaaf2fb8d860fcb6e4c11b85b701ae11963d89bdc6210abcce609bb9c41936b2d658c67a56e99001e2822753f71593c5ad4f513c8518d88149dd4b59 WHIRLPOOL 68b6c100b70f5acd52f64a7d10d79784de1f6c93872216239d6df5b9d735ccc35252b8e5d3148cd1ce9c466962acfab36743083440cd8cc27737dc7a712cf756
+EBUILD libunwind-1.1.ebuild 2225 SHA256 a7a2293648117544ad1ef7978ea2e3f124e638ef28b48388d1dd99467120171e SHA512 2cfa9821c8944b4fd3d991f7c9c28d04794a96aa2a4df419317f1c2cc4d45cec83e2b92c58e284c078610186d4956062a48e7787b31646dd4f2b44aaaa1780a5 WHIRLPOOL c55bcfb1e1a21567be9fa9500afef13f4d1e61d01b7aff19bccdbc793fdbef8d67376e14b0abf14bf94acfc8b066a766a808e3901091d5d54458a81a8ce68803
+MISC ChangeLog 4488 SHA256 b02da672912f0ff1671d867c95c5c0843d715ca225f935346266b8d681505c37 SHA512 05af0eca332619969fa0b1ea09dccf83e97d7ea092710fa67d1d6c39ad08fd7678eadbf7dbedde6f1d4d3b09e4c156892384fc56e724e617ba97be73620969b1 WHIRLPOOL 61ded0b994a729f41e5c3fd3930974631e7ca101a5744787ee762e54b6bfe6accc3617a77da6830fce7c76045ec1a5b62c447759cdcab87d6f2c38000bdd3100
+MISC metadata.xml 391 SHA256 85a52322c0bd2246a77a82d55d1fc8556b07e66f24ff5c7d3cf7f39a91622c3d SHA512 3caaa160e93a0248f58d203cff96b73970d53bbb56f0896604f0722300f30a82d7f3dce26a6ace71209b2baca34f5479b2791bbf9ac7fabf3d241f572a70b215 WHIRLPOOL 5182103d5226b341843b93d6840c12b8d4292ea1928820219f4eebe9ae8df9257269f9aa26b3fbbe09af98ae578290d5d16fd04ed0b0944cba4a23ec89d09fb5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDR+nsACgkQ1ycZbhPLE2AhIACghIcLserRPZGMVta9MwPjzbPP
-QzcAn2yJL4v0okdtnvxmh8T0T15o11on
-=fs9c
+iQIcBAEBCAAGBQJRAr69AAoJELEHsLL7fEFWPwIQAMaazlKUZVIqDuFCaS7yP+JV
+dhuTzVY68Aq9Dhb/1dj7097P63dSJhIkHq1Bkt+VpSVvut5+NknSpnPG6enKeqYV
+i7sWnniRXXR/vXTsv6CzcNtdPN+Ni+L7umrsqlUrQSCxkn/N2G7y65pcZ1nlLGyg
+TR+sDCGF4lLDiVqpDsR8pCtEDvip4AM7Six2LLwo3hc8YhFfL85U1JoO3aoFNJsE
+L7dwHvM7VF0bHYOFWgCNRnhtSP85iklm5uZb7egQaJu7lCrvl7MEZT43OoWk7C+W
+ThZFSNZQ04jValL7i0trkl8JRTBurc9iwNIrmdZeMtY3fJKF1b30wd8kD/DTQelG
+8Q+sgc49MaqvF9o7rcoBVqNmjr4EPyQH2n4CFMaJMAxl19p3bZcobgOq/O0BJpPe
+MTE6qHXRzKP8FV404Fg9SD3x6q2S14fk1yvHpSwvARKjY3+tsvb1nURHEWjHBvN1
+OT7oXKvZHLLRAI90ZrKXxTKxKVYetI/S42tD7TairiTDLlKfkBs+vYzlbYaDSpAv
+D5Wy7qcYBCfrqKsEwfvtWhCg/ZEg7nq6Rz8M9hFqoeFI07yKz9lPkcq1E4akAhz0
+gR3nXyHUjvrMULjGUPHyduFpiffAChXypfzNaeqnUydblnvSnrM+rXCm69qz8Rdu
+VEKi0DnOj45T/smqYWuC
+=ALRi
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/libunwind-1.1.ebuild b/sys-libs/libunwind/libunwind-1.1.ebuild
index ddbea4094c55..cbc8e42bc7e6 100644
--- a/sys-libs/libunwind/libunwind-1.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.4 2012/12/19 17:32:09 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.5 2013/01/25 17:19:56 vapier Exp $
 
 EAPI="4"
 
+inherit eutils
+
 DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
 HOMEPAGE="http://savannah.nongnu.org/projects/libunwind"
 SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz"
@@ -11,10 +13,12 @@ SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="7"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux"
-IUSE="debug debug-frame lzma static-libs"
+IUSE="debug debug-frame libatomic lzma static-libs"
 
+# We just use the header from libatomic.
 RDEPEND="lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	libatomic? ( dev-libs/libatomic_ops )"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
@@ -36,6 +40,7 @@ src_configure() {
 	# conservative-checks: validate memory addresses before use; as of 1.0.1,
 	# only x86_64 supports this, yet may be useful for debugging, couple it with
 	# debug useflag.
+	ac_cv_header_atomic_ops_h=$(usex libatomic) \
 	econf \
 		--enable-cxx-exceptions \
 		$(use_enable debug-frame) \
diff --git a/sys-libs/libunwind/metadata.xml b/sys-libs/libunwind/metadata.xml
index 4878bd084d1f..808179f059c8 100644
--- a/sys-libs/libunwind/metadata.xml
+++ b/sys-libs/libunwind/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>toolchain</herd>
 	<use>
 		<flag name='debug-frame'>Adds support for DWARF .debug_frame section: Use the information from this section if available</flag>
+		<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
 	</use>
 </pkgmetadata>