Version bump, also fix bug #484452 (AR) and bug #421531 (checking kernel config).

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 113 insertions, 37 deletions

diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 17265066ff1d..205d6c396668 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/keyutils
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.35 2012/07/01 18:21:34 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.36 2014/01/04 23:30:45 robbat2 Exp $
+
+*keyutils-1.5.8 (04 Jan 2014)
+
+  04 Jan 2014; Robin H. Johnson <robbat2@gentoo.org> +keyutils-1.5.8.ebuild,
+  keyutils-1.5.5.ebuild:
+  Version bump, also fix bug #484452 (AR) and bug #421531 (checking kernel
+  config).
 
   01 Jul 2012; Raúl Porcel <armin76@gentoo.org> keyutils-1.5.5.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #417445
@@ -134,4 +141,3 @@
   15 Dec 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
   +keyutils-1.0.ebuild:
   Initial commit. Ebuild by Robin H. Johnson <robbat2@gentoo.org>.
-
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 96785a49d94e..d3453503ba0b 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,30 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX keyutils-1.2-makefile-fixup.patch 1059 RMD160 9216207704fbe7cb91bbb1e2e64628be6bef70b7 SHA1 3256837557e6f4ba806e6705562c8ab5ffab72c2 SHA256 77e27c53659c6f26e681cf471a662275ef6b97ed02950ffc6365b3955e2b0beb
-AUX keyutils-1.5.3-makefile-fixup.patch 1512 RMD160 7ef9b27fcee69fd29c9f788a2ab551fadd29fdd2 SHA1 ed0c56e9a1dce1445430ef2637f40e216f07b226 SHA256 add2a6d8bcdbe562bb977e97c37759a4af7e19a3b8c2562b18937ab7deee6286
-AUX keyutils-1.5.5-makefile-fixup.patch 879 RMD160 5143d1407b9571917325d226915933adef820853 SHA1 bb08e23ba08b9cd3a21393bdd83024b3ecebaa4d SHA256 b68e7fab7293c680e5f44f3b116622b2d7dba2039e849ec53ab577c4e12f3a5b
-DIST keyutils-1.0.tar.bz2 32410 RMD160 44bda073e6d0cbc363c8dabd622f5b39a644cf6a SHA1 753316779bf8bd6661213250ac841fcb19dcf7b9 SHA256 dc9182bb1d0f7874c153ae4eafbb301730fa1635384b93f3a1cd723f8d73fe8f
-DIST keyutils-1.1.tar.bz2 39206 RMD160 7fad7364ef59b4933ce108317abd606fb727c592 SHA1 e3e523e42d7cedb39d57e5f9a7315b30cf7d9d96 SHA256 a67456986bbdce8872d75f3d537ea2a398ddae412a2a0bf8b9fa62bdd2ade002
-DIST keyutils-1.2.tar.bz2 37935 RMD160 ae624bf2d34bc965546ed1828e2e4fe5095c12fb SHA1 3d92a95fb2015835b883a5477e00ab87d339c92d SHA256 306d9b2f8f3ca68805e695b90ae7e316da59cbe1410a605f6686ab95d9219b3d
-DIST keyutils-1.4.tar.bz2 39016 RMD160 40fdaa2ea95fa97e477ddbebe8597857b380e3fd SHA1 4468485f00238232f53229d66b13bdd63cb3eb0f SHA256 c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6
-DIST keyutils-1.5.3.tar.bz2 48763 RMD160 07886846c9b3b0cb1d3a0dd89ecaea478b0aaa48 SHA1 622f1f6405a8aa99aa2a3ce7e87045794eeaa11e SHA256 f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55
-DIST keyutils-1.5.5.tar.bz2 63397 RMD160 288c22bbcb9bc435e2f7a668fb01dc905ce20b51 SHA1 7980abb6de5c13c8d56d989ed000a99470a2c9ce SHA256 8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5
-EBUILD keyutils-1.0.ebuild 590 RMD160 640e66940784feca8dd7322da105c81c655c1e5f SHA1 17531d7c63db938f94b9dc290a5074499ed10874 SHA256 ed08914143dc19e4781b4f584d2e6ed5eadb35ac293bc208f2db101deefe617d
-EBUILD keyutils-1.1.ebuild 696 RMD160 96aeee0de7c14624b4202633d2420f5af38c8d49 SHA1 f575ed27fa2afa92d3b9c7ee957f48a908bb648f SHA256 dd12f6ddb917aabdffed634caf7cf213742c22d6bf3d653320b85a80089b6832
-EBUILD keyutils-1.2-r1.ebuild 846 RMD160 19e3f9a880062b8ffa28955f02364c31d7662331 SHA1 68d64c6cf6ba68ea703c85da1f56ed297b56f2de SHA256 bf7a9b2dfd37133baf84499eeb422be78a5b9f64367a7c88a02f057353e982b4
-EBUILD keyutils-1.2-r2.ebuild 1010 RMD160 029c14b34f1f189243cf0d7e50578ba6630cb423 SHA1 fcd8b5dea9a0931c264f5579cde6479baa8b98ab SHA256 5a420f6382e24b74a7e256dead6a746046d6048793852f4b1d36926af5fbcdd4
-EBUILD keyutils-1.2.ebuild 774 RMD160 a55660d2c999c78336cf466e5a2dd879e7ae6caf SHA1 e7a072e20cf51830bb918807d4c23e6942d2713f SHA256 8c1311e587f9b32576fda8665572118289e3e0fd56190f915752318e7f740c41
-EBUILD keyutils-1.4-r1.ebuild 1106 RMD160 7de77375becc4454efedc872fccb67a05e7ba82d SHA1 dd254dd30332272dd5f78a7b51c6b499033d4502 SHA256 452acb493387e2372c5d1cc838923800620a7bad802e437b55fc2629173c46e3
-EBUILD keyutils-1.4.ebuild 1026 RMD160 8f7b66a04ff5cf8d2faaee91782bea55948244e6 SHA1 65e9e8c6a3caa0b15037e6dd1547ec5f9142c820 SHA256 9b26b4848484f8c5d16241e5d2f822356c6b0765ce0da4e3677b651b71eedd95
-EBUILD keyutils-1.5.3.ebuild 1090 RMD160 58de3a6d742904ce5a6ce468120cb7234293dc3e SHA1 23c89c7eabb2d342becb312bda22cdb3af1e06f7 SHA256 a8b4715ed752d0fe311820454f28f5d16d3a82667cc0906a0e859c1a4ee0a57d
-EBUILD keyutils-1.5.5.ebuild 1836 RMD160 bf3e4c2200c82f6f856c2e04f893e66e8c4aadeb SHA1 bfdfb3c89e249dd96230789419e474b6b9248fa6 SHA256 0fc7a94ed91fbd0da9a6f5b5f4859ec031b8e7512a55bf9a806ff865eb794f46
-MISC ChangeLog 4735 RMD160 4df756064be1ba0b6e006612c6419dec27cea23f SHA1 e2106bd7f81839c971147f22617cdb3f37aa7dac SHA256 71988542dba04e2532225eb7dac262254f4da615b76df81ad2c93972a83f7c09
-MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk/wlTUACgkQuQc30/atMkA4qACcDV204GhvmahcmGEJ4eOCIkyM
-BGAAnjKxcspLJ9qau3JD94fy8j+oWHnr
-=v27L
------END PGP SIGNATURE-----
+AUX keyutils-1.2-makefile-fixup.patch 1059 SHA256 77e27c53659c6f26e681cf471a662275ef6b97ed02950ffc6365b3955e2b0beb SHA512 45f665dea0e8f80c5a29f2a7856aec38a0a4fc1854cc9879f2e864f158cefdfcda352afe2307fab8fb843b2d292fa0631b105b58dc6b367ae18012de21376369 WHIRLPOOL 774b44e90386d88d7de9edb050f489f1e9c206a0a15c76682419c0076849e0451725bdc5a7287c873365bd16eb79f02a79a231b5d48c25adbc116bf02464a820
+AUX keyutils-1.5.3-makefile-fixup.patch 1512 SHA256 add2a6d8bcdbe562bb977e97c37759a4af7e19a3b8c2562b18937ab7deee6286 SHA512 abdfbc8817d1660570743eee790298c4d1072a8708d131cbf2fb2f6dfe12583733261415ed448c32c17f23e6af364c21c94c0525e6861cf1bd9126f74e8a4535 WHIRLPOOL 6756a2ee0707245343e5d6e684b54cea0f44731990fa09cddec9e6b2311e02c3f325570f76784dbb696c54a1b59528edd37f20733c522b2500b52b115fdbc1e5
+AUX keyutils-1.5.5-makefile-fixup.patch 879 SHA256 b68e7fab7293c680e5f44f3b116622b2d7dba2039e849ec53ab577c4e12f3a5b SHA512 d3628be5cd759fd59e3fb07897db2f23615cc4b2b12d537438c4c186e5588d8d7c22438fdb26003be29ace4910db24a889d4e35550b74a91958a4fcb4bc654c0 WHIRLPOOL 69a9ec2b8386e39c6c133395b96b7a50cc12e1a4644ce06198f4a77431b685e0e962938b97c7a757074beae8794ceafc9f36cf270064b855f91db0c91475ba1e
+DIST keyutils-1.0.tar.bz2 32410 SHA256 dc9182bb1d0f7874c153ae4eafbb301730fa1635384b93f3a1cd723f8d73fe8f SHA512 964add1020863f8c19d2434acbb18406bc48fe3352e1ec3aedde99d4f6c0f1f726e04c459e11c45af92624ccf31d1e585cc10f017f0f3dc6134b9a0dfbb46d6e WHIRLPOOL 2810008293e602c482b3fa28eeddbb5b70737a578b52ab536f87ac14385b06c49bb59b96d580fc80c03ddfdcef7483549bd41af8c4bfd7cf5739933e502d39ca
+DIST keyutils-1.1.tar.bz2 39206 SHA256 a67456986bbdce8872d75f3d537ea2a398ddae412a2a0bf8b9fa62bdd2ade002 SHA512 dff6f2ea17f0467df6ce29a1dcbab2f4ae2c8cd3b7b0593eaf5212c2905a1e6e15ee79e20398d7334879b7a4d662728106b0a22626b2ea54700e07cda380cdbe WHIRLPOOL ef0198c7c05c445727dde5e75ff0f02e8b2f9497bb704a451ebcfdf15dc7d9e0effb373a08ba05547adb30eafb5b3c820d6df7b6d907fd9e0c3dfd6d5f580503
+DIST keyutils-1.2.tar.bz2 37935 SHA256 306d9b2f8f3ca68805e695b90ae7e316da59cbe1410a605f6686ab95d9219b3d SHA512 3cd35ac7399735cf5e32d92aed1f53f6e37dca8dcc9b4382ac105b888feabe89b67b52cd8ffae4401185cb8afb2cb6ec821042c9d8c62a4a8e1333474600cb70 WHIRLPOOL 2ef785dbcb99c2fcc76bbf3b832ffdcc2e100eb251b84c4b5965ed82a2add30e23a465274bffcc9faeccce1823c159799e1ae7f2ac1310ee7ccb0008e338f5b7
+DIST keyutils-1.4.tar.bz2 39016 SHA256 c3b143bbed5b242dab8bc733e494dbc37a132a5a64b7c658f2332f2cd4843ec6 SHA512 d99de7b199f43be1cafa46c988cec484104c68492d32ee6440f073206e4a1b01b80101a4849370847525957e9f72ce584d581a521fd7cde2756a167b95a03346 WHIRLPOOL 5d40be89a8927164c18417c75bafe9105840d3c2be2f22a53210a7549fbad5257933b0019a076d522f09d60627da574c3206c5475d40f99c011404aebce8a2ca
+DIST keyutils-1.5.3.tar.bz2 48763 SHA256 f99866cf0f65c97042c273dd9d8703ce230387619f56ef3ef87b481833ca5e55 SHA512 cd4958b7c21eab62ad801dcecc463adc5a8383ff4b42bdba7a3379e416f2715c05fcfaced9b321adcdd8ec007b4fb29e6e0fce7f11d90247b0d27d06d1710b02 WHIRLPOOL 10b475053f278f0c141aa6d7e98b501bb83a23b71ab8e34fe14ba7cd2f3e4e527541d1ab720a35489329eed81a3dcd1886b9795f1631008a337d94715c98e642
+DIST keyutils-1.5.5.tar.bz2 63397 SHA256 8fab781fb2d1450b2112a7fbfe6629522ae5a6b901f875a74a201012025a3fc5 SHA512 372a4881ca5cd679de0e6baa4e0e8c61ec8163b9259b018e1eb4db51fca68c0326d82a745abce96d22de367e88c88fa13b8afe438acfb38af799893630d3ba75 WHIRLPOOL 15c03983e18471b97e10f378d97c6e7e9ac7045c1f4721382f500cd8796f4a55575420b515b870ef94714bfb3dc62cb954e66efb2835fcb671c98d2f9ab33ae9
+DIST keyutils-1.5.8.tar.bz2 64880 SHA256 6c7da37272eb39abc2ebafc9ba4a580d7cf8725b61e1db21e508de7ab24b819c SHA512 f69b1acd3bff2a821ce31c6a772eea68dfbe57bb1d6128fa344ab9688c9110733b1432176e42b67648ff3a01200f4adbb92e4577132539b4c4af817027ed8f19 WHIRLPOOL e4c8d18c8ea48346a759f0e379a2bb3e6faf30f9c4a4b794485a612e25bbe86a81833e68e28b2def668faa4ff41d476ed5a6cbf105ef76bb31a02169b879f9b6
+EBUILD keyutils-1.0.ebuild 590 SHA256 ed08914143dc19e4781b4f584d2e6ed5eadb35ac293bc208f2db101deefe617d SHA512 125b36b734fb929e87513f3cc4379d73fb3e4841f436e986d6f23e657a7d26ba840301f3c1a186810ff3eb72e443a5e7f84b30577a7b5b03090dc8cff164d3a7 WHIRLPOOL 2b57bf6c25ded962983aec6a3553bc3845d102a312a32ce1f31ef6476db0b4af89a679b336874f9c82fadecc14a33f8176a4d9941e4f82c6cb138e69f377c599
+EBUILD keyutils-1.1.ebuild 696 SHA256 dd12f6ddb917aabdffed634caf7cf213742c22d6bf3d653320b85a80089b6832 SHA512 fa4cc64639a7e9bac8cb1d65f32878976df80b35842fc4383b23d4a614b0f9097ab438235cfdf8faadc098e32c768ee75b12577879ef80bdf80158567ecf37a9 WHIRLPOOL 6e0773c18767a0cec138cc5dc95c79e26d0d37b8aa6c57db20d4357df95ed245bb712de8935bc9e4a313806f68f2969446d0bc26030c6f8dbd198d9bc7e630fb
+EBUILD keyutils-1.2-r1.ebuild 846 SHA256 bf7a9b2dfd37133baf84499eeb422be78a5b9f64367a7c88a02f057353e982b4 SHA512 3924187c9a16c4c250f7de2f3026a989f674e4985a682bed9e8a4f5d19e9472a18c440eaf869d3255af9676700016b8dbc34b7c5f600295f2d6987daa0a9dc98 WHIRLPOOL 5876fd6c8a0b3f83b696f7b083723fea1b4a455225333957a122b7653caeaff0bc28ddd3e439023fcb9605cdc4924f1bf412c7667dd40c978b9c4c5722250a90
+EBUILD keyutils-1.2-r2.ebuild 1010 SHA256 5a420f6382e24b74a7e256dead6a746046d6048793852f4b1d36926af5fbcdd4 SHA512 a14b10981db32b459f4947789865010261f7cf61ca58f0f8c97d1832af784a7537b4c6d82a64f28a4187ae8e3507fce9d4132c1054c463fd1b2024b1de31f7ed WHIRLPOOL 7f726bd4943f9ef1bbb0379e08b8bb92d2f022ebaac91ac908f536d76a355e51b607d053e0c53ff0233f7248325a8e7188bf236134d5b6c13192c0f10d9a9477
+EBUILD keyutils-1.2.ebuild 774 SHA256 8c1311e587f9b32576fda8665572118289e3e0fd56190f915752318e7f740c41 SHA512 ee8be3950894881620adfe045a38ce2d5bf796595a59bf301159d34b1e2b48dbbfc9ed637661e02086354b0f1ae2e74d4e97fc8245f2e81db515cac7bdb5c498 WHIRLPOOL 3d26e6bed3dab55388b92877f5da8625f7065639f6a9f725b669e91863b5ef2f658e6ab1903b88020658646aff84b6840ce1ab7d1f9be4320b1a1de951a6dbed
+EBUILD keyutils-1.4-r1.ebuild 1106 SHA256 452acb493387e2372c5d1cc838923800620a7bad802e437b55fc2629173c46e3 SHA512 2bb99039a5cc50e62360a2f348127df6871a324423325a5c44e14dafbd044fe0ac87b72843475e408abc7b9f3ead659271da478e0f6be8f96064fd9a99af0be2 WHIRLPOOL 16c30635e464ef05cd6bab47d6349a5b4946e8905e92abd3da0edd4905482e55011aa85d1dda03dad26c9b939449c84531eabb339a0a09aacc8785bd98194228
+EBUILD keyutils-1.4.ebuild 1026 SHA256 9b26b4848484f8c5d16241e5d2f822356c6b0765ce0da4e3677b651b71eedd95 SHA512 fc3a99634133b060c0a55ad8387d33610b9fe24be0ca2a6e2ad61ed3741c3c84dd210d10cc6e9b810d806b20ff822d93e92ec738bd4e6737f0d14b78ceb5b676 WHIRLPOOL 5a20aaf492d39a949512bf7f223076837f1bc23a4bbd99557945dea6a66f9db7bca0ad669eb05e644e56b86697a5d7768aadf3f0f41a36369743cf393cc29a31
+EBUILD keyutils-1.5.3.ebuild 1090 SHA256 a8b4715ed752d0fe311820454f28f5d16d3a82667cc0906a0e859c1a4ee0a57d SHA512 b9bfdf2e635d540e90dcad7343d6a75d59699778113bbfb60ec4adcdff8e637e756aeb83d1677de35d147e3f56c794bbee40e33da2b4081cd3920064a667e783 WHIRLPOOL c9262fd32f8f432a0b04b14df12a4376f4707a6dda3689242232bcb3ee06bd38114bcf1e1141dfea76fb9b2b9694627c1e1ddd2288c7a99c9b2eae98f34e20c1
+EBUILD keyutils-1.5.5.ebuild 2156 SHA256 d3f8f0b5d71324d8a5ecaa3266f41ce03b8f7b608c1e4e70965e43d05608765a SHA512 d909551bc17a66fdf2180d59b3a120b5be7c838ca7bf68e0d3223a46ce30e9f92d20e70e42a8ff829452d9ca6c65cad62752df6f12acbd7cdc3aaa4b6d247086 WHIRLPOOL 624edfca45c885a635dbc88384095e04a457aa77e98186adc171b59e002eea2b16ed994a9e30ff90b1cf901f8e8dae6a52e6e4cc488e9c39cdeeee4d5f41a672
+EBUILD keyutils-1.5.8.ebuild 2167 SHA256 4705da766cab411de487c95010c7c7a6ff7466c05bcd9e5c6729ef2e4ab03374 SHA512 a744cf7934c00310818d47e7f14e5f7a719636d5f03337fc91ab06ee1f98d715da4d66cd8b315f24c36b662aac7c504dfbd52a2aab06f0e5a23dc60b2cf17d6d WHIRLPOOL 1614ef444aaa4a732b16e85991caa7cae876c20b95480076703df53b3aa74941bb1e7538dd1eac0661ab7455abb9dbc89022be32346d8072d774cd822ec65684
+MISC ChangeLog 4954 SHA256 9c38b4d7886dec79af84364c2ad4edba105120c0e1154bf85f243cdc4c19af51 SHA512 da5982d68f7611ba4ab2e5cd54853614fd2262dfe0e880c67d802435b741c5b298f59c713d060d26e9e97055b88bd9ef486bbcae81f1030923bee7a483e01937 WHIRLPOOL ebf7015f1b3f8d8b0bfdb5c8bad9963a2b15b020f7c74595e872fb520a5a5cf2bd9476d0ae85e806f2f525d98d7885f9449a19d4a0038eed450cad1a3268711a
+MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
diff --git a/sys-apps/keyutils/keyutils-1.5.5.ebuild b/sys-apps/keyutils/keyutils-1.5.5.ebuild
index ed02fffd0e58..00469b2c3682 100644
--- a/sys-apps/keyutils/keyutils-1.5.5.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 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/keyutils/keyutils-1.5.5.ebuild,v 1.9 2012/07/01 18:21:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.10 2014/01/04 23:30:45 robbat2 Exp $
 
 EAPI="3"
 
-inherit multilib eutils toolchain-funcs
+inherit multilib eutils toolchain-funcs linux-info
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
@@ -13,10 +13,18 @@ SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
-IUSE=""
+IUSE="test"
 
 DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
 
+pkg_setup() {
+	CONFIG_CHECK="~KEYS"
+	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+	linux-info_pkg_setup
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
 	sed -i \
@@ -43,6 +51,7 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
+	tc-export AR
 }
 
 src_test() {
diff --git a/sys-apps/keyutils/keyutils-1.5.8.ebuild b/sys-apps/keyutils/keyutils-1.5.8.ebuild
new file mode 100644
index 000000000000..f77908eaf6b4
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.5.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.8.ebuild,v 1.1 2014/01/04 23:30:45 robbat2 Exp $
+
+EAPI="5"
+
+inherit multilib eutils toolchain-funcs linux-info
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="http://people.redhat.com/dhowells/keyutils/"
+SRC_URI="http://people.redhat.com/dhowells/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+pkg_setup() {
+	CONFIG_CHECK="~KEYS"
+	use test && CONFIG_CHECK="${CONFIG_CHECK} ~KEYS_DEBUG_PROC_KEYS"
+	ERROR_KEYS="You must have CONFIG_KEYS to use this package!"
+	ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.5.5-makefile-fixup.patch
+	sed -i \
+		-e '1iRPATH=' \
+		-e '/^C.*FLAGS/s|:=|+=|' \
+		-e 's:-Werror::' \
+		-e '/^BUILDFOR/s:=.*:=:' \
+		-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
+		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+		Makefile || die
+
+	# The lsb check is useless, so avoid spurious command not found messages.
+	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+	# All the test files are bash, but try to execute via `sh`.
+	sed -i -r \
+		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+		tests/{Makefile*,*.sh} || die
+	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+	# Some tests call the kernel which calls userspace, but that will
+	# run the install keyutils rather than the locally compiled one,
+	# so disable round trip tests.
+	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
+}
+
+src_configure() {
+	tc-export CC
+	tc-export AR
+}
+
+src_test() {
+	# Execute the locally compiled code rather than the
+	# older versions already installed in the system.
+	LD_LIBRARY_PATH=${S} \
+	PATH="${S}:${PATH}" \
+	emake test || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README
+	gen_usr_ldscript -a keyutils
+}