Simplify initial checks.

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

4 files changed, 28 insertions, 36 deletions

diff --git a/app-emulation/qemu/ChangeLog b/app-emulation/qemu/ChangeLog
index be267b552159..16836ccddb57 100644
--- a/app-emulation/qemu/ChangeLog
+++ b/app-emulation/qemu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/qemu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.185 2013/02/17 21:54:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.186 2013/02/17 22:05:22 vapier Exp $
+
+  17 Feb 2013; Mike Frysinger <vapier@gentoo.org> files/qemu-binfmt.initd,
+  files/qemu-binfmt.initd-r1:
+  Simplify initial checks.
 
   17 Feb 2013; Mike Frysinger <vapier@gentoo.org> files/qemu-binfmt.initd,
   files/qemu-binfmt.initd-r1:
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 66915ba58048..e6f32a3daa4f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -4,8 +4,8 @@ Hash: SHA256
 AUX 65-kvm.rules 40 SHA256 c16a8dc7855880b2651f1a3ff488ecc54d4ac1036c71fffd5007021d8d18a7c5 SHA512 98aad2a2f212a7ac0ee5b60a9c92744fa462bce5f26594845c7a31d692aaaca2d52cb57bdbede7dfc60b9862c2a6510665dbb03215d5cf76e62516a283decdd6 WHIRLPOOL 937de93a23930f6b8533f0c3e0dd249c99ddf7d54446dea857607266ac0a4b435c5b4a52b2986b138bace9c0a7ade66f94116b38e2bc4767ead54bd11baf0920
 AUX qemu-1.2.0-cflags.patch 359 SHA256 8917142633d32497d63dd2f2934e17d86a2e2ab11be2c8551e7218c9251b66a1 SHA512 f60ecc9a0e6969436a77444193cdba4f3028db683de0963870cbac5bf3a1b47da815926236f127a5f56333efc21efc52eb732cfce6393b764bfa1b9f569df645 WHIRLPOOL e0b3b8e1e68a3b42ce7727f7fa2029dd382fe9c8f7260c29e52368a1cd3b29efcfc134cf9908b3590ed6fe57c785bd05bf676e61736dc321a7a4899dd8b0a861
 AUX qemu-9999-cflags.patch 347 SHA256 fe3bcbe83e81225b2c722578a0a976fcb724419d5208bbd6d02fb543e80b7e12 SHA512 e1b8be744170d61a2155b23a8394db01f8af6dc70ec033e71b2ff46f72975704836d42b96d7904e5d462289c5f8f24317f2fb28698f18a77ab1de02829e585eb WHIRLPOOL 2d972c7e40292f424fd37a4c1af04d2be095c215211ec2e1d15d8457df553342ffc02a7d39985f817fbbf5342e422d30e439c35a925341cf9b852ca7ff15a308
-AUX qemu-binfmt.initd 7465 SHA256 9c3f139f568e785b0aa31f7f12e207d219cc2ba547ac0336df0f7a16271ebce0 SHA512 c7f3048aa78e2e0b4636bbc027963c6c0ba9b2051dd173d907753280b419641b3ec458a94de910156552e46910a59854c03bbb51a9d079db4194a39907e21923 WHIRLPOOL 44069aa2324801539c7f6d8625c6525692c41ac34e30c309a3e898f01387ac7d9d05167c609036dc13625337cc1a65a48e3ed27cbeb2fbaac7ca36d5c774d87c
-AUX qemu-binfmt.initd-r1 7132 SHA256 cdc5d4a717fa1d042d4021a1488bbde1c59fdd339b9ba4a87f2f43340df96b98 SHA512 04fd069fd337af8b946e8f4ccfaf995178fb6d1376307e3ba5b850007c53412ce062d7b8a61257ced64ea475432f959e74c39a350a6b73cb3229daad43c2c52b WHIRLPOOL 8ddacef46d01c475fd1dc5a4ec75efb1b61b1888726b21281ff1b8e49d28fe02a20ab3bcd8df39cf0e273d6515695510051886bf7e08c25dc685b7b18bcbdc95
+AUX qemu-binfmt.initd 7397 SHA256 78cd12a7c683bcf8894469978fccb6d7ff2d052fbd877822b06b501c45681e26 SHA512 8746db0319f6d93c07f2b9c656cfeb6360040531d87fa1b2d697bf1725617e1901bcb0b46f8b3fb191fff2b504fc2eb848bbc86c5a21a68b7c249743714e2a19 WHIRLPOOL 43fa39809c9facabdf77aeefc24d38ddc86f7f9c623f510f9fcc463c777f40b8ec59b7ebebb665aea2bcf9eebdb5adc2aa049f92026998fe6cb428406e99d8fa
+AUX qemu-binfmt.initd-r1 7023 SHA256 3572c110c6f217754e638796400a5901910a2e61b8818c8569f8258b103ebcc6 SHA512 773af64fef164c00945acf5881e64a10141aa8fdc85491e57bf8dcc7c800a4f81879527998a0896a42f921edcbf5f741beb31ac2a82e45cba506c7b8461733c8 WHIRLPOOL 30382fe347248683e989c2b7fbd804ce26173b313746d80467029b2ad3594f414628f7537120b168a0e700c424d3525528eb632b07e16544c2fd07f418f3187c
 AUX qemu-kvm 60 SHA256 ded08eb1c74a9581912a9ca7876de6f33d1c545ed2a7d275f9b1749539feb7ee SHA512 d973d70ffeb7f4cdc61b25a30bf7174ac05b8c136234478782367a16668ff617756e9862a9cd94acd4b6636fda36410762e069a2eccca99410aa6e3b4294e363 WHIRLPOOL 41937bf752a2f643085fbd04643fb7a5cb898fabe8625d80b730c9e930f48f8d63245d5acdffbe31ecede1e1eb83fd3a73aad925f020e5c016f1b6559e7426d3
 DIST qemu-1.3.0.tar.bz2 10286423 SHA256 878055ec05bc28fecfe2da97eb8bc992e8635575b67cebdfc5ca1ede171140a8 SHA512 2b314590363697140c3f7b3c445a40782f34c3d8911ded66e15ddd4470c7f38d0035fa09b6e6d99122f209495b62111809ce2eb4fc308fc120b9c598d18c2bc7 WHIRLPOOL 4b312b1f32e7fddec642bf1835d9610f3567aed7c4507cb036e86fb440e98b9d4160ff97755a0f9e0a4105e2126c8bb4745c411ede5addb9a3cd00d2fe9b812e
 DIST qemu-1.3.1.tar.bz2 10283677 SHA256 3772e7ef0c9b4178195edcf90e711f12ba123f465fcf09fb43b56bdacaca0eaf SHA512 f371012d0c1fd5c2504ba4235ed787d897ff7b4dcf5bffc4452dd71b33394db4ec46488771927be2fc410408f69ca2c38d1edf23fca1e6767295c416ce98c588 WHIRLPOOL fb440dffca62c48a2644592ecdcd352349852fa67e5aa1c8cec45c86e599ef74cccc3a0464977cefebf311fea98a65e9035b5f87fa0dcdf87034b8a71d675627
@@ -25,22 +25,22 @@ EBUILD qemu-1.3.0.ebuild 13711 SHA256 bda7012b27a54fc2cc0d0bb800a9192226237ab0fd
 EBUILD qemu-1.3.1.ebuild 14978 SHA256 e2e24c04443a2358b8c3ca6c9b02ad1db034423a7c08017c21d533c0298dc3d1 SHA512 90d7827fa5dd4ab96edf6c878cef7276bc9931cdca6c02d96d038f338c8f029d77c2323e67bce13b5d428af840d5d79d18071cbc49c00a52af723c7debbc1cfa WHIRLPOOL a6cbfb4fa295aa27c952c3ac1888263ccd99a2328266cb5f5977e6236f71cb3ed65e4b38cfd15035f61c434cb9d88b269ba6124dadf31d11823fdb15a521b940
 EBUILD qemu-1.4.0.ebuild 14938 SHA256 28351db690475a562335643fe40c52c7fe864f25bd9f7bf74b7a7a6e65281da5 SHA512 754dc19ad0e9d5adb4ec11ec806bb6f47bdeeb7926dbd49529a9580b852c16ae8fb85d9cbf5c075791fd7f512e9d43df797a50fea33f02ba6ac8da6106024ece WHIRLPOOL 2c0104353b11cf1d11725010a88817761a52180df3afa5f8b4fddc0b8efa78956b06c9035fce6d67e2167ec8f25791cf915c1c9e55a33d7422c25f316756a47a
 EBUILD qemu-9999.ebuild 13648 SHA256 a694e912dcdb513b833fe629dd836580fdc541b26484d9f33a9da1ede74c86e4 SHA512 f5209038cfd83041bb0479a4c4a80df15e22f321d9ff7f9f543b2bb4b7cf42660fabed8d32cc455aaf3bcaa51fede305ceac933b8489ce7768370e9b560ac1cf WHIRLPOOL 34acbaef26fd45051d37b67767a4b5a686e299c82b005aef0cf542c42efdf54b29cb02b7ff987f7de9ee702eeb3ba4bac4a89d7bcda4b3ab53ca9ace7f9d9e02
-MISC ChangeLog 30235 SHA256 f6cd6dd227e1baab7f638ce4b83733faeda0c4c422c48884c83b73fb66f155f3 SHA512 9de6dccb033f8c2a7348d9480254d0757b1c087861df951ef7b1492b4bac55b4b1dd4e3bd4e94b5dfa81027616550aec316d6e2e11d65cf5c79a9491d30ffce9 WHIRLPOOL 22be0feb6362f54e50a585dec79ea21a96798a70e4c4bb9daba0d2f5b6754bd47f135314b15bbd231cd405ddaa2c2e36ad9817e50a6f268f7c04da518e216558
+MISC ChangeLog 30368 SHA256 5a7dd2b3c239a4cbb8336495cbf5ce9d136962fd492d59e47b9d122424695de1 SHA512 16e82ba38f1c850fb7691b130ee868cbdee1820d5f563bd6d4446da13693396d486b4532bd1414a5d0e78873d5eb67277b9be84ebce122368016058fb6f7e5ae WHIRLPOOL 9e8c927d3f23b9221d2524e05175eb5d9269f7dfb6262d9646c642a583b1667af7af033c4cadbc2b23e500b1b6312a79cbc7a2de244948c5b465a06f71ffa39f
 MISC metadata.xml 2969 SHA256 9495aaec1c617cecbd822c10da0e53e7c9a17bab2e68c1c66e134f47bcd7c0ce SHA512 bf03f0e60734551dfe32909a7aea4737d08488e7452ad2e0426f3150573459adc6324809bf797a6943030e567672172a9cd7b32be50e5d246cf33046bea66e9c WHIRLPOOL 987c938ab4d5bb54e0af0ef13d295ac3c0004ebba8b2e1f8a7116d38b5db9590bbfef4bd1154e9e5e7a1f91ae2b816e4c572885d90910975df191c77d56ebaec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRIVG9AAoJELEHsLL7fEFWNZMQAMdBTnJnwVmJ4DaVDsKl7jrL
-PM0rJr43w6rZJwnl9WUC6MbYVUJcb5xH/q8CnyK3brsb3/LjaCKVKNVdtlsADpiA
-fArSOjDodBF5QO//L03DqjbSDhlhLUzGQPa/o8LtNAxwgy9OUKsV3HOlPRXyMUDe
-MvJJkl+ftApcE0Q43Hgoykg0+vsVgFrEbR/fPjs2Zi3BUIyULhOqF8C4EPuuirOr
-GJHDrgCOxv58ph2oZByjgOtK+5q88h0lcd8qQ0cLtfwHofs8ydc7pqHP0QOSXgi0
-Ntj7rFd/R7oUhpDbAQXhIjpSNE+JISj8DymCmWVUnu2UiImnY2j8Y7Jqmkal5dBO
-T6Vnz1JHoAaiKdqIdyH0KIrsh2GDdU63fPi7ixrv/brT092uzdeCZX+e0KHt550R
-JCC+qy4SPmzC29YWTfHznjBZ5PUs1nPQ2XIvijuehuSN1u9099vOWqG8NREDJxVH
-0j/nM8NbU/9ERX6xrt9TYUja+ij2WnE7vgcSSLcY3G6UQC/IjhGJaV/B9LXk4/S3
-iLdKL1nFvHfNk1NNV1artek+7Ljy44g/JCcSFcvwRjxeiKOSyHwd8qlQf4CJ6aci
-AR6nfUYycoBRZkrKTvq4XwxbzW2aSneKjT/EbWGO+c5xohDP9ONh1xJdjYL3FhYF
-WQA8hkUQllHSyP2lpDZV
-=oZZQ
+iQIcBAEBCAAGBQJRIVQ0AAoJELEHsLL7fEFWoRQP/14kLMQBWLSnK889eCRdTb9h
+dpwdrcz0oNCaHkK+l9uOc1EUyhaB/LyiB9abS6ZacwkZxA6B7KSEACwcAVL5uAWU
+yKIcHM3CL/iZ5hrNa6fmI1dVJtXgx2w9E0/1B+KD3horxsUj+YRWf42u9PjUoqYG
+QxIQToBkAytdOW5+hqwfz27SOsDZEVUVvGOJi32wY4ArWFaZundIvDC1X98d5iBC
+/DYRy6Wk6WTbNyFMKfdME1RAOyJ6CDhSpATd3YP2bs6qKG47RVYZdvjYyegohjLE
+B07Xg+dVklKzlCLZ9ViRBSAVOBJwPRdW4kQivsLAj5hSHDJu6es9AzADGxoxg9bd
+RhIZV3m2m+6kC/tsK05hjR72RnJnD26A5d4vFUc8xnGWPqzrR9RfRR93n0w/a+D7
+A3GjPW/UPujXfS2kmoz2wOdATI+ZINYgUSR6fo+1MUIxZz3wN4MZA7Y6Z0q+XFT9
+M/6ujbqmiiKB9pKRgAWktsD/RWnCKJ4TQIOhaLthIJrcewuJUxZ1C5cgsUUa9YU7
+H8YSP1WMZcfCgZBfCs2Dco0yMcdHIvzToOwdO1Udv9aRTnKudaQTqLk1KtzoKngD
+HrzdrZlC89an+1URFs5MQyUKPKBltWQ8DdiDD9lItO3aQ92xz4EVtXG/cDnciLEp
+tP10JdA/C0e6ddbAfwK6
+=Mi8x
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/qemu/files/qemu-binfmt.initd b/app-emulation/qemu/files/qemu-binfmt.initd
index 7faef2733aa9..b8824bc0288f 100644
--- a/app-emulation/qemu/files/qemu-binfmt.initd
+++ b/app-emulation/qemu/files/qemu-binfmt.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd,v 1.2 2013/02/17 21:54:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd,v 1.3 2013/02/17 22:05:22 vapier Exp $
 
 # enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel
 
@@ -13,17 +13,12 @@ start() {
    ebegin "Registering qemu-user binaries"
 
    if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
-      eerror "You need support for \"misc binaries\" in your kernel!"
-      eend 1
+      eend $? "You need support for 'misc binaries' in your kernel!" || return
    fi
 
    if [ $(mount | grep -c binfmt_misc) -eq 0 ] ; then
       mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1
-      local result=$?
-
-      if [ $result -ne 0 ] ; then
-         eend $result
-      fi
+      eend $? || return
    fi
 
    # probe cpu type
diff --git a/app-emulation/qemu/files/qemu-binfmt.initd-r1 b/app-emulation/qemu/files/qemu-binfmt.initd-r1
index 53c7ca00234e..4b1dba512f63 100644
--- a/app-emulation/qemu/files/qemu-binfmt.initd-r1
+++ b/app-emulation/qemu/files/qemu-binfmt.initd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.2 2013/02/17 21:54:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/files/qemu-binfmt.initd-r1,v 1.3 2013/02/17 22:05:22 vapier Exp $
 
 # enable automatic i386/ARM/M68K/MIPS/SPARC/PPC/s390 program execution by the kernel
 
@@ -13,23 +13,16 @@ start() {
    ebegin "Registering qemu-user binaries"
 
    if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
-      /sbin/modprobe binfmt_misc   
+      modprobe -q binfmt_misc
    fi
 
    if [ ! -d /proc/sys/fs/binfmt_misc ] ; then
-       eerror "You need \"binfmt_misc\" support in your kernel."
-       eend 1
-       return 1
+       eend $? "You need support for 'misc binaries' in your kernel!" || return
    fi
 
    if [ ! -f /proc/sys/fs/binfmt_misc/register ] ; then
       mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc >/dev/null 2>&1
-      local result=$?
-
-      if [ $result -ne 0 ] ; then
-         eend $result
-         return $result
-      fi
+      eend $? || return
    fi
 
    # probe cpu type