Add arm/ppc keywords and mark amd64/x86 stable #497846 by David Hendricks.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 31 insertions, 24 deletions

diff --git a/sys-apps/iotools/ChangeLog b/sys-apps/iotools/ChangeLog
index 6af4335836e7..69b6447c46ac 100644
--- a/sys-apps/iotools/ChangeLog
+++ b/sys-apps/iotools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/iotools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/ChangeLog,v 1.5 2013/04/23 18:31:41 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/ChangeLog,v 1.6 2014/01/13 22:18:48 vapier Exp $
+
+  13 Jan 2014; Mike Frysinger <vapier@gentoo.org> iotools-1.5.ebuild:
+  Add arm/ppc keywords and mark amd64/x86 stable #497846 by David Hendricks.
 
 *iotools-1.5 (23 Apr 2013)
 
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index 8fac70aa4b07..09cf1c38473c 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -6,23 +6,23 @@ AUX iotools-1.4-ldflags.patch 302 SHA256 eb3b884dbbe872849bc1a6f02b72716f07428d7
 DIST iotools-1.4.tar.gz 22217 SHA256 56e7348bb5b91f6b93a9b2759993545575eeb3fa5f9203a9cbb95dad9883807b SHA512 10b5f5c4183fb78900c254359b1d40d681519d4b0a79d10795c44d6f1691d73b93d02ede57cf84b5bac67e6083bc5a0de45c464caccbad8b2127a2c53cd7e94b WHIRLPOOL 808ba3b70c602ff0cdfe38ffcf7c1a3c4ab72cacf977ee8db34049159f20b034b48949f0bd70f1b27436f1183dda5cb677338f80afaf65ba1e1a0ec96a973418
 DIST iotools-1.5.tar.gz 23422 SHA256 3186ba296072f644dda881b78d77e3774b79e8cef3e828fffc947d558b08830d SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44 WHIRLPOOL 52d5aedf0ae4ee3257e19a6868f792e54b6ac9d79c0816c934b714811e4da0bc288a7f597098fd9ff2ed65f11cf486db1e2db76c85c0ecde0a095e09f24b2fbe
 EBUILD iotools-1.4.ebuild 1851 SHA256 3fa2d3668c403c893ef2b14e8133b33a78dae99b3e50da1217a97a8578c284fc SHA512 9bb18ffbe9666b513548fea1cdd06f6c313198b2f98a5022aa3f5b4a3328150725aac12af5b916c9c62c5433b729698cc769c502a19139598ff9a6076447ec0b WHIRLPOOL 3f5480a315eeac3454432c7ba160b9e8dbb4c427dee63c09f287f891d938f8918f15b1ef1506a337b323a6360a0c2ae16f055270e25c17c159e8871103f2f6d0
-EBUILD iotools-1.5.ebuild 1866 SHA256 1afb1eba2f6668a48f027fe86af62143c3da03a675d68179a4e230073a709664 SHA512 a5ca55ac774b93e3a5f264b319f8aa8497061c1740c760ae8656022f45e3ecf2cd12ea0e7e0cf2e53416316c393504c6a0eda37d7c7e8b7c16de094944c91d96 WHIRLPOOL 4d1be132341cfad7bf136c88f1f20f52eb221f62dfc00c08737d248f221f96a46142918953db11f9dc87ebfa3238707f74bdd6d2c350acb5cf4e37f635b4583f
-MISC ChangeLog 963 SHA256 004da179fc0f31f63fb3eb53374572317c39efea5fbcf3e7caf50be3864e91f3 SHA512 0e29df8e047f8ae17ea2adf68eacc0946efe91a19403098c0566f797668b97ba0dc1beb47c97388ab8adc76ade61fac6549c1e84c061c48ffe3e79eaa4e527bd WHIRLPOOL 36eb563d4495292a0c0511ee475f57c661b417d7750be6678eebe3e4b25ebf56f415d0b18141093932835f325a411867fd44f8857172b1231393615229ad61fe
+EBUILD iotools-1.5.ebuild 2004 SHA256 478cb7e5bbb2285130752892bc066b2a932ca80be659f5f228a98bfc8c1920b2 SHA512 e633d16b94c9a968121a300ac51dec63c9ec0a9e426a92c2d6a7658e4237a5749bda946ec5bc040d781f4dfd97eaf5eb2e98754fae9c6ca5af7634a93e0aeb5b WHIRLPOOL c87c29595456cf817be414b65fe14cb509798ec897702c5536bf1acdee59d5733885da154106423df560e55eaf46351089c33cdb79f99f933306d11787502fb6
+MISC ChangeLog 1111 SHA256 e63eb9603110449da07fe62a431245fec3fa980ae6e6c0fe77e6630a562fde2b SHA512 78b71632a52dfb58dfb3648e2447f16a6bd6a9c324c2b53c374d03132b523855d964a632fb5c13cf733a063c0fbdc2e3d637b9525a76f81959cde6c49a6a2878 WHIRLPOOL 5afbe8df76e397549cdcea64ca21b8a11fa9a68d69e54cf6a414e4dbcf4182f2efc666897ea6c115c6f011deaea3725172261835cec8fbac0cc98605e97ffa71
 MISC metadata.xml 330 SHA256 8b09954bdf3c58145c3db190012a5c0de10115c6cc925a617c255edad71ec339 SHA512 35601f65ee9fb4bb56dcdca9c9390cbcf659a54404d039519432691ec594c91a16ed11f78309b0169b3805a55775a947ef8cedb14c258026fed14da6033d2361 WHIRLPOOL 593ef468ed0cb8b99cfe8b9345a3dfd3d0f67e23d2c63987f52c2f204b1c5bc778f34cae86ccd82ee28ebca2d5b4e51f15ae4904f61a2f23a4785497da3f7e45
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRdtORAAoJELEHsLL7fEFWArsP/RRavmI1RB02m/eaFxfurlVJ
-vTuZVUkD4VgchhxYLSXdb5hH7HXOw0q+AMbUkGEMkiNROQirS8ExHICh/EmJxYjo
-NdLCzwkRuWy0Ph6r/pmhfPFnHup1BltL3HoMXXO8vO4NWuvLiYUz7NiM59R9WZAP
-DUGO9F/S3+lnzB/t1LTKiLfnwfjhxCT+bY6zBeJqycLOmHA7S6qFy7pkfPqZqTsa
-AmpPYOlIw0TPU3iKyMVeMOLEX62ZsVWI9Ed8HeM0d72NiK3k77mV7gKE1HDuTOsv
-TacU74FCcIiSw+wWAdeDqR62ia7P8ZYdrVI8oA+EvZ0eDmTqFrTeA7vTPemb/uyK
-yNont46W8S9ZUPk/cXQ6IbNhRIzB6Ws9vDrwrFAgKEUisrc9GhcLHLNUknfM3fNj
-JQkaSbPwggHCnL1JNGEeuUoyZSVl/DkBVFiUYvDNIDnQs2ccMRnAn50W2tmfvbJX
-g4nXNW6lxiZjvcRqD7tz2qTabuYhwkTY4UtlcgmQaBIT0MKo62ab+tv2l2xlcCRC
-vWY9VtEWoalqRecUtGn7VGuIUzz2xNcKl1aUEHozpjxgybJ27Riv+2hopb81bQep
-+DLdya7U2Zptc/66k3NUpg6/fVQpi26cXpFILXHeKpIOJOl2YfUCuOFkYBEUlrzR
-liBtNguD+hqET7P7meKK
-=DfbF
+iQIcBAEBCAAGBQJS1GZNAAoJEPGu1DbS6WIArm4P/0asB8G+PqdPISiNujDMObUi
+poBDAeQ/sXz+ykIXJzMUemax3sRY9ImuMfF68jyTeIFCO+IzJVNabRmjZJZlK/Xh
+Io8JDAjfQiqVBjA+UmvVNI9krM0j/AT+Qp8hiVLC2DM1kPT/V/JPyaQxvfEVXz/A
+2FqewL4qmmHhAFOuSmnn4WaJrL8OX1wjUDP187zl4lSn4wzOrmgkKk0pCFb54cBh
+12XVLSJJG/KNwXtCk2o8N2XQFitl/HVmKu/zRvGFxKbC8VEUHM1CoxAphFR7lJWk
+cVryHt/fWus5wbac4HKTGcIWX4g3TccPohiNQPNBXAbBz+n0zl42q87+YYpM6325
+VgzKv5XdQK7BUaYkMTVmOYGlR4ehUbNzQYFe+OBsOiVMPl/ePH75OOTQOm9K2dEU
+C6r+qkqc6yUKLyAuKm3y4bp0WCm4at0H7T6ktDHRGKpc4EqljTm4m/0b6QNWhd6p
+niZOfrWYVyRnyYDf57wC6tBfnGjDvJNkN2qcknpoa1ak5SysnNR3RDINr2jzRAOo
+H0cZDeGnWe9hh4iJisCTS8IQ12zuc1+ExoVN/3ImpksPLJDYX/fDP144aZMHeJ4g
+q2uJ9vJ87qFoDD51Db2nzA+UkSKaSC4OQbtw7Rxwl8MTXpe8FQeK/LpQwVZkTa20
+DaF0BgLf4awOqpnWwgQS
+=oeEQ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iotools/iotools-1.5.ebuild b/sys-apps/iotools/iotools-1.5.ebuild
index bab503af02d8..eeba0b6a86a0 100644
--- a/sys-apps/iotools/iotools-1.5.ebuild
+++ b/sys-apps/iotools/iotools-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/iotools-1.5.ebuild,v 1.1 2013/04/23 18:31:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/iotools-1.5.ebuild,v 1.2 2014/01/13 22:18:48 vapier Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://iotools.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="static make-symlinks"
 
 src_prepare() {
@@ -31,11 +31,15 @@ src_install() {
 
 	# Note: This is done manually because invoking the iotools binary
 	# when cross-compiling will likely fail.
-	local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock wrmsr xor"
+	local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock xor"
+	case ${ARCH} in
+	amd64|x86) known_cmds+=" cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 rdmsr rdtsc wrmsr";;
+	esac
 	if ! tc-is-cross-compiler ; then
+		local sorted_cmds=$(echo $(printf '%s\n' ${known_cmds} | LC_ALL=C sort))
 		local check_cmds=$(echo $(./iotools --list-cmds 2>/dev/null | grep '^  ' | LC_ALL=C sort))
-		if [[ ${known_cmds} != "${check_cmds:-${known_cmds}}" ]] ; then
-			eerror "known_cmds = ${known_cmds}"
+		if [[ ${sorted_cmds} != "${check_cmds:-${sorted_cmds}}" ]] ; then
+			eerror "known_cmds = ${sorted_cmds}"
 			eerror "check_cmds = ${check_cmds}"
 			die "need to update known_cmds cache in the ebuild"
 		fi