Fix by Vincent Palatin to use tc-arch-kernel to get at the ARCH value.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 26 insertions, 19 deletions

diff --git a/dev-util/perf/ChangeLog b/dev-util/perf/ChangeLog
index a2f0b9f68dfb..96e0be47c3c9 100644
--- a/dev-util/perf/ChangeLog
+++ b/dev-util/perf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/perf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.25 2013/11/17 06:44:21 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/ChangeLog,v 1.26 2013/12/11 22:36:19 vapier Exp $
+
+  11 Dec 2013; Mike Frysinger <vapier@gentoo.org> perf-3.12.ebuild:
+  Fix by Vincent Palatin to use tc-arch-kernel to get at the ARCH value.
 
 *perf-3.12 (17 Nov 2013)
 
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index d1e746e8cab1..ed4b72809da2 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -5,27 +5,27 @@ DIST linux-3.12.tar.bz2 91111381 SHA256 43129defd9079c99cf5e57506d36b6b01614c734
 DIST linux-3.2.tar.bz2 78147838 SHA256 c881fc2b53cf0da7ca4538aa44623a7de043a41f76fd5d0f51a31f6ed699d463 SHA512 1f57b98e8da34b10f37ce94e0f13a994c111d483b104c27a8f58a4a55013a73a9f1ffcebb597be63ce0dfadb92201e93b0e072ba49bac0033026aceb0840c812 WHIRLPOOL 3dc893bde09f064e4614183964a4b9feaab938ca7a739f46f825818a577884eae815f195b52a4c55c571345de59d7ba09631fb68dac481a0837b24868ce60e3d
 DIST linux-3.4.tar.bz2 80173484 SHA256 a797a15d0b6228381507c14ecf4eec4a6cc5c77cfd521ba3b3e1325e85b5b16d SHA512 597002fa82b70b5052f9e05c1d8547bc5f89d8e1aecfd1765f4033f6d2c5c02d51b6372dbeef12c2eb070ae318a04c39925050cb37a39399961c8b263479fca1 WHIRLPOOL 57e6dd7094db2bc41175d7bb551e8237ea96eacf3710a734e8413915c54304e84ca11455e41c7752882ce81048459555d44d1798bf0775b79c3d74b13aa3a9f2
 DIST linux-3.8.tar.bz2 84623657 SHA256 fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45 SHA512 966a3b08aecc4b135a48ea73ba3326e1710c455e6da29693479e9d1a56663fc10f569e2342fa861486d39d4ea5c2af406d1bd40613c15555acffdba160ef7ba9 WHIRLPOOL a83baa904c78f71fed5e4cf2607b8e6d1db70a4137b5c00b3cc5f60f04042724faa3cfec36a781417d483548ba0c811f559e82146806edacd1c2fe90bd398e64
-EBUILD perf-3.12.ebuild 4773 SHA256 3ce54e4f319f238ac3013c37a2bc93ac3fa0530a4ed86c72bda9392d0ca5244a SHA512 e2dd3545b61f5f90d5661fd5f9067da0956172442fb39bcf81eafedcfed8d02d648a9b0ccfa17afb699b2e863138cc090aaa261b709939605acae944fc3f6df4 WHIRLPOOL df43aed6a3e8c679426be22ede18c98eca92d3560bebf7360da62c41ed7cb80707e8e0d4cf25ac836fcd2d91c699eff452df80c7c3f1fd5c40843ac8cec38583
+EBUILD perf-3.12.ebuild 5088 SHA256 5320db8fce5f1dcb23cbd0e1e142fb6bd616ab5ef91b1bf25bdec5169e210c87 SHA512 8165b48728a9e0a75c1bde5c235d0f07032620689bb4efd4c70d0995e73c0aa48d0024412992abe6a6b37c324ff718c0af4f9faf00a69781490a2e33d3746dc8 WHIRLPOOL a332a5c6ed7f95a2538f6408529b363a41126a1f48749f93c938ada4b3e235cdc4ebb0cd564f42c365f29df6019b5e4b6106605bf9a0004f663deb66818164e7
 EBUILD perf-3.2.ebuild 4228 SHA256 6763a106b3c42da98659903996942a73073bcdbea725c1b0c0d2eb6ce873662e SHA512 2e3ce7a1dae8933b360a58adcb8ff7f5e657729c0ffbe6345e296163e9c63738715851786a8469eb8ee14f8bc7d29d8ecd7b679e730a541942b23d503cdb3872 WHIRLPOOL 263b89d4fba11dffb50227be605a58c4d7d97912050949247a9bc85c6ae2b24250acad27ace23ee8ace8495ed49c423f9aa5811471b3bdc061250b3158198724
 EBUILD perf-3.4.ebuild 4306 SHA256 24e6468c5e72612bf5348a1226ef49f751369b80ffe4203d36ce9118a900aebf SHA512 4f87cf6a0627983c946c76c4e3f9c099fbb1618fa96905cfdd4b4cf7b01f06815c52d70016d98ce58e375320e6921f429638eaf2a76b32b85fc1a848525341f6 WHIRLPOOL 190a9abe22b1b3065785522c24b0183fdbf7be46b58eb8d12b6a35233a88853be4adf38be064856d508de75b22c3e63909e747dd12ded0a93414f62f9446bb8f
 EBUILD perf-3.8-r1.ebuild 4640 SHA256 70eeed7f0c19f9200f97565dd579d229691027e719409b022a269bde556d5611 SHA512 53b406502124e864490c7ed8bbe0f78a393d314c110cf770e81767c8d39424f0c34433c6641fef07d1b211e0811e54e3993a3895ce8eacf9d6bed716f9f63c01 WHIRLPOOL 17f626244abf5494a3bf3a116cf24f136920b0bf616a1f7c6d9bb566f72cba6c42654db3f920512c2cf0f8c9592f654ca151eb9ea85920d09ee4fb976ad90da5
 EBUILD perf-3.8.ebuild 4336 SHA256 84dcb391f30c04d33c18e1e49b6ac4de143278f8510ce2d4eecd8ff41b81657b SHA512 114336b6abdeafba52cc79341e933f85066f3a78cf9b2a472d7ec593c67f06008449a50274cbbe38810fb24637dfd2e9d1bffd28b98ca0774f7a17a9245c8cc2 WHIRLPOOL adcb9a364e137fa7471e2b2aff7a4b01f5c82792536912403ff5309c6d922910abe8abb7957ea4ca634fd5c4b210e5409bc213eef3604d681709df829cf1c4d7
-MISC ChangeLog 4848 SHA256 45e29e9e63571ef47160df7b4709d4242315d8180929162e73ac892bbd3bc5a0 SHA512 5f43e6cef27469201c3196fbf580b10d909c0e6487ad9a1237b4d400edb628c6225b24abd9f3c16b94b41ee37c62f7262bec8c1dcff7eb37cd93b835bda13143 WHIRLPOOL 264ddf5848ae41c935c6d8d4d16da6fe7302971fdd70ba9f0439f01c520d78445d72d456e2f8d9b52848bd33a8602510c1c160ef114f7510d04d86d64bf63707
+MISC ChangeLog 4991 SHA256 327c23c81363adc979f105da18d0aff30be9b89d3d7544c7de0e50e936750133 SHA512 bad567a8cfe76c1dbc60ed153b77106d97eaa029da6b21ee4483f330db57a2e4025da34f83eca8ec1e9dfc22d1c21722fdd0a8948e3cc378e39a1fbf9c48d377 WHIRLPOOL 7d0ef4f85f06431dd1e90c14abe91285ea4fca3dd0c9954ccbeac8703a929e94891eeb60fb5bf2b0f1c29575dd71fb2f74c9c1c332e2375fe1ca910f469b32ce
 MISC metadata.xml 1066 SHA256 660d44c0b3f410b9abe1700887b2f48508a41a236e970aa76a9af106a2272198 SHA512 15aea4d35a8c4578f2ec57a7f23985e995d82fb1bc2a03dd6f5c11a20dedea48c270a9da8eb7a8a1374cff10f5c004a72370a434de03d31ec6b57a451a7e3022 WHIRLPOOL 95f5d6d9d281ade60dc63665c8baf84836372603922c552e7f96f74e3e8ba137aa86f86ff43df6ecd2473d0ab03eb4415de3c7b77308ca98f03f614038956cb8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSiGXGAAoJEDYO1FT4VRUUVKsP/i/RX2+P2Z8Q9XLHlKUmxnuK
-Px05fRTkjQLF2uADilL8+eh1LeNEsBcLYsfbFm3MGEedqCb9g1uJEvGHClZnZFuD
-gLFp0hkBxqqrGQFAsOun4D4u9a3IaM6WTUY71H3yHfLgnOLtCZRhEXpNQGI6Ebsn
-1aroUWQOyTqsUYlC+BkCwHF43yPoELohaZQ1fXTIft7OJ+CKMoD2tmKgLedk9ro7
-tknx4CAAFYAWR9vvIvbT5rcXgMCXgKa1Fml2y4IRqHt2uAJ8e3JLtJmGTgJhpcEq
-UbXtK04LC7JETOQUZTf3KT971NP+8Y7BM/xh9oxwAL8GjwXVNwK/8dUV+RcFUpDM
-uQBJJI+XndAm7p3Td1g+VJEc0m5AQMh/qQcZ1a7OZS+7Q1qtWI3ke8OW+H519/p+
-6dPHI2Ckf8UZmTWUeu1EG3vfmyRv+KaYmtQP0g5FT989U0UPynIaH71vcnyijIhI
-Pl7TYw3ifYG6C0HMp5RJnNUGRThaLyBdhZ+0KklIAWVQpcknw6G5gyq2B1qNsZ0G
-arsCL/bxbbkGjoVKr++SBctSrVhqoyLQXrA+zEg/35mCrBfneKLdH2qrNGIauOax
-OMyKAZ0qgdeEtdca2t2ru4Rjg50eJWSYt3HkoBiG2HWFLKXEB+XayzhoCzpWbVNV
-xShxlDoSVLBFLY/qAa1i
-=fNA/
+iQIcBAEBCAAGBQJSqOjoAAoJELEHsLL7fEFWkDMP/2GoJxW5rh7/AZ6CwWUm3Lfl
+wClJjswNu2zB75+Swem2wV9gjwccy9vX3UcJOxh8TswpyvQshCAYqcyGjOBM0xGm
+3KsR3HGxJ8rkvECw5N29cLamArVbIXB2UM5A/TRJEdT9GUTyFZb7Txe/txwg3RNW
+UzFpswgxqApfFlKurk7kbXx4atNABQQcORk+u/7c0sOIkXWSgLQMzfDAvj3g23H7
+TYNDRP+pFUAZJuUm0oifmp/ltJnjo1vYL1306C8qRbKwSby0jcCF/6DNFagltg6T
+gm4+I/A8pT9K4ds+swfvGQcfFUwzqe+TNe7MexR2JnYeG4T6TCdEn+tUzqq+l0d8
+yae4TYrvCwCEaZr4nnyWWW9rx2CMyKTiNdOeOmzYILQZmLNKPl//Z/utbK3sHjlv
+7HCkePUGi/jwehDOuLLzF6s0TWUeWEFT0ttmbd3h0CUj6ImgsYUxcPxBScDbEFIf
+GAg0ZErgEj+VSiTlkl/fDFz4dp2S1TgrEjdMXbzZ/PYQAFLANeZbH8a9k+xbD0fB
+eJKNsLD2bKgYLW6wSheXgk762Yr1D/rjxcM/d0rKfNQuPVzksKU8ygM76oQQVgsN
+TV5lH7RzJ58zjSSNuUm2a3NdDwxixA29xhttPcZkChNxXhGnYEbg2H7rE1teCHRz
+PCuFoiAm9VVCwb1yUQ7L
+=ZBh4
 -----END PGP SIGNATURE-----
diff --git a/dev-util/perf/perf-3.12.ebuild b/dev-util/perf/perf-3.12.ebuild
index 4d88881cf772..82d561672cc8 100644
--- a/dev-util/perf/perf-3.12.ebuild
+++ b/dev-util/perf/perf-3.12.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-util/perf/perf-3.12.ebuild,v 1.1 2013/11/17 06:44:21 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/perf/perf-3.12.ebuild,v 1.2 2013/12/11 22:36:19 vapier Exp $
 
 EAPI="5"
 
@@ -125,8 +125,12 @@ src_prepare() {
 
 puse() { usex $1 "" no; }
 perf_make() {
-	local arch=$(tc-arch)
-	[[ "${arch}" == "amd64" ]] && arch="x86_64"
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+	local arch=$(KV=2.6.23 tc-arch-kernel)
 	emake -j1 V=1 \
 		CC="$(tc-getCC)" AR="$(tc-getAR)" \
 		prefix="/usr" bindir_relative="sbin" \