Run devpts check in pkg_pretend when using newer EAPIs #539928 by teika.

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

9 files changed, 82 insertions, 47 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index b3364df86327..a1069c557220 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1052 2015/05/21 04:23:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1053 2015/05/27 13:55:42 vapier Exp $
+
+  27 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/eblits/pkg_pretend.eblit, files/eblits/pkg_preinst.eblit,
+  glibc-2.20-r1.ebuild, glibc-2.20-r2.ebuild, glibc-2.20.ebuild,
+  glibc-2.21.ebuild, glibc-9999.ebuild:
+  Run devpts check in pkg_pretend when using newer EAPIs #539928 by teika.
 
   21 May 2015; Matt Turner <mattst88@gentoo.org> glibc-2.20-r2.ebuild:
   alpha stable, bug 544034.
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 05289f4d8bbb..6b6688c98749 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -17,7 +17,8 @@ AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 SHA256 992fb70b9b6267
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
 AUX eblits/common.eblit 10757 SHA256 215864e0d2cf57239efab1fd903b4410892698651b4d8c7e0a2fbcc09da8a5e6 SHA512 bc08d1cf6ac17dd526bfeb175fcc1079389ee53901e892c39688381bba8bbcc69516ae92becf170f75f816e246e59bbed1aba9d327f1069a2ab7f9c9fb265c2c WHIRLPOOL 276d2d477616427d124b41160c4692af7242dc7fb172c1b5ea8cf65a868f69122193a6ec2a6f842b67aca0c9fd9aacbf9b0f88436f0c5f00434e5f89554351db
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
-AUX eblits/pkg_preinst.eblit 2608 SHA256 e49f274efe309b4bfed88195d413afa3363f40fb6c2caf50b4ab8ce5ab548864 SHA512 debfe0679d51eff7a154f7772179cf6bfe01beacf63fe101370c172e71b0524da0ceb7b0571e69a8050e5b75953b1d4c8968e1982ff4bc7362caeedde0be595e WHIRLPOOL 7b5c69c319651d860b3495d658b7275308f69504050699aada21ce5ecdd3114c1ea50ee7eac4436ee33738d02a0eb4bc6fff41484ff840aa2400bdd484ae3e93
+AUX eblits/pkg_preinst.eblit 2040 SHA256 1620ad612784692b5a55ecccb6c8338d3aee771a9eb771e9a25c15198ebe9f4d SHA512 7eca185f214b83e3d36735f998dd29d9111c9a71b97152d4d69e99d7ab1634d1e2d70eff35ef036fc0036be9b48db4c3b2cee9dc6bfd1cca6e7cc302ce6e31fb WHIRLPOOL 03cc8613566c6717e211ba0305cb71d8377051f07218b64221e5376e2d603c9bd110e601acf62ddd25c70b887c308858ff97e53ba97708d4e6278db063a541f3
+AUX eblits/pkg_pretend.eblit 1394 SHA256 40c6cc62519e80bc0c90aa84d87fe3ea2e26126484468d12f17d38cd75edb463 SHA512 99f6bbdcda8fff55aa677e3a4ce0f0a0d9153bb21f3abe665d701c7ee2a113fed48e5793af40cc2087a8bfcb68872870f46db915de6507066700bc8db7ef497a WHIRLPOOL ef7cd5b4dc9cacf16e610bde99ddb01e010dcb0e20e314f450cb2a4a02851a91ec2da6c07c7a9a428109e6e36f22c6a5cbf632c209dc126ea78560ed1436f1d0
 AUX eblits/pkg_setup.eblit 3963 SHA256 385b1315ef36265375d4a552687437a59cade4dbc937aa99a313002abea63736 SHA512 db970d0bf24182993f10713234316f7a4392859a3d8eff419a2ed7220f4e159daf1b6944888d34bc777587b2e9160a1bd911526fc28512d47aa60ebe3029d4da WHIRLPOOL 8a00c72f2d81e39de89e43f0eb973315035702357aec986032af7085bc1e5ad02ba2c6341c22f1e967219e239de3e5c714a156117141f875821e116bc78de4cc
 AUX eblits/src_compile.eblit 712 SHA256 2f7250659b1ea316dd67a0baa229b9248693b55738416e242bcacbd6efec96b2 SHA512 f812075621013eb9db7748e16997f7785e6029f691147ef63c9c5e4c0ec98ca47cad81a9aa135e69dd57296454d158191deced0cb47201343698d9495b8dd34e WHIRLPOOL 0692b14ac23a7f995e68c15fc91643bd72707f4072e319460a31014a91fe789794b10ac155021b48f02b9bea636305408ec56bb161664a21ec7f5ff86ccff7fe
 AUX eblits/src_configure.eblit 7314 SHA256 4409098cf56c4371f298484a10df56146b0a5dea3ab434cceecf9ef110f2356d SHA512 b615916ca3455a6ed578542a70456b7a40e7756e01f7c2585f1762c7eee02761bfc0275d1ccb807ee4bb5e2c677eb4d6c9545c25d507a1c9d6a12993793e3f4c WHIRLPOOL 195789310831e9800fcf238e8e9f05c4233b7c3f40c5c6fee5a5fe69a64e426421e2265d609b619cb5736e9970af02e3f9c276644cef10e6ff35948379319bac
@@ -63,28 +64,28 @@ EBUILD glibc-2.17.ebuild 6958 SHA256 3cb1baca3b8469757ee4c5cdb6b6aef07e19a6041ff
 EBUILD glibc-2.18-r1.ebuild 7021 SHA256 308a57802e31f6ec4a2ab6be491bcf679707a6a7c479b07dc754ec5eb448ab2b SHA512 8aaf3908bb7db5d315efdb01fa90eb4c783ef91e3efbb6ea006308aa4fb21669be76320d5428130816ada222fca5bea3e16882eb231a16640c55456834a53b97 WHIRLPOOL d00f4bb51366cee03c9007b8072c1dbeb5a7002158f43517a8242b07cd82058c053a3061a0affc1fb4c129f457c90e81af78b2ceb87fc8942e7d67bc264e140a
 EBUILD glibc-2.19-r1.ebuild 6903 SHA256 95acb9caf384d01a5c89af7242c72f40c5c2a8c219683c4096f65dd59e34668f SHA512 14a33b61b20acb6993b07b4842c76f3602e9d0ae2f07a44e0501831080c3730373aa5f02c96f328c47fde89e60839ec85f4dd98c4f6b515eacf03d1ab0795df8 WHIRLPOOL 1b3883b5a2641687fd46df89e140e0e332da0933fc60426906c6afaa9d825d6fdc2fea0de1a95c7a74736e96adb346c660aaf5ef0597e2c5324e716cf86873b0
 EBUILD glibc-2.19.ebuild 6912 SHA256 3a11e60bed77cc2dad678ad97ed7a959a59a91a94ca28fd4d7d8776a6217a00f SHA512 70c9b91f224c276783b96ae60f57ac48886861fda71be6e6e292840b4c8cc0fea798005c26c6c33f198c63fb2c38bf78e994821dfa010086ba7ece443257b851 WHIRLPOOL 98be39cc52c7d8431e46f24f9552db63980f4a38c8e12aaffd4b08c7c66f8931a16fd7deb99e43a5bb330a42e6c1e722a9a8f74d1fe97523d7b4bfe75c9accf5
-EBUILD glibc-2.20-r1.ebuild 6213 SHA256 ffa484fac7185758cd114c91804460e26ae3da5148b98e106a04481c2d081d8e SHA512 f6899f6a946259e03e39ba12b7522a883f66bbd294029716ba3858340a4ed68be7dbbd506cde3e5a27fa1fe5ebc0215deb6f7059e95384ac869c77820e329962 WHIRLPOOL 66b1d94a2dbad951153ec17ac8510b7dd6939955af0467acae3721c44f2e2704d8f02508aafa25ad64f3cfe8971d46d674fd4c89bf1d76e7da31a6c1b2949308
-EBUILD glibc-2.20-r2.ebuild 6460 SHA256 b159d9ce3bdbeec05682a2b0b6ad7d818cba911e7f66741a3d4073dba43133b6 SHA512 7f19217d64577a712a0e388849227f55f5fb8a9656a66d4f1bd14655bd787a9690cdc617f32e90666fd280e963197e742995dc8237e3cc4ced6201a49635b14d WHIRLPOOL 17b1e508f2c048175dbd1cd38e73873e73be9b4e0fc65d48796236db58caafaedc55e29aed8a351ea947b547a5aae7d180f4d9e2a796d3eae7076a440f467023
-EBUILD glibc-2.20.ebuild 6159 SHA256 60cd13aa057dedf49026f440b2d0f46ae36374689d2085a7209dfb991939e0e5 SHA512 f9f64226f1d42c7db42b0c221e53e58cf22df6768f3a4e64367d8537ed232cf3566848c6210dd77a287edca05e2d952a5953ec750dc97a3c878847f06c5c0f56 WHIRLPOOL dadc71db6048b4ba75bf63e1e825f5f8ebc45f64947d9463e2a867ec5323a6c8e6d34d269c4632aa54d31cf743e63ecd6484eaa00271128c44da19dc1b809310
-EBUILD glibc-2.21.ebuild 6443 SHA256 c24c04017479409be2a51781fc720a8c4c47ddba9acf2d1bb1a13a2250cf4522 SHA512 8d8842130557020826a592f1f95b6a58f2a74d174156682ba36d778fa1fad40348c9c6bc8c74862f7dd225d473534fdc375c915ceac68171c129cbe4f05ddebf WHIRLPOOL 2351f26a3ceadc0f6d4a28e74f2e8956bee3fb95c6dbbe43cd8252e7277edeea29b6e7f25442759e4ab6d78ed6cba9808d328a18293c2b291d9b35a771e5b62e
-EBUILD glibc-9999.ebuild 6190 SHA256 5a3f6bf5cb702fd221f75224b8223b9c0250be7baa81ca891add96eda104fca5 SHA512 84120f37f2b9e899582ecdb1d1ffb7e23f383b95e5989398880dda90e276bb2025d338433323a4558a188cf61e499ba5842c06c8bbb8f09f0c4fc07651e7509b WHIRLPOOL 2cc9f0b237c6dd31c7fd9b601ce0e00fc305979a48e197919040a2750168dc00b89eeb69d3e18ace53613e086a3e6779d85adc45c293ba3dffa98d4c389f362d
-MISC ChangeLog 75743 SHA256 121c5eb3e5e447357e932152c03335713587db883a9fd18da3cc032151dfceee SHA512 638ec8465b35771235f6d849228c2c048dbf4bb84767a1f61720fd651e2abd8e3100307401c4574132b1fe50cff2389e9d5e5c8ef32508f225e17fb102efebbf WHIRLPOOL d525854b2611a200812c8f084bfc1918d803dda6f6d04ddcc56943e48f5f204541764039919c716a03f0a88256fb9aea3fc89bd1f02a7f0662ad957c299025dd
+EBUILD glibc-2.20-r1.ebuild 6221 SHA256 d9cba89fbc17d7e1d8a72c91262f06d10d14acf76a636733ff994fcd1fa23f7b SHA512 13eb4038855894d9c30bf1947ec6aaa956e797af76a201a162c8ebbbd39cea3fcc597a1166c73a5e1656025546b58012f4fd04786f34f8e46c16fee96f81c7c2 WHIRLPOOL 3ff9028ce0d795a4dc819c1bbebc0d42d3e616be85f7456d29d771fc8762f0e80206554774356a36df03a71b9036715429dffa17333441cd44caf300ac1a2e4a
+EBUILD glibc-2.20-r2.ebuild 6466 SHA256 4bd9a1293e64242620dae13cbffcb218547b1b8090862e833df8289150159321 SHA512 914cb000684966799b4abae6a40ca653ab1dda493a6dd92700c0cd38e4f9f610998f9aaa40e41bcd6675c9dd8e82d71ebcd3993155ffb274fc9c060b93f45afc WHIRLPOOL e6a1ce91f30b4b2f59264339d50ba8ff6c7912ad08c7386d056c8f3414d6ce57f357a75762272a0056b2a32519d52ef04ba29e82ddc54a5c06845745c9e5ed6d
+EBUILD glibc-2.20.ebuild 6167 SHA256 a0e72107a083c87ebf91a8c0c43ef4a2086d468e8c3ab235e1784fa9ea36ab3c SHA512 32e2729ff56ff45991de497727409dc633c855eb8ee4aed30a20448257605671c18d1d13e3aa09e07e129bd6a767f7ccd33fb9782cc15f71ee89cfb53851ce56 WHIRLPOOL 0783333312b9ed782d046a814b67514826cfd3ebe2019b0e73bdd322cb695ec875effa99e7be123f4e7fa78f6e2948076ca48a9c4b36910a43c586f070e10771
+EBUILD glibc-2.21.ebuild 6451 SHA256 99c06589652a6ef696d0c12f685fd9eb8525441f4118afe1847e9b9a58941da9 SHA512 35a2f21d3f6a5cbbe82efd7c2315aeb5044130bc363bb2da460abe2457c0ca74b6f0b4828cdc26cd38f40e7dabee69ee104cc3a78173f52f1001036702a2f38a WHIRLPOOL c8bb1b86cad8ce316736249c81cbfeba4a6131b2e8b257f373873f450e3a8c36c6f7ba36dc09a9ae23aca31cd47e0c1d04b27fb937fe3a86a7bb62eaaf8abd09
+EBUILD glibc-9999.ebuild 6196 SHA256 4424928f8e681c2d87d15eddd55e9f083171a9ee398e467eb71ef10818fe5394 SHA512 8e6969eb56569045a22f8a048f29fb91692bb18312b3c8e56781c952b0c68e3c082964f7ab7943505e47214dd282f66da1cf524b7898532e7f8bf55744a1b036 WHIRLPOOL 780f2272244eb78ab48bc5cb25db5b5ced4a791a2c5a184e5f627285bb960f2f13b360297703499aeaab85243866e6dc8b5c3c0870a58b5229e4d8de765d65ce
+MISC ChangeLog 76039 SHA256 f5beb8de8f7e86f2e0eacfaf18632368911e85a95feda57b673d439405811f85 SHA512 a376be86d93283dea7cae26716fa92b9bec0023432d20547bbbaf9662676544005eff0c5f8412e4e2ddf1658d861a92d126a50a3c9e498c06aa0d341265ce23a WHIRLPOOL 73cafd1636bead27d697bfc826de8596ed7ad3d0c763906498ff3f76d46df6d2d3a5518800ea009077d643f65eae7d8d2525dcb4ef62d274aef237efea07f564
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVXV3oAAoJEA/daC2XTKcqraEP/j/zHTri4jdJw2OuEgqno0zJ
-wlGn+KGm32UDO3TstN+nsybMn2shlUND3kFw/qdBIcxa73w3YtpnVetPj0MQtjZQ
-BxYK2jqVceKWFcyXFFax7Enmfn3Cg0wkq+CVGK+u9uvdXXSbdjCw/niIza2BWhn3
-mKfY8ORxHDnNp7b63D4/qs9ydAxRU+FnSae5296NJyS3B6HS3ymRc13U4/lBqaog
-FGKlj7KAY75vGhKYDbhpL/cF8kv1IL30PWZRppQhSbol1kMTx2SnwNM1VAleHsVi
-7xVRoiAUthN+giu3I1AVN/XXCZuMVkKglsZva5ZBMS0kg4OExBsnRd66cEPnBmTI
-6DfOcS516LNE+t7Up1BntHOS28br33/PWt8gU7m0c0rnfgJuhWe/rKScYfELmiPZ
-XfchGJ25YkvXX9za7KoAdl84PQVflhlgT9MMVgWVAvM0zOt3/CQUgpeyKrH7haeR
-xapzkFLzX59nCFkmNOk/oz9mhXZdVFXgSCtQRGz6dxyQtjcEVa7fXp2YaqFLlJt9
-77je/J1pHO6i6JXgq69jiZY7r9pCv6Xt+ERo/8k6Bbg8hUFZvLYsoGzI3ac0vO/M
-7cpwxinBbijOe8BjKBT/l7pauY/yUlbHZ1rGLeMYc33tPcxLpJWtiuoEdptvXfNY
-vVCYvJE4eBAZeag5ewu2
-=00zY
+iQIcBAEBCAAGBQJVZczgAAoJEPGu1DbS6WIAe5oP/0qiB9aiaotUaFVfoUHgASXE
+7MjmWUUO+9yzzyMwFltxWqlWJc9gouNA+wMY9R4V/kk24bGBqIXLUbpn/kvXO7H5
+3BMWhkPWiyFHAsmGeuZdMjs6CrEUM42KJbr0k6ypQ73HI02oVvi/2kqhuDv5IQiE
+KQ8ylODCbV/Z8z+/PSuzH/wou40sFdB6/BALa/EMf4maLSh5eNobhL8Mm1A1/oXQ
+mTZgUuoIhEe0N4X/PKgRl9WITxW1aD+QT7lZCt12wp/GC5u8qPqDZvIN8eN2tHZD
+DNX425SpwC9vcI7DKXi7zy+Kb+C/ZLDElS5Ym2JcY9ODOoyKz4D985Xog1AgcdA7
+LINZVP7T7hZbIbQ9eLxkrWoTfwCa4RQUrDEQey8/O7wnr5drC1iUYeC74ZUjSwSg
+nZmIn2o27H4nEiHf6i7qKsiCxGHVmg+IuXaDQmFteK9Tz57qnh1LZV2GSA8X2nLg
+xdIlfCDbK+/9gXLnTq4p4Foe8XbsMTPWr55BDsfx+KJRJCwFXxp4uGepCNotIXsc
+Kz8h1NZEbeyo7AEl/PKeN2volj6Mhvg34EQaW4mS1F+s3BM/sKHrmdBb2+GnW7R5
+i2ABQBB/F1gmjxnzK+nCklK9SK56N1GqLQvYb1cZXUscUWlxkOLuZk+/8yNj++1j
+ndxgRZ8YZ9Lhw+C8gh5a
+=s+on
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/pkg_preinst.eblit b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
index 0fcb24a09e1a..47d23767f015 100644
--- a/sys-libs/glibc/files/eblits/pkg_preinst.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_preinst.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.13 2014/08/10 03:35:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.14 2015/05/27 13:55:42 vapier Exp $
 
 # Simple test to make sure our new glibc isnt completely broken.
 # Make sure we don't test with statically built binaries since
@@ -53,17 +53,8 @@ eblit-glibc-pkg_preinst() {
 	[[ -d ${D}/$(get_libdir) ]] || return 0
 	glibc_sanity_check
 
-	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
-	if in_iuse suid && ! use suid ; then
-		if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
-			eerror "In order to use glibc with USE=-suid, you must make sure that"
-			eerror "you have devpts mounted at /dev/pts with the gid=5 option."
-			eerror "Openrc should do this for you, so you should check /etc/fstab"
-			eerror "and make sure you do not have any invalid settings there."
-			# Do not die on older kernels as devpts did not export these settings #489520.
-			if version_is_at_least 2.6.25 $(uname -r) ; then
-				die "mount & fix your /dev/pts settings"
-			fi
-		fi
+	# For newer EAPIs, this was run in pkg_pretend.
+	if [[ ${EAPI:-0} == [0123] ]] ; then
+		check_devpts
 	fi
 }
diff --git a/sys-libs/glibc/files/eblits/pkg_pretend.eblit b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
new file mode 100644
index 000000000000..963a9ab13efa
--- /dev/null
+++ b/sys-libs/glibc/files/eblits/pkg_pretend.eblit
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_pretend.eblit,v 1.1 2015/05/27 13:55:42 vapier Exp $
+
+check_devpts() {
+	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
+
+	# If merely building the binary package, then there's nothing to verify.
+	[[ ${MERGE_TYPE} == "buildonly" ]] && return
+
+	# Only sanity check when installing the native glibc.
+	[[ ${ROOT} != "/" ]] && return
+
+	# Older versions always installed setuid, so no need to check.
+	in_iuse suid || return
+
+	# If they're opting in to the old suid code, then no need to check.
+	use suid && return
+
+	if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
+		eerror "In order to use glibc with USE=-suid, you must make sure that"
+		eerror "you have devpts mounted at /dev/pts with the gid=5 option."
+		eerror "Openrc should do this for you, so you should check /etc/fstab"
+		eerror "and make sure you do not have any invalid settings there."
+		# Do not die on older kernels as devpts did not export these settings #489520.
+		if version_is_at_least 2.6.25 $(uname -r) ; then
+			die "mount & fix your /dev/pts settings"
+		fi
+	fi
+}
+
+eblit-glibc-pkg_pretend() {
+	# For older EAPIs, this is run in pkg_preinst.
+	if [[ ${EAPI:-0} != [0123] ]] ; then
+		check_devpts
+	fi
+}
diff --git a/sys-libs/glibc/glibc-2.20-r1.ebuild b/sys-libs/glibc/glibc-2.20-r1.ebuild
index 051a2062fdaa..f2ee775df6d7 100644
--- a/sys-libs/glibc/glibc-2.20-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r1.ebuild,v 1.2 2014/12/31 08:22:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r1.ebuild,v 1.3 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index 7ef195447294..408ee90ebefb 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r2.ebuild,v 1.10 2015/05/21 04:23:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20-r2.ebuild,v 1.11 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.20.ebuild b/sys-libs/glibc/glibc-2.20.ebuild
index ad923e59e335..74b98738a126 100644
--- a/sys-libs/glibc/glibc-2.20.ebuild
+++ b/sys-libs/glibc/glibc-2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20.ebuild,v 1.6 2014/11/11 02:08:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.20.ebuild,v 1.7 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -144,7 +144,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-2.21.ebuild b/sys-libs/glibc/glibc-2.21.ebuild
index d21bad93b35d..0980691694c8 100644
--- a/sys-libs/glibc/glibc-2.21.ebuild
+++ b/sys-libs/glibc/glibc-2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21.ebuild,v 1.3 2015/04/27 03:44:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.21.ebuild,v 1.4 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index a99491fd2366..e08c5778c0d5 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.28 2015/01/05 13:39:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-9999.ebuild,v 1.29 2015/05/27 13:55:42 vapier Exp $
 
 EAPI="4"
 
@@ -145,7 +145,7 @@ src_test()      { eblit-run src_test      ; }
 src_install()   { eblit-run src_install   ; }
 
 # FILESDIR might not be available during binpkg install
-for x in setup {pre,post}inst ; do
+for x in pretend setup {pre,post}inst ; do
 	e="${FILESDIR}/eblits/pkg_${x}.eblit"
 	if [[ -e ${e} ]] ; then
 		. "${e}"