Fix last failures #489794 by Toralf Förster. Enable running in parallel.

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

5 files changed, 75 insertions, 19 deletions

diff --git a/sys-apps/util-linux/ChangeLog b/sys-apps/util-linux/ChangeLog
index 6ba173888d60..2f26337519cc 100644
--- a/sys-apps/util-linux/ChangeLog
+++ b/sys-apps/util-linux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/util-linux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.443 2013/11/28 20:41:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.444 2013/12/22 23:21:56 vapier Exp $
+
+  22 Dec 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/util-linux-2.24-skip-last-tests.patch, util-linux-2.24.ebuild,
+  util-linux-9999.ebuild:
+  Fix last failures #489794 by Toralf Förster.  Enable running in parallel.
 
   28 Nov 2013; Mike Frysinger <vapier@gentoo.org> util-linux-2.24.ebuild,
   util-linux-9999.ebuild:
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ae8ff4d25fe6..63ad4a936d19 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,6 +12,7 @@ AUX util-linux-2.20.1-no-printf-alloc.patch 2496 SHA256 f5017b80eec55076df0e9175
 AUX util-linux-2.20.1-umount-fs-search.patch 1479 SHA256 8b8ceb858e451386f55f19d8049c42ffad84fed02ba88f5585f7c870c166ee0b SHA512 ebe205f47002e3434aecd4e68f104dd9dba5e6e6b8d9c5b38cdecf37d30a7f6235837afb9c292aabfb6d688a1cb7bd5982b49c5a3a1443ec7f6dc978cf10cc81 WHIRLPOOL f299a835c5280836f1dafd206e7f857c1f1684181e885628d45b6bae03bbd7ccd598f7141a516689a35d96bf3b2c27bd2806584adc7e515b50d8362f3298abd0
 AUX util-linux-2.21.1-cal-nl.patch 994 SHA256 1e2a263c9d602ed07795697fd4182dc3d1960936662fde9b0debd379413d7436 SHA512 ac0b8c349e8d3b0df2c98c96dc6e772ce2c4eee7efe63f61ae03762a2f90fa12f654e7a8664af6fc6a8db65c8976df38b1c6fd31bf776621a82b0052cce8b12e WHIRLPOOL 19dba492132fa3a56991c26689f53d282059236e286caa6a24c2d1a30647f456e63291298a8522d08056394934c64709b5b21007fdfc8a28ab1a1965a83ca258
 AUX util-linux-2.21.1-no-printf-alloc.patch 2549 SHA256 2a2429b59151a63a75d2ff46f60732c6a3fbe9b52e472802edcf4eedbe3e22f2 SHA512 5f199511d3c6919c1a23248f2fd1d15343ee330e169b8440ca48bbbbc1aae243d8bd652ab504520c5d12dd0875e5e94a704d727d4b71bcd940d4ff51115b3981 WHIRLPOOL 0da24907d2599637c6fde3d287e3e7d432bdcecece8aaebf9358228657c116675b020efd4f583bfbc250b6505f8ead081f7c8c25fc6a1454a426d0856262bb1e
+AUX util-linux-2.24-skip-last-tests.patch 1003 SHA256 5ccbab17e26cc9b592b534b9b3e72b6a23dbdd04718f6360cb7d8886221ffa4d SHA512 9d89530f203c8a50e1def8164669b93ce1c1509d4da112c9db56cea9e29288c32964978e06ababa8e6c00222813d7a99bc35e0a7cfc17d8cd63804b629c9165c WHIRLPOOL 0e7c1cd6a4bdc94fdad3582f1855992d375238438d165627d60cddda8d1314c759b6e34171c5d00890956acdf9641ad5bf955f980fd142545b1ef468caa90be6
 DIST util-linux-2.19.1-20110510.diff.bz2 47865 SHA256 e04f541ca48951284331e71cbf142d777750dbc9baa051ed9e9913c7dab32b7f SHA512 093d615b9dafdc9552530c8e45151e680043090d91eb94544ca824084ae577a0afbd9af944f5e7fdeb258d076f550c21e737324671be4ef7c98969432cc9a0d4 WHIRLPOOL d3e25bccabfe83d3b4bedf4a4b21f9de396a0f84715f8f2a77b7dda01d51ed5e3f73f43658c1645f5f08adba815f8402752b97095d78df73212453c379044f56
 DIST util-linux-2.19.1.tar.bz2 4396543 SHA256 d3eac4afcc687b3ae1ffedcab2dc12df84c7ba7045cce31386d2b7040a011c7d SHA512 affc12e42a53cef18d06498d44dc0adc9f9f40500e8b1439c206d46362033d341dda3a110b586b14d451440921744c386f480314df3d6902e6254021672b14b0 WHIRLPOOL 5b29c0677d2e24144df70e790ed907a3346d3432b6fc1497e4bed97fec38d47a55a8c6fca2b8a66f4cbbb31501bad72658db3d6a2787f8a6894cdb62a9d796d6
 DIST util-linux-2.20-20110905.diff.bz2 47914 SHA256 7d8f78cda817c745f88fb951fa0e9ab852f215cdb931e97dedb87a623fc042b6 SHA512 010ad4ce3e3ec353cf541e19b8de8cf53add2d071d1a323300081e14d644fef41d8a8a6083072291bd584121e8657e34571f98598d3e2e3f7d3e4e1a679d8e48 WHIRLPOOL 49da020f8b14b83340781135dce2b1ad475d1f27bfa7946fd6f870a915e0b6c4a7b1e9efe3770e770a7375a679dde947617d8bd4ebedf785a2b86c64199eb614
@@ -43,25 +44,25 @@ EBUILD util-linux-2.23.2-r1.ebuild 3453 SHA256 dd8f1438d0f30a369df1414f7fe8f8972
 EBUILD util-linux-2.23.2-r2.ebuild 3564 SHA256 e89186a72e09d92b1b2bada7234abe8c23294b65e550383c84737f091641b8cb SHA512 18e02c2c0037d53b74ccaf26c57560ece78dded55ece1a0ec4e310d0faa931def8c0c7fc2da4807f1200c76cd185a860884c0be92d3d1cea186b64b33ac49b75 WHIRLPOOL 6689802b39541053297a1adb76ee50a4a6a4eee3913db6411bee16bba96d430c16f1586c0e07e86cf106ca7dac0ef7343a77dbf97225eeeb418917b2bd8c12f7
 EBUILD util-linux-2.23.2.ebuild 3364 SHA256 89ab236da7f29d87ff603e1d8e978c155da0f0da8dd9160a3a564e950e26a5fb SHA512 17bb2ed953edb9b1e28108bb60f5f98134b0fd5abce0426d5f860ce4a340410aa7bb9d4e25bc8903a6fce1044bde1cb5f796a9a9b2e70e166049c077f8191eeb WHIRLPOOL cc7942713f0acd969e2eeebb889813f4016e2e4a0b7d030980abf002031a4eb881c7a08220f892a16e89943e1173d4e73f3e3e7fbe628138a69266fdafc377b9
 EBUILD util-linux-2.23.ebuild 3393 SHA256 b4a256fb297c657c06b7708848f887a7cc6238ac87b6f1afea990bfc993c3de7 SHA512 9e6081da539ee17ed8f47b5913b22b5cfbbe6689893f2fcc8dc3f69a2e3c19c145ac54227db43b5e56bb5374f63cf625b910f71df953bc974eee3a4439056dbd WHIRLPOOL 0e2b2223c56b278a1d62189e5325171d5846d0b4ce916544600551808ffd9071e12af8ed4d8a2ef412c49f46fcaaabd7a8f19f3b1e705dfee01b5269a2bad4cd
-EBUILD util-linux-2.24.ebuild 3796 SHA256 2da5f7f3cfd1172338fc4ce45baabbb7da63cede829e4a937f6701568bd8d1eb SHA512 64802703ad2ab8d469aaf57d45a0b15340c72583ab5574802ff5b95580f72656e234203342804f3fe4bee9b03ff815099629a745bcc70f3e0760cf750f439704 WHIRLPOOL 06ef2ede06e9476aa2e6e85e1833e5203982b8c3a6c27ca34c768001b548fa1f2bd043814acf539f30e9e9d2136d87c23906e03416be2e144482380b328d71c5
-EBUILD util-linux-9999.ebuild 3797 SHA256 147e9350f0906903fe17a109a39cc49ab60c479a9b94e79b1ee9e98d69130b5e SHA512 1d1dfc3e5983de072e6a000c817063d908325068374c984a0f2591dffe2bcf70910399e6f0cbe42e3c06028c44cad0aa40713f6263faf1318ee58c90ae427f27 WHIRLPOOL ab167b126e87384241291a526097985784c667eef14715cd69224989adeb74f968b7e1ed19502680099a154d1ff171146c17c5e3495d34bb434eb99067f1539b
-MISC ChangeLog 68293 SHA256 f7a8a8eea6b0012577e063317d6c0aa23f2862647c2b3da939d1bbf1da4e6a7b SHA512 bb8f88defadd398fe449dff2a5037945d15832e7601ef760a5d935905fc615f4bdcc9b345f88899ba6e21f22e238ac79da7da260b6f98999960d8bc986b45f8c WHIRLPOOL fe59780c12c31696488afd26385a36e3684f0ea63d8375bebeb06f590650f3286ec6c5f4751593f4d961d0782368ad583304049061140ca009b1b6d5e4e5816b
+EBUILD util-linux-2.24.ebuild 3888 SHA256 c401978a99f891af0a990f5d17c120d12b31f06654fbccc3bf4687ac485a0e98 SHA512 377bb3429fdd5991b552597575edf047a4451be9452805b366e7177f85cf87548443d788dcb36fe5ea4f08f9a69e8a32b0f8e1ac35c8bd96ca16e3c83b61a94b WHIRLPOOL 4d55540f8134824304ca9cdc61f12ba4616ebe8b48de2e724c285d9a4a5db13231f070f98ab6fcceae30e95297ad294b554f2f3e8b62bef217669d7800a83ba5
+EBUILD util-linux-9999.ebuild 3826 SHA256 95d1dde6d11adcba836ff9b188182873cbbdd4a50749de5f67e5c884d04af52b SHA512 72f8972e0fa1fd607df6e8ffb7797ce43af7bd783463731fced92bc3dce474e8ae0be9ebad96c52b040aacc0896d6e3e1017543808c9dcb0f0e41ac893eca035 WHIRLPOOL 5d88e93ea72d077ca77718e6693a991f8d44068d32487f141af4beea3365fdc9602b70d170cc62745f3b676bb3cbc1a62ceaf7233f0540ff24ae106af3632367
+MISC ChangeLog 68519 SHA256 0068d5b17d70fbdbcd821929db232addc8afb9084443cf31e452cf164161c59f SHA512 fc1da84e6d8b5618fe7e27e67151fd2e02d17a311917cf0a70c96c5fed384f95e132cb10dcc405bab33c8f1c34ee2607816eeb0029664873fc6144aea632d8cc WHIRLPOOL 9b3bde3a8bcdee8c5e2be9e603fe5062ffa22f9f1412ffcda1fd3664ff874884d53d6b0d54eae63c524adaa923cebc0f36d4cb3d5e2a2c13ccedef7de22b4e44
 MISC metadata.xml 1089 SHA256 cc475077acdfbdd9bb9d7ce99e844f5befcbd5a0939b35c032c8e79a1ea951a6 SHA512 33929335a39c373fc37768e44986d14571f7af1fb6cbade3847dd14adf09e7f0c62b16bcc5906283558fe50fe9e141a5b8562961045c83bacc9c3d1707744b06 WHIRLPOOL 7cacbfb5283ee9600da67d5c284db8a96d49a01ba2bf884bcb9ea056f4fa75b2296b5804dcd88c5832f1f6aacd4c7c1f498ffa1d4a8ede963c184c2b7097905f
 MISC metadata.xml.orig 1079 SHA256 68e6c0bc2a127e5f7595d93a1f83abde357e911d4e92b61272e20fb38491bd18 SHA512 16ebf2ea38d79d21a94328d7d415e9751d9e1a56249a32ed6bab1b85c9b177f7d78ed9d9d937a8d8249d3d3cd51f39355b16d929049d214bb9e54656db91df30 WHIRLPOOL 4af098ee9a00f9c564f48dad2313f2e5bb41ac3fe5c6b097639584cf7109dda17460a1fed537c49c626d5fe24a9161a0fc9530b8849fc41d939e3f59921067c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSl6qVAAoJELEHsLL7fEFWvAwQAMQEdB0TQ9JDDy/ISsPmgN9h
-Mgbk1PbWJR0qkpZPltwy9N8bQ9gL3aYWBObdKBJc5EXsumS2qG7vR4EH/TqUZCiW
-HVDE8NjawT3dQnyHaxjtvkrFTzmQhb9Q0u238Z9c3cV4IeMFcyfIcJIyGiUdgY+Y
-eJu+cQMlq9vXD9K/mrMeIhUjJlkOVXOF0fzS3gIQg7jsWF8CZs2be8J7mhtqCn4T
-CWeAa87+8u7Jr2CRYv2ddJUd5HnJFj2lxI/jleGOaN/8O+ApPjRN1luncNg+ufKd
-MpFSZe5HIRTwOj8yEBrtzDQVRfZjqiB9Y2wk3FW7INZ7EA6OYhIFqaLskyCaSHqb
-aDoGLbwFmSkvZEYucbVRGhLGLJyvCFSgQ2F+7m2KHxp7efNXcTEt5iVsK0jJcIUa
-zuODht70jfpp6wMhTM8xIFeHTde532BJdGwOCJYpT6SwymH0Ros9a7N0QXZYOrEH
-tAwJrZjHo+dWGAh4cOWLRBKzARETrhoGLZ5xr+B6+31FrXOYPhNlrl41/Bn4mkYp
-T4H2Wy6OzkvKsW0ad5XIXV0wLMD+zGIWzBdEkeBKncSfoE6rRo9Ay7yI0kS27nB5
-tToiZ5LOZDRzmgD/GZUXTL0NdksqMJ46Sg4mAIVbhzqCLbBxkCFITidS0dRXqeXB
-2TCrE4FqcmK26kPiHOuC
-=aDub
+iQIcBAEBCAAGBQJSt3QaAAoJELEHsLL7fEFW/U0QAMErmUesIE31FrBuci4IixX3
+xrNoaLKE8iDtKok2S9DsN9H4zVoy2+9vxtFckTIRObJGdbTijCg5NW8tWdQOdQW1
+HmnY7ZpfMSJOLATKo+gMxpST7NZDkGMwk5nA6wrT31sptSNe8a1SUJnzh+YFXcoC
+skjr9eZ+73q2wApBSkl1jJ5x1y5FOi6NdcOB1/rX2abHN7rd4ZGO6KHCyN8wNShG
+w8zhvbCqTNa+6IoQRPFe4GQYI303k8lYVspRt+VJD6eRkfJX79e5L3UdLQibFKRF
+8gUx897cDEoBWSDMi6tSldrciabzf8TwQT08rdIzRkHJEAR5ZHBMSx7SRxAaCztK
+SL5ktSGZgDaykgpVCxT49qRosWy2GnGYXzjgyER2WVNV8R6PPoQzx4Xp5G+cNEkW
+m+fXTKRhFLFoUxiHO3HGY2tR1J9bbKNKla1XWK/5SGPDQI7yY3g6rzgb7Lsydc8X
+T5r4x9LZQrsQWek7bbvdBrd/L9a05C/hSLA2HJhssamnrsccBO0ZRZQoXS1XqMc8
+ON8fPB9SDKn29XGcvpJyPYw4UTbC7CuWDbsFGq7CP2HAfZ3mQ3OsjW4f6ImeoTV0
+cAzgNULDNyn8aCy5JeqjQsVtk2F9n2WxZ0WnolsOkB6YWaKVECDN+Jms2xnktgmW
+FIHPoZpq76hekLcZDeNs
+=kyiU
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch b/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch
new file mode 100644
index 000000000000..5148053d27e3
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.24-skip-last-tests.patch
@@ -0,0 +1,41 @@
+From 6b55612b9ad1193a042f3c3a1d9216e63b0d2907 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 22 Dec 2013 18:17:15 -0500
+Subject: [PATCH] tests: last: skip when last is not enabled
+
+References: https://bugs.gentoo.org/489794
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tests/ts/last/ipv6 | 2 ++
+ tests/ts/last/last | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/tests/ts/last/ipv6 b/tests/ts/last/ipv6
+index 8e2b01e..60b72bd 100755
+--- a/tests/ts/last/ipv6
++++ b/tests/ts/last/ipv6
+@@ -18,6 +18,8 @@ TS_DESC="last ipv6"
+ . $TS_TOPDIR/functions.sh
+ ts_init "$*"
+ 
++[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
++
+ export LANG=C
+ export TZ=GMT
+ 
+diff --git a/tests/ts/last/last b/tests/ts/last/last
+index 4ad38cb..83b7f8d 100755
+--- a/tests/ts/last/last
++++ b/tests/ts/last/last
+@@ -18,6 +18,8 @@ TS_DESC="last"
+ . $TS_TOPDIR/functions.sh
+ ts_init "$*"
+ 
++[ -x $TS_CMD_LAST ] || ts_skip "last not enabled"
++
+ export LANG=C
+ export TZ=GMT
+ 
+-- 
+1.8.4.3
+
diff --git a/sys-apps/util-linux/util-linux-2.24.ebuild b/sys-apps/util-linux/util-linux-2.24.ebuild
index a27758922615..5cbb6e33bc94 100644
--- a/sys-apps/util-linux/util-linux-2.24.ebuild
+++ b/sys-apps/util-linux/util-linux-2.24.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/sys-apps/util-linux/util-linux-2.24.ebuild,v 1.4 2013/11/28 20:41:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.24.ebuild,v 1.5 2013/12/22 23:21:56 vapier Exp $
 
 EAPI="4"
 
@@ -60,6 +60,7 @@ src_prepare() {
 		po/update-potfiles
 		eautoreconf
 	fi
+	epatch "${FILESDIR}"/${PN}-2.24-skip-last-tests.patch #491742
 	elibtoolize
 }
 
@@ -113,6 +114,10 @@ src_configure() {
 		$(tc-has-tls || echo --disable-tls)
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6d2f8869dd3f..23cf4356fb92 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.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/sys-apps/util-linux/util-linux-9999.ebuild,v 1.49 2013/11/28 20:41:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-9999.ebuild,v 1.50 2013/12/22 23:21:56 vapier Exp $
 
 EAPI="4"
 
@@ -113,6 +113,10 @@ src_configure() {
 		$(tc-has-tls || echo --disable-tls)
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}