Correct LIBLZMA="-lzma" with LIBLZMA="-llzma" (and edit both configure and configure.ac to avoid running eautoreconf only for this) as per #444050 by Marcin Mirosław

Package-Manager: portage-2.2.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 23 insertions, 20 deletions

diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index f78a50e2f659..574e8e0e36c0 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/libunwind
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.33 2013/03/17 15:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.34 2013/09/12 19:15:36 ssuominen Exp $
+
+  12 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> libunwind-1.1.ebuild:
+  Correct LIBLZMA="-lzma" with LIBLZMA="-llzma" (and edit both configure and
+  configure.ac to avoid running eautoreconf only for this) as per #444050 by
+  Marcin Mirosław
 
   17 Mar 2013; Agostino Sarubbo <ago@gentoo.org> libunwind-1.1.ebuild:
   Stable for arm, wrt bug #461394
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index e1f379e56a69..be7ba60e4e4a 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libunwind-0.99-disable-setjmp.patch 8566 SHA256 d9cce99c7e53414b7c364c1e1fd14332bc9d2decae26750244af166d6fb820ef SHA512 c14ecaf9730f753787dbabe19194f92b55fde43c9310839adbc642500ba72a8e76e0509931bcf08db73cb8d73f131b7f6c7e255ca91543ddb3bb21531830c85f WHIRLPOOL 6ff8ff18e2f62a235cb201a2f4fd15cace61fcc23f36a823bf4e113c4dccbb27d39419d09ff22dc76f8ee6e46a9d552d4782c2f3a41b2f8ab3f031b82dd265ac
 AUX libunwind-0.99-implicit-declaration.patch 486 SHA256 f8f72c6160c6741ea2a3d251662fe3d8ecd63bfcf488527838e6d95e4dddd2a1 SHA512 071a59b3e9c46a045ce686abe5f6a70e6f007bbc3b2aaeeccdc900186346e44193ccee1ac63ddb5d37b7c9c161228f4d45de0d7b43d1ccab23f579496aa8ef90 WHIRLPOOL 08fd3bf9f83f7ff35edab20d4693634cf510cfa3c8cf50fa210510815c8b6129630ac04bb9e7640c042f837ca22f6ea7b9638d88f78722e8a6b60842306437f8
@@ -11,23 +11,17 @@ 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 2220 SHA256 bdbc47ce394dd9f093fd2ec7def2adc7aa57d4a2d7979968e25a6a0672fef390 SHA512 eabaebd1f251d12bab794e8241de272c785897b6f9ccd2898ec54029960ec304602c017f3f81dd629aa6d6fb81dc606c0659ca012f7513bf6e1dbd907ea162ed WHIRLPOOL 283874e2398571eae949302abd3bf58b328ff58c9bd590c78f5ffceac14e890c624e5caba1554bdb5645c566b01e16f99479ae792c5b3da5c01a2c425d3aea9c
-MISC ChangeLog 4699 SHA256 c1fbc43451d73f51ff799c10fe8bfce2178dcd8f46b2c68ae0c9d202d0cdc522 SHA512 c7355e64e0b0b10450e2b841e57afb17dd4ecc03c424d99bc566115be53d9af99f0d3d6dc3bc00ab40949cdfa335fd599d5c642e7062a68ee4cbd5357acff951 WHIRLPOOL 66863e04c23f2843b9cb4f3f0ffa62627d2d1ba0086ce2da18d3961a629481f6a7723e876d56da5e47b8bb74d6424f8b3a604f1b80614e1b66e224469422b84d
+EBUILD libunwind-1.1.ebuild 2396 SHA256 8584551ac7b3554f3babb176990a3387cc8c86acef9822526b859eb1a1c34413 SHA512 bb3cddcbeea0c3197f771b2677ef2a1a82f4fe80859cb24815134f8feae9ae2e4c7dec580db69f370ba43c66e5e322a85c28ec85a6891300a951b16c3d90308d WHIRLPOOL 5aab621fdd8a2b37b44c4ca5169336dc1ceaa6438ca4d1d625c3067792725dfecce708a743aad5096f50c2ad17962403a1384ecfe44fbfe0ca5956660f8dc069
+MISC ChangeLog 4955 SHA256 ef6095f08646945818ef778653f6278694d5b98aa07d8eebd1a99a8db6f26923 SHA512 1ba86dd4e9f1fb1c6b734f53ae24ef9694184c3cbfc3333675518256a746ae6de4f46557d2f1aacdafc0e2f958f095ce6e52c4a6dc826a046d95af9c557f9174 WHIRLPOOL fa0b9b116126873c5c042f01c7588965edc594771da851539e3aee4e19fb0729b6817b67af5bbcaeafe23dfc43001369b15198d06ac0b4ef4226489afe44cfa5
 MISC metadata.xml 391 SHA256 85a52322c0bd2246a77a82d55d1fc8556b07e66f24ff5c7d3cf7f39a91622c3d SHA512 3caaa160e93a0248f58d203cff96b73970d53bbb56f0896604f0722300f30a82d7f3dce26a6ace71209b2baca34f5479b2791bbf9ac7fabf3d241f572a70b215 WHIRLPOOL 5182103d5226b341843b93d6840c12b8d4292ea1928820219f4eebe9ae8df9257269f9aa26b3fbbe09af98ae578290d5d16fd04ed0b0944cba4a23ec89d09fb5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRReaMAAoJELp701BxlEWfHeEP/1WJ7igsbcjQueEZTmil6AmR
-jKggr8cRz9nHBBLeCt4E2obTp1LSPNAwdOGKaI22XiFDXHBwisOV+K/atCe/sygq
-zyOPjxskeJ0gIRMP0UZTuakUWqrphw+5JXFv7C0dLmCqnWok21j0qbY4vAAzgHJR
-KfHFik+Rus9FkHYWtIwsH1gUBnkgsvM4g6bZnejS7OI6+xUrvxLkNwxpFQlU1g4a
-MShE2+ZcA5gvqYm1J2x00+9PRukehvNFOZNTFRIgsYrZm672CCxmwNgG1jJEDtQ8
-PJW4LBlw7AAg4Jex9PkztCoUrT4gR7GCZIEuIkLBYh6dG7mlIg4uPn2EEsXbTsh3
-RGcnakdEgs0+NbAD1SYI7IYEK98DT7khclKkxJMfNGa+NEHYiCK4gF1TiqrXl9tJ
-C+QVItjrw1xKsT7RPdW7I0GL6WbelcQgBOEhwXPmwEo9Tel+MgL56GpN/kdzkX6P
-0SrhHm7txnSyXdxl+0Lw7OXDA2y3EUfu6IWVfwPX6/UIF5mqKcYfwhzZuz+3s5w9
-I0OmUKgSOh9kEr+R2IOmdb6WWhyqrx0V7AzrxJulqeK1bV5K6TLBz/zsryvdY04e
-bf9Wshx+HYRC/6lPlcbhvLFI67G5lDBKRFQc1bqn72D+dUizmmylWbkY++R/e8oa
-+DdIbzlzhL8WFNM3JFrt
-=jTPJ
+iQEcBAEBCAAGBQJSMhLNAAoJEEdUh39IaPFN9kIH/RoUPrgvGN7zCZHEzhQV8YB3
+eGsdeuZl1VsxEHkvT0LSkS0gJh6AMPqJnsMRi15qvh3zx4/6ahfakvCvVONTpcqb
+pCBcIUMHKaQqejDUSQ00oKjsMRY0/qoAMltNWlovADPRYB0ABpeUnrNxGr3zHoP2
+i7XNsDVkAE/xG/8Lm94Puv4P3HXm+bN5bZPZOxp7TlZ2t1jwid4DwjCMzuHPaO9X
+tzbiVO5KtPB1PYVBazYWhn1kA35lQUgzvn48t3WC3Q1YvgDsCjRINtjr9MzgIjPk
+x4zegER7ebTO3edT3+FL4lWFTzRaBeVHEjoMPobLgZ/7oRGF9BpQcuIQ2j4SsTE=
+=A3eS
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/libunwind-1.1.ebuild b/sys-libs/libunwind/libunwind-1.1.ebuild
index 9098f779dcdd..2de35a5195e8 100644
--- a/sys-libs/libunwind/libunwind-1.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.1.ebuild
@@ -1,8 +1,8 @@
 # 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.7 2013/03/17 15:54:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.1.ebuild,v 1.8 2013/09/12 19:15:36 ssuominen Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils
 
@@ -15,6 +15,8 @@ SLOT="7"
 KEYWORDS="amd64 arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame libatomic lzma static-libs"
 
+RESTRICT="test" #461958 -- re-enable tests with >1.1 again for retesting, this is here for #461394
+
 # We just use the header from libatomic.
 RDEPEND="lzma? ( app-arch/xz-utils )"
 DEPEND="${RDEPEND}
@@ -28,6 +30,8 @@ src_prepare() {
 	# These tests like to fail.  bleh.
 	echo 'int main(){return 0;}' > tests/Gtest-dyn1.c
 	echo 'int main(){return 0;}' > tests/Ltest-dyn1.c
+
+	sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure{,.ac} || die #444050
 }
 
 src_configure() {