drop overshadowed copies, no longer required for testing as the delay problem has been narrowed down to accelometer working in 197, but not higher

Package-Manager: portage-2.2.0_alpha172/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 14 insertions, 966 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index f6d5963988d7..b1cfebd81ea3 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.904 2013/04/13 21:00:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.905 2013/04/18 02:14:20 ssuominen Exp $
+
+  18 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> -udev-198-r6.ebuild,
+  -udev-199-r1.ebuild:
+  old
 
   13 Apr 2013; Agostino Sarubbo <ago@gentoo.org> udev-200.ebuild:
   Stable for s390, wrt bug #463614
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 6e4d0a3fc672..3d5c14d75810 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,30 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 80-net-name-slot.rules 1820 SHA256 f958d54247f84cdbac3e1b77261d6bcf7c630343ee6e70e4e59d0f3098d774f5 SHA512 13671a02b7504d77c5834f3835a1f8adef4faae04653f30ca177c6d3351fc7357b659cafe0392736ad76201e838c396364f42fa6ae3ee9f1ffb7babd50b613b3 WHIRLPOOL ad06ca6bc7d5f336cc3d3a2cac6bfed0b0f2fd389f3638115f402e7c840df442e3a249f6436034c158d42f0d64f0a6af88dae8afd44a80b1219f31700e37f899
 DIST systemd-197.tar.xz 2054644 SHA256 e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 SHA512 df158f85dee4c38dc2ff305bc03eee3b71d77eb683ab2739549282f7d552af4d2a247f52241f68e1b7c88c668bce93531986a39937a99cac401791ec95916769 WHIRLPOOL 027fc6aa5972988173721b120b8c1f371bc02d3066e04ea0923d6cc70778a3381f600a865aa136b5789755fbd5358e97304da265f8937d789a28b33cc778df46
-DIST systemd-198.tar.xz 2140964 SHA256 444492355e5ff0ad99e0691ecaff1081ee8d45901580f47ba8b74e56107c71bf SHA512 29b07d934dbcda876feddf2b93c1f35f4bdceb0ba76dd18563e79da65a794b2450b283b6ec93b09828cc8fe918e007511f3bb2218fb0bcb3cb2fdbf940d3cf71 WHIRLPOOL 9e124534121086b666e285adff44778d03f42d52c13ef78281728882d79fa32fdd58e27c41d7f8402a62b20bff65fdf1a4a3ee4680c1327cf7895169c66c07c7
-DIST systemd-199.tar.xz 2101604 SHA256 8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed SHA512 fd0174b69b9709bc93123956389f2264edd7105b60b58487473a39f1c0022a2e91ef6ccf01841406ab51262dbb583a03bc3ee351b664ed698cfa9e2f38fd24a4 WHIRLPOOL 1383e1fffbbf847186275dae72e9700a8d12dddf5ed7fd969ef637bcef68375071ff0383e015063621e28166a5739dfb26bba32aa8392a3bcbc0f0e6935e41a4
 DIST systemd-200.tar.xz 2109864 SHA256 9a08baa8fa5c48f0aab683b2f771e4be75c3c852afc45e5cb4df06428ac8c217 SHA512 6ad440f91dfa5a739a29d07c4144a2faad627a523c4f893656693cdfbdf2a6048f84d96e06ebe805ec18d04e5a1760c9efdcec738654d006a348c0385a983833 WHIRLPOOL 7969f2410aad42c60ba5b979727f5e90be62a5826aabfeb3103b8284115120a5c8c944d0631eabff719dfb84a4096b6eebe8e6dc3718ee47a3672dc1089be371
 DIST systemd-201.tar.xz 2128876 SHA256 d6299f1a0bc2122002d731808d3825c6b566d1ffe899c03ed5ebec7e70c8cc10 SHA512 e181b0bd0d0169890f99733d5e61ca506115b50d702b24895add5240ef3929ed9add87b0d3fd34a3366c1830339f6e4b5aa50f763f6d7d75b80ce677d35c385d WHIRLPOOL 84465cc8b3a97c2fbf120c8515ced6a759c1dec2df525b92a552308e1060475bf889de92a05ad470a2d56b582e3190dcc37aa4d009c8a0714411894cfed99376
 DIST udev-171-gentoo-patchset-v2.tar.bz2 2961 SHA256 9a4a11f8da06337a48291fad02e83b7787c3e5d0fea848f9ac8e67d9306587fd SHA512 2aea1c27596c61a0cfac573d74863783bd81e586ba56de01735856ac7c36738912e1d54663705a2af70fbbbb2043765933ea4e409ab913232913fe22369e78f6 WHIRLPOOL 8d4b54ff916ccf95b78577c5d5ca003460d4d8bdb4065053c03aee937ac28107ffba718cf9fc80bf3a50803ae09c161f72da0a6c57dce806afdcff2057bd17bc
 DIST udev-171-testsys.tar.bz2 155001 SHA256 7383701b64701f58f16e0ddb19fe33b4eb53fac6fc6068bdcbff7e6325b79dcc SHA512 f3f537d771e36b87c71004f5576f7672ffeb815d0b5337bb6bbb6e842c32a28d1d92b4eb0ee2edc60c0b8bd576fc2f36e8b0ed16ec9c0cff9c216e04fb1438ad WHIRLPOOL 0ee66df2f52496d592d0dd3de7c628f6deee7f41c2d21e745f22d74e61c276e01cc6ba584c65b05d36c8a4fb14bc54e3e1a89b975751929b19e91458e3550253
 DIST udev-171.tar.bz2 597937 SHA256 fed1e46074c1a16c828193ebd73b3940b7905cc7dcaeb0b3c720d4615210695e SHA512 dea189d79b195f8c10740507b11de2c2074442301ee52a0b2c62efa8663e1793c1a78b03b95510ba19bc93d4dcc497120fbf6bb5784878aa903973f76b92d42f WHIRLPOOL a93241b0f0645696e6a88ddb152c3ef8f2c73b5bf3591892384f180fc7abeb580c59642013480546eac00ad5028b1900ad35b88f6a27ad2d07792e9f34e59743
 DIST udev-197-patches-5.tar.bz2 4009 SHA256 bc497ec33de05cceb40ad23f5c64965438c747cfce5d6d26dd59e0866764da9b SHA512 5f7529c49bea5f1779dfd6e12e792c53f22a20655257e92d23b142f051bacf01ebea07ad2fd9c7c4c33be65f3fccd91024864412dbd1c707710b661aed03debd WHIRLPOOL 0ff7acf7d10202d86576713d4050ce788fc01135e7cf69b71428009b817c1e39c8f097c744dc7ecf88f411b8705fbadf82bcdd9f109744032093ce4045f05f43
-DIST udev-198-patches-4.tar.xz 2496 SHA256 96665cf9d491f2af7ef167278abd528c49478b3a452284f3d0284647347baea8 SHA512 261e57af4b31cba9ffa37eb660c16cbe9e5426778cc489c06245d6b6609845ca45d03b83b2e656c7e95ddf2a4f73cc64076b9414850061ff92e2c5ee49bdb65b WHIRLPOOL 3dbd720bd4abe7e9c49e7ce6e3dd0349d7e0cfb5444b4d7bd126cdeea5209998a443d0a4455bafb5a25878f457c4c517ee46c9c8808432fbedbfdd68fba695ce
-DIST udev-199-patches-3.tar.xz 2024 SHA256 54d754d2e4571bfc4a725fb9271ea498806fa6bfe96e3cfd6e9bc9b78edbe4d1 SHA512 a280e633eb168ab64b1f59156d1930bbe541b9412605ae5439113aec62403c445d8b68d68205d1ad65d8d633315aa75af3a1a431ae7ff846bdff97bee4cfa774 WHIRLPOOL 130a0d28fd8e248e5ceea45000f587dd1f9808795188cf66037003bcd9be426a04d46de6deb44c76b14b7aaa00bfa629d827d48ea7133d21503a6cb9dba89c22
 DIST udev-200-patches-1.tar.xz 1712 SHA256 8e1ca63b27a4db7a6d3d76cb700ff88a48404c471795b1994b791460d59b8c71 SHA512 3aadfe615d7dc48adfc2e43a03a2ce9e008da0672acb7c18f917d8b50e2c2e39b9a7c47c36f5474b0de22716541ac83532b1a8dd08d17af003d0d30ac811881e WHIRLPOOL d49f610aeba4b19f4a337e3533815e8648fb5324cd6926570949f67645d150acfb39833ae62af855ff1bfb5c1791f687b4e14328a9b7de1e65e5e09d0308c4f4
 DIST udev-201-patches-1.tar.xz 1284 SHA256 96a028e2039d1ead42dd7949625a2f39a851bc26cc62a3fc944382b25d95e21f SHA512 c6f6f2af6c1899d8e39286cc5e9cc81f6add197ccee5f079be0bb3c20c51eea72d7534a1e9c8686d1325aebfce7f95aace81d0624179961fc97ccd2205db6a4b WHIRLPOOL 844a4a5286d579e0a9de73be676d5a73d49ed3e17725457fe52952152f6390bec491f5ec9e0523507ee17438d6c95b77986048864bef0264f7d06569542a77cf
 DIST udev-gentoo-legacy-patchset-2.tar.bz2 14282 SHA256 bb2aefa50c3cc6df8cc88903b0e05a8cc9f44a612a8038abd05f37b342f7e235 SHA512 b18ccdbb4373021ee9f32b4e10dc1b846b64a1222d4a556370ee78efac530d7a868c8924d449a2d503ee12667e603c50514e3f3c4fc08b608a9676574587f073 WHIRLPOOL 765c6f411a793bcdd9d452c7f36719b1d0dd741b3d6da0446fa459d2a0207220d609a0a3ef500411faf7e308ddf315f27a19e179cb7f54bee52ef3f033773a3a
 DIST udev-gentoo-scripts-7.1.tar.bz2 16257 SHA256 1923768a98b7f00ffdc9bdf5a2c9982c494b978903ec891184d6fa0d10090fb4 SHA512 663fdd750b3f1e52a4c7639d0692290cdda9d202d4408e8aba9bfd38aaccfaa0acb79e303e98872b721cf109c62ac46921785cb5a373cc6ad8b428d0f5192836 WHIRLPOOL 49b600b034f8a6ad5e0ae6ca769971f1bb517fa0b9e31a0a7d0430ae67cf21bf4ab1db981d3eaaf78819d1e75a24a1f101eeb737448763b2990e38da912636be
 EBUILD udev-171-r10.ebuild 16093 SHA256 37ef3115e14d68f23cfb7cf620423b72b460dba04b36f20f6646607381e2fb40 SHA512 3b392d78a30e1a7cb6c085aae7b876c107a920b777194e475b6e10f9f09231dd3cd69b76b501d2354b7a032582ccefee861d4fbbe2bce5aa7a65fd3310b87d84 WHIRLPOOL f2a7b62bdf984121bd9cc8127ec3e912792a3affe1c097bc7c765a4822720a574412c4d18895e4c705b9bf6fbd8dcc3c554516bf2a8cae28018e39dad8601959
 EBUILD udev-197-r8.ebuild 15057 SHA256 854d75fdb78b73399cb6f096c26cfbc640d8ca077fc62b1c63f5e9f6de62f36c SHA512 9e4da40b18bc6da38ccedc6675558672c1d7d73144fde6204fbaeea5f5080fd985429da0f54429613c98e8e9802505f9ce456874c143e5017e191a3df6875964 WHIRLPOOL 4485b8c1096f016f3bbcc96aa7ad119b3ca44604827afd9f1aa6c23172a66705f67522662539b9626b138a79833082d5979fa795777de25e128b7fd125e5e1e4
-EBUILD udev-198-r6.ebuild 14100 SHA256 2be2c5d05bd7b545dd441da4c362150cbd8ccff5b189568944a8f9295d7c5573 SHA512 0fcd54ad6cc43d78d319f2af1e18f5204c1ec1f2160ba42c6a3ca14473b8efa0910a5aa2c05d11e3e9cec0bfc25feba6ee069937a9b2d3711b66f20cb0164862 WHIRLPOOL 239ea3da7440e364e38cf727665db1b3905abfe22f661fab02c6ca62af668a623b9823d03b4f698fb0360f712a4f2415f98519414b6bf1120c2ceff2c042084a
-EBUILD udev-199-r1.ebuild 13431 SHA256 5a5bcf594ac89064595062c5c0f13fd0f0726d6a26ad951d06bf81ba08a869e4 SHA512 a2228bda9367b4911121add3a76020ea0d2a48788ebce75e7eaaecb970839c0c1903bde8c4350b59a3240cf73b27949219511157775b89f1bc64d2cdd3313cf4 WHIRLPOOL bbf0856586fa28feda5e1892a9f6f8910ce2af58afed37d8092af75550195bee49014109ae349ae1cd3f1f5a33bd3dae03623b1585cb8f68879b625fe7e59e00
 EBUILD udev-200.ebuild 13517 SHA256 f8370cb208a9bcd1de65e363b7b6fef59e6e9a8a289861829f6490c86f181f90 SHA512 2cc8e19931b988db3e2a86278521baf0acaafa93d0a371f28508c16ed263a663afe50ba1ed38824ea0d4a97849bf961cf6b3301128339fabb06c4c0a0a462f78 WHIRLPOOL 18a2d8e051d7288a40c6d9a9ac32d9878af6a3c1d3f9e2cdb4ebbff33a278fd1c757ec6cb6a4c8bb78fd4c29b12ddbdd537cc62da47cc34a9d8800e868b24dbd
 EBUILD udev-201.ebuild 13465 SHA256 99ece177e42d6645f67e9c2ce799230b66bb39643986b8174a77af9682d3b80e SHA512 c715be982a340c08c8f081c194ca1c32358922b700a9c51789369001e76ec059dc6631858b5319704c81de54bb39c77a3eb0cd38ae74561be8a1d23ffcbf82e0 WHIRLPOOL 9c76c6c2b16e53201b5e462026c8bed421c1be8c9ed53406d28cc47256ad07b169ad013ce08fbd36947e692312fb19ec2f9ce2813061dae0064d5d914f43c481
 EBUILD udev-9999.ebuild 13467 SHA256 da2f98fa04288ae94cc72ba3e79fd7b23f949a75ab7f01afb64741791ab2b3ee SHA512 5e3012bd9660b50f512cc1bcaa70861f9b6e3f7d96d4b2c284f8ba0f22c593ea138013185b9f8d5504c3154639c96d7b2983abe539d9464383fe579b17f061bd WHIRLPOOL 6b03877c23727d7e13bf157a46b110d8c41aa6a311e227d2f2f065924fc2d7fbb2b9169f014ce329d2ea9b68dedab24f3d22387eb841680c522e50e755af574b
-MISC ChangeLog 25115 SHA256 ef15024bd9a2417280486997a7b0ad26c8ffb16abb3912014098c204756eae3f SHA512 a3e076d44babf95a1af9ab9f0cf0c0bb747ce15b5e9f6178e1445c863eb0090eec057972f7a56724697f303d5c00d58fa5a84547a5cc6d6e40275a295c439f09 WHIRLPOOL d461f7c10e89d0b7e4159b84d9ca67be9ff648a7163ecd011ce0bd8017c03153388a8e1ed4ccc0959f364a8541ccc599bf6068745c1fc389609c95a7c4a445c3
+MISC ChangeLog 25226 SHA256 e7e0d5d7529450e83bf2fbac87504731965c617843fa4c377f9d161391e3e99e SHA512 2a2247b37f589abb85d568c01793d106a21ce893cc8c2222c6d4e97d8f82a118f108529a3c6aecc74811279ca8686b577ff3e30e0f398637d49a3139cd1a176b WHIRLPOOL c37a06b89470da63855ac1a7983d73793c75dbc4df5cf011856d3284a1e38fde380a123bc973f8e9ecd5b4d9c3bbaecd75305344bc2dc0218199e5469b0a7edb
 MISC ChangeLog-2009 105929 SHA256 94137298457e8d6361cf25e664279d2f9b424f6758814e7ba90e9e2cbf1ea7e5 SHA512 f110e1aa70b11c28263ec5e88973c99426717bce62400c8e9ad860b9e7b67d4aadc053596a9e54faa9435a774c1e8aa0954ae8541760cf061beef26867871548 WHIRLPOOL 215252c0a5c249241813d1bb208da62e68c858e07d1df327cf9175ac739f214813a33c09a64afb4821445e93394dd6d6d500b33e35ed912c1eeccff3365cb7fb
 MISC ChangeLog-2010 10729 SHA256 44fe328d57b1ba342b328c7a256632e7960976a12e8e9c9791a5fc8ce52c67ca SHA512 a8c371aafe757923e24c023cbf55f3ad084f15f0f038eceaee0dffe58919a17b17bc16cb4b7b1d3f65a19c82b20330a854ec2c801f6d7c7799723ab92d255b49 WHIRLPOOL 3d34e758def921d3d2ed7369392ba5f833fc3a899181c2895fd3da6c9846cf41c9eddbf56de60a52fadd76ffd4c66d92b660b0bc6ca4dddbb2fa49fe0f93cb0b
 MISC ChangeLog-2011 11721 SHA256 363429a267f251b1ac1c34479e7afa5d7ea13811aa1ba46d7c5489860e542276 SHA512 be7bbaa68602c30ba9cb3e5037ee91ff94c35a0c2ff0b96c5eee14c0e81f8e52232bae44f1d01ff23acedabdb03fdc78f3d11a40cfed2cfef1c45fe2492f7bf4 WHIRLPOOL 3e85eb967f26a8224fd0ed5824009c62271fa5269a6a207da8c8abd7b09cc4308ff847021afcae5a86cedd723a5aeca1ce2f6712a187dfbd36118e097d74510f
@@ -33,17 +27,11 @@ MISC metadata.xml 1401 SHA256 815b72b43c692168e9f22804504b01260004c14787265a45ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRacbiAAoJELp701BxlEWf+TIP/jksShJC9K7ZoUEyR0xI9eao
-P29AWFksrAw8BXZ5azhubeANWvottzFTFNs72gnHyPCINqgTBlOae2K9xlfbLxTq
-QsVTUOqUXO23dsSyU2qEnJlh9VMKD/TX9qXtc45Agvn7PgE01ag/e79lEbaHVR+6
-uXdRHbyCV6neXlrwCemFdO/F7vmaAKyBDqWf+JIc3rsCahsNw2ZDdbZrkp4+NA05
-taLWRI1jNqO7y7yUwFUQJbnllnqCsgTNWU4u+cvKdcm/+SB40nDOLRydFexDkA5Q
-lu6jWz0k6/9co6OUPly2N3JPyJy/CxjaiieBr8hhEAdCK3IKveyG/aI1eyMaFVU5
-EyBaPnAvxlnbA2TwURD8J+LDxOByQHRiq251/zd7QZ/GptpW/qw+T4nceqTFHMhm
-iWOiHXGgAZb5xw0UPFazkSMyVK3WNrkcLYpqKBMA6QefQNARP5ogFFEyMn881Iox
-SIlHNDnvV3cSGzHyB977m2dSC6E9IMBTIqHdXIhjDCXgG34X4C3ZDcU/HQHEbjg4
-AlJY/LZfFaYFcabr0yAGB6cyjBdWQa3JAsTGv6SPdLj8zLUxi4xPsmMRfVE0eo8e
-CmutZ39g885QMqJUs2/M5Lf/WpaFTmB/atnPBvsXUP9+Xu6SAJVV/LZjh6YSCZv6
-e3wtKnEJDDgaNoftk5Cr
-=dwaL
+iQEcBAEBCAAGBQJRb1bRAAoJEEdUh39IaPFN2isIAJ5htBE1RFUxdFNdd/QhZLxK
+B/MgGcJVqyfCJJwN9mxnxQDH0KYFY9iRHHCSmkAkj8s4QxNG8nO5yIo9gEldCpzZ
+QlhAA0lOKoagSYMJPJ7hmxwWmGR+FohHPfx360QhgnWqpYowIwYmc/yt8gkXo+9p
+42VM5De60fXOgYt80vK5KHNjJhJbaYcJnGNsLRv9w1AtIMeB/uqP7NJqhIFBpa9B
+0JXoPN/gsHDM6M7SKGKWiAQYUWvNw2FOGvvJOn8l38SLfLDHwgQNWNOX/2/V2o/7
+wQiCBfNAFxCfWvinSf5FbmBtFVJ9qm+y3i7oD/3N597vi6MnCsmO8Wk+8YgIXTY=
+=JylP
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-198-r6.ebuild b/sys-fs/udev/udev-198-r6.ebuild
deleted file mode 100644
index da1ed8079de0..000000000000
--- a/sys-fs/udev/udev-198-r6.ebuild
+++ /dev/null
@@ -1,482 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-198-r6.ebuild,v 1.1 2013/03/24 10:45:41 ssuominen Exp $
-
-EAPI=5
-
-# accept4() patch is only in non-live version
-if [[ ${PV} = 9999* ]]; then
-	KV_min=2.6.39
-else
-	KV_min=2.6.32
-fi
-
-inherit autotools eutils linux-info multilib toolchain-funcs versionator
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
-	inherit git-2
-else
-	patchset=4
-	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
-	if [[ -n "${patchset}" ]]; then
-				SRC_URI="${SRC_URI}
-					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
-					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
-			fi
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl doc gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	acl? ( sys-apps/acl )
-	gudev? ( >=dev-libs/glib-2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-12 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/systemd"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	keymap? ( dev-util/gperf )"
-
-if [[ ${PV} = 9999* ]]; then
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		dev-util/gperf
-		>=dev-util/intltool-0.50"
-fi
-
-RDEPEND="${COMMON_DEPEND}
-	openrc? ( !<sys-apps/openrc-0.9.9 )
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.97-r1
-	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-22
-	!<sys-kernel/dracut-017-r1
-	!<sys-kernel/genkernel-3.4.25
-	!<sec-policy/selinux-base-2.20120725-r10"
-
-PDEPEND=">=virtual/udev-197-r1
-	hwdb? ( >=sys-apps/hwids-20130309-r1[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-23 )"
-
-S=${WORKDIR}/systemd-${PV}
-
-#QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"
-
-udev_check_KV() {
-	if kernel_is lt ${KV_min//./ }; then
-		return 1
-	fi
-	return 0
-}
-
-check_default_rules() {
-	# Make sure there are no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	local udev_rules_md5=e602584bcabf09cde0f7f9a3c1adda28
-	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
-	MD5=${MD5/  -/}
-	if [[ ${MD5} != ${udev_rules_md5} ]]; then
-		eerror "50-udev-default.rules has been updated, please validate!"
-		eerror "md5sum: ${MD5}"
-		die "50-udev-default.rules has been updated, please validate!"
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL"
-
-	linux-info_pkg_setup
-
-	if ! udev_check_KV; then
-		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-		eerror "It must be at least ${KV_min}!"
-	fi
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	if ! udev_check_KV; then
-		eerror
-		eerror "Your running kernel version (${KV_FULL}) is too old"
-		eerror "for this version of udev."
-		eerror "You must upgrade your kernel or downgrade udev."
-	fi
-}
-
-src_prepare() {
-	if ! [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-
-		# gperf disable if keymaps are not requested wrt bug #452760
-	if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	fi
-
-	# backport some patches
-	if [[ -n "${patchset}" ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-
-	# These are missing from upstream 50-udev-default.rules
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific usb group
-	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	# Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
-	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
-	EOF
-
-	# Remove requirements for gettext and intltool wrt bug #443028
-	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
-		sed -i \
-			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
-			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
-			configure || die
-		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
-		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
-	fi
-
-	# apply user patches
-	epatch_user
-
-	# compile with older versions of gcc #451110
-	version_is_at_least 4.6 $(gcc-version) || \
-		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
-
-	# change rules back to group uucp instead of dialout for now wrt #454556
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	if [[ ! -e configure ]]; then
-		if use doc; then
-			gtkdocize --docdir docs || die "gtkdocize failed"
-		else
-			echo 'EXTRA_DIST =' > docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		check_default_rules
-		elibtoolize
-	fi
-
-	if ! use elibc_glibc; then #443030
-		echo '#define secure_getenv(x) NULL' >> config.h.in
-		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
-	fi
-
-	# link udevd(8) to systemd-udevd.service(8) manpage
-	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
-}
-
-src_configure() {
-	use keymap || export ac_cv_path_GPERF=true #452760
-
-	local econf_args
-
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--bindir=/bin
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-html-dir=/usr/share/doc/${PF}/html
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
-		--with-bashcompletiondir=/usr/share/bash-completion
-		--without-python
-		--disable-audit
-		--disable-coredump
-		--disable-hostnamed
-		--disable-ima
-		--disable-libcryptsetup
-		--disable-localed
-		--disable-logind
-		--disable-myhostname
-		--disable-nls
-		--disable-pam
-		--disable-quotacheck
-		--disable-readahead
-		--enable-split-usr
-		--disable-tcpwrap
-		--disable-timedated
-		--disable-xz
-		--disable-polkit
-		$(use_enable acl)
-		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable keymap)
-		$(use_enable kmod)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-	)
-	if use introspection; then
-		econf_args+=(
-			--enable-introspection=$(usex introspection)
-		)
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_compile() {
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		systemd-udevd
-		udevadm
-		libudev.la
-		ata_id
-		cdrom_id
-		collect
-		scsi_id
-		v4l_id
-		accelerometer
-		mtd_probe
-		man/udev.7
-		man/udevadm.8
-		man/systemd-udevd.8
-		man/systemd-udevd.service.8
-	)
-	use keymap && targets+=( keymap )
-	use gudev && targets+=( libgudev-1.0.la )
-
-	emake "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev
-		use gudev && emake -C docs/gudev
-	fi
-}
-
-src_install() {
-	local lib_LTLIBRARIES="libudev.la" \
-		pkgconfiglib_DATA="src/libudev/libudev.pc"
-
-	local targets=(
-		install-libLTLIBRARIES
-		install-includeHEADERS
-		install-libgudev_includeHEADERS
-		install-binPROGRAMS
-		install-rootlibexecPROGRAMS
-		install-udevlibexecPROGRAMS
-		install-dist_udevconfDATA
-		install-dist_udevhomeSCRIPTS
-		install-dist_udevkeymapDATA
-		install-dist_udevkeymapforcerelDATA
-		install-dist_udevrulesDATA
-		install-girDATA
-		install-man3
-		install-man7
-		install-man8
-		install-pkgconfiglibDATA
-		install-sharepkgconfigDATA
-		install-typelibsDATA
-		install-dist_docDATA
-		libudev-install-hook
-		install-directories-hook
-		install-dist_bashcompletionDATA
-	)
-
-	if use gudev; then
-		lib_LTLIBRARIES+=" libgudev-1.0.la"
-		pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-	fi
-
-	# add final values of variables:
-	targets+=(
-		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
-		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/udev.7 man/udevadm.8 \
-				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
-		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
-		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
-				$(sysconfdir)/udev/hwdb.d'
-		dist_bashcompletion_DATA="shell-completion/bash/udevadm"
-	)
-	emake -j1 DESTDIR="${D}" "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev DESTDIR="${D}" install
-		use gudev && emake -C docs/gudev DESTDIR="${D}" install
-	fi
-	dodoc TODO
-
-	prune_libtool_files --all
-	rm -f \
-		"${D}"/lib/udev/rules.d/99-systemd.rules \
-		"${D}"/usr/share/doc/${PF}/LICENSE.*
-
-	# see src_prepare() for content of these files
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doman "${T}"/udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-}
-
-# This function determines if a directory is a mount point.
-# It was lifted from dracut.
-ismounted() {
-	while read a m a; do
-		[[ $m = $1 ]] && return 0
-	done < "${ROOT}"/proc/mounts
-	return 1
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT}"dev/loop 2>/dev/null
-	if [[ -d ${ROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# 64-device-mapper.rules is related to sys-fs/device-mapper which we block
-	# in favor of sys-fs/lvm2
-	old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
-	if [[ -f ${old_dm_rules} ]]; then
-		rm -f "${old_dm_rules}"
-		einfo "Removed unneeded file ${old_dm_rules}"
-	fi
-
-	if ismounted /usr; then
-		ewarn
-		ewarn "Your system has /usr on a separate partition. This means"
-		ewarn "you will need to use an initramfs to pre-mount /usr before"
-		ewarn "udev runs."
-		ewarn
-		ewarn "If this is not set up before your next reboot, udev may work;"
-		ewarn "However, you also may experience failures which are very"
-		ewarn "difficult to troubleshoot."
-		ewarn
-		ewarn "For a more detailed explanation, see the following URL:"
-		ewarn "http://www.freedesktop.org/wiki/Software/systemd/separate-usr-is-broken"
-		ewarn
-		ewarn "For more information on setting up an initramfs, see the"
-		ewarn "following URL:"
-		ewarn "http://www.gentoo.org/doc/en/initramfs-guide.xml"
-	fi
-
-	local fstab="${ROOT}"etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, http://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT}usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	if [[ -f ${old_net_name} ]]; then
-		local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32
-		MD5=$(md5sum < "${old_net_name}")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} == ${old_net_sum} ]]; then
-			ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable"
-			ewarn "the new predictable network interface naming."
-			rm -f "${old_net_name}"
-		fi
-	fi
-
-	local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	if has_version sys-apps/biosdevname; then
-		ewarn
-		ewarn "You have sys-apps/biosdevname installed which has been deprecated"
-		ewarn "in favor of the predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "The new predictable network interface names are used by default, see:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "Example command to get the information for the new interface name before booting"
-	ewarn "(replace ifname with, for example, eth0):"
-	ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if use hwdb && has_version sys-apps/hwids; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-fs/udev/udev-199-r1.ebuild b/sys-fs/udev/udev-199-r1.ebuild
deleted file mode 100644
index 1b0a61056542..000000000000
--- a/sys-fs/udev/udev-199-r1.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-199-r1.ebuild,v 1.3 2013/03/29 06:54:57 ssuominen Exp $
-
-EAPI=5
-
-# accept4() patch is only in non-live version
-if [[ ${PV} = 9999* ]]; then
-	KV_min=2.6.39
-else
-	KV_min=2.6.32
-fi
-
-inherit autotools eutils linux-info multilib toolchain-funcs versionator
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
-	inherit git-2
-else
-	patchset=3
-	SRC_URI="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz"
-	if [[ -n "${patchset}" ]]; then
-				SRC_URI="${SRC_URI}
-					http://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
-					http://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
-			fi
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	acl? ( sys-apps/acl )
-	gudev? ( >=dev-libs/glib-2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-12 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/systemd"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	!<sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	keymap? ( dev-util/gperf )"
-
-if [[ ${PV} = 9999* ]]; then
-	DEPEND="${DEPEND}
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-		dev-util/gperf
-		>=dev-util/intltool-0.50"
-fi
-
-RDEPEND="${COMMON_DEPEND}
-	openrc? ( !<sys-apps/openrc-0.9.9 )
-	!sys-apps/coldplug
-	!<sys-fs/lvm2-2.02.97-r1
-	!sys-fs/device-mapper
-	!<sys-fs/udev-init-scripts-22
-	!<sys-kernel/dracut-017-r1
-	!<sys-kernel/genkernel-3.4.25
-	!<sec-policy/selinux-base-2.20120725-r10"
-
-PDEPEND=">=virtual/udev-197-r1
-	hwdb? ( >=sys-apps/hwids-20130326.1[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-25 )"
-
-S=${WORKDIR}/systemd-${PV}
-
-#QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"
-
-udev_check_KV() {
-	if kernel_is lt ${KV_min//./ }; then
-		return 1
-	fi
-	return 0
-}
-
-check_default_rules() {
-	# Make sure there are no sudden changes to upstream rules file
-	# (more for my own needs than anything else ...)
-	local udev_rules_md5=3708dcb06e69ef2d3597cad0c98625e1
-	MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
-	MD5=${MD5/  -/}
-	if [[ ${MD5} != ${udev_rules_md5} ]]; then
-		eerror "50-udev-default.rules has been updated, please validate!"
-		eerror "md5sum: ${MD5}"
-		die "50-udev-default.rules has been updated, please validate!"
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL"
-
-	linux-info_pkg_setup
-
-	if ! udev_check_KV; then
-		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
-		eerror "It must be at least ${KV_min}!"
-	fi
-
-	KV_FULL_SRC=${KV_FULL}
-	get_running_version
-	if ! udev_check_KV; then
-		eerror
-		eerror "Your running kernel version (${KV_FULL}) is too old"
-		eerror "for this version of udev."
-		eerror "You must upgrade your kernel or downgrade udev."
-	fi
-}
-
-src_prepare() {
-	if ! [[ ${PV} = 9999* ]]; then
-		# secure_getenv() disable for non-glibc systems wrt bug #443030
-		if ! [[ $(grep -r secure_getenv * | wc -l) -eq 16 ]]; then
-			eerror "The line count for secure_getenv() failed, see bug #443030"
-			die
-		fi
-
-		# gperf disable if keymaps are not requested wrt bug #452760
-	if ! [[ $(grep -i gperf Makefile.am | wc -l) -eq 27 ]]; then
-			eerror "The line count for gperf references failed, see bug 452760"
-			die
-		fi
-	fi
-
-	# backport some patches
-	if [[ -n "${patchset}" ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-
-	# These are missing from upstream 50-udev-default.rules
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific usb group
-	SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	# Keep this for Linux 2.6.32 kernels with accept4() support like .60 wrt #457868
-	SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
-	EOF
-
-	# Remove requirements for gettext and intltool wrt bug #443028
-	if ! has_version dev-util/intltool && ! [[ ${PV} = 9999* ]]; then
-		sed -i \
-			-e '/INTLTOOL_APPLIED_VERSION=/s:=.*:=0.40.0:' \
-			-e '/XML::Parser perl module is required for intltool/s|^|:|' \
-			configure || die
-		eval export INTLTOOL_{EXTRACT,MERGE,UPDATE}=/bin/true
-		eval export {MSG{FMT,MERGE},XGETTEXT}=/bin/true
-	fi
-
-	# apply user patches
-	epatch_user
-
-	# compile with older versions of gcc #451110
-	version_is_at_least 4.6 $(gcc-version) || \
-		sed -i 's:static_assert:alsdjflkasjdfa:' src/shared/macro.h
-
-	# change rules back to group uucp instead of dialout for now wrt #454556
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' \
-		-i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	if [[ ! -e configure ]]; then
-		if use doc; then
-			gtkdocize --docdir docs || die "gtkdocize failed"
-		else
-			echo 'EXTRA_DIST =' > docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		check_default_rules
-		elibtoolize
-	fi
-
-	if ! use elibc_glibc; then #443030
-		echo '#define secure_getenv(x) NULL' >> config.h.in
-		sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
-	fi
-
-	# link udevd(8) to systemd-udevd.service(8) manpage
-	echo '.so systemd-udevd.service.8' > "${T}"/udevd.8
-}
-
-src_configure() {
-	use keymap || export ac_cv_path_GPERF=true #452760
-
-	local econf_args
-
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--bindir=/bin
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-html-dir=/usr/share/doc/${PF}/html
-		--with-rootprefix=
-		--with-rootlibdir=/$(get_libdir)
-		--with-bashcompletiondir=/usr/share/bash-completion
-		--without-python
-		--disable-audit
-		--disable-coredump
-		--disable-hostnamed
-		--disable-ima
-		--disable-libcryptsetup
-		--disable-localed
-		--disable-logind
-		--disable-myhostname
-		--disable-nls
-		--disable-pam
-		--disable-quotacheck
-		--disable-readahead
-		--enable-split-usr
-		--disable-tcpwrap
-		--disable-timedated
-		--disable-xz
-		--disable-polkit
-		$(use_enable acl)
-		$(use_enable doc gtk-doc)
-		$(use_enable gudev)
-		$(use_enable keymap)
-		$(use_enable kmod)
-		$(use_enable selinux)
-		$(use_enable static-libs static)
-	)
-	if use introspection; then
-		econf_args+=(
-			--enable-introspection=$(usex introspection)
-		)
-	fi
-	if use firmware-loader; then
-		econf_args+=(
-			--with-firmware-path="/lib/firmware/updates:/lib/firmware"
-		)
-	fi
-	econf "${econf_args[@]}"
-}
-
-src_compile() {
-	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
-	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
-	local targets=(
-		libudev-private.la
-		systemd-udevd
-		udevadm
-		libudev.la
-		ata_id
-		cdrom_id
-		collect
-		scsi_id
-		v4l_id
-		accelerometer
-		mtd_probe
-		man/udev.7
-		man/udevadm.8
-		man/systemd-udevd.8
-		man/systemd-udevd.service.8
-	)
-	use keymap && targets+=( keymap )
-	use gudev && targets+=( libgudev-1.0.la )
-
-	emake "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev
-		use gudev && emake -C docs/gudev
-	fi
-}
-
-src_install() {
-	local lib_LTLIBRARIES="libudev.la" \
-		pkgconfiglib_DATA="src/libudev/libudev.pc"
-
-	local targets=(
-		install-libLTLIBRARIES
-		install-includeHEADERS
-		install-libgudev_includeHEADERS
-		install-binPROGRAMS
-		install-rootlibexecPROGRAMS
-		install-udevlibexecPROGRAMS
-		install-dist_udevconfDATA
-		install-dist_udevhomeSCRIPTS
-		install-dist_udevkeymapDATA
-		install-dist_udevkeymapforcerelDATA
-		install-dist_udevrulesDATA
-		install-girDATA
-		install-man7
-		install-man8
-		install-pkgconfiglibDATA
-		install-sharepkgconfigDATA
-		install-typelibsDATA
-		install-dist_docDATA
-		libudev-install-hook
-		install-directories-hook
-		install-dist_bashcompletionDATA
-	)
-
-	if use gudev; then
-		lib_LTLIBRARIES+=" libgudev-1.0.la"
-		pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
-	fi
-
-	# add final values of variables:
-	targets+=(
-		rootlibexec_PROGRAMS=systemd-udevd
-		bin_PROGRAMS=udevadm
-		lib_LTLIBRARIES="${lib_LTLIBRARIES}"
-		MANPAGES="man/udev.7 man/udevadm.8 \
-				man/systemd-udevd.service.8"
-		MANPAGES_ALIAS="man/systemd-udevd.8"
-		pkgconfiglib_DATA="${pkgconfiglib_DATA}"
-		INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
-				$(sysconfdir)/udev/hwdb.d'
-		dist_bashcompletion_DATA="shell-completion/bash/udevadm"
-	)
-	emake -j1 DESTDIR="${D}" "${targets[@]}"
-	if use doc; then
-		emake -C docs/libudev DESTDIR="${D}" install
-		use gudev && emake -C docs/gudev DESTDIR="${D}" install
-	fi
-	dodoc TODO
-
-	prune_libtool_files --all
-	rm -f \
-		"${D}"/lib/udev/rules.d/99-systemd.rules \
-		"${D}"/usr/share/doc/${PF}/LICENSE.*
-
-	# see src_prepare() for content of these files
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doman "${T}"/udevd.8
-
-	# install udevadm compatibility symlink
-	dosym {../bin,sbin}/udevadm
-
-	# install udevd to /sbin and remove empty and redudant directory
-	# /lib/systemd because systemd is installed to /usr wrt #462750
-	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd || die
-	rm -r "${D}"/lib/systemd
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${ROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${ROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-	preserve_old_lib /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT}"run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT}"dev/loop 2>/dev/null
-	if [[ -d ${ROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# people want reminders, I'll give them reminders.  Odds are they will
-	# just ignore them anyway...
-
-	# 64-device-mapper.rules is related to sys-fs/device-mapper which we block
-	# in favor of sys-fs/lvm2
-	old_dm_rules=${ROOT}etc/udev/rules.d/64-device-mapper.rules
-	if [[ -f ${old_dm_rules} ]]; then
-		rm -f "${old_dm_rules}"
-		einfo "Removed unneeded file ${old_dm_rules}"
-	fi
-
-	local fstab="${ROOT}"etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, http://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT}usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_net_name="${ROOT}"etc/udev/rules.d/80-net-name-slot.rules
-	if [[ -f ${old_net_name} ]]; then
-		local old_net_sum=bebf4bd1b6b668e9ff34a3999aa6ff32
-		MD5=$(md5sum < "${old_net_name}")
-		MD5=${MD5/  -/}
-		if [[ ${MD5} == ${old_net_sum} ]]; then
-			ewarn "Removing unmodified file ${old_net_name} from old udev installation to enable"
-			ewarn "the new predictable network interface naming."
-			rm -f "${old_net_name}"
-		fi
-	fi
-
-	local old_cd_rules="${ROOT}"etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT}"etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	if has_version sys-apps/biosdevname; then
-		ewarn
-		ewarn "You have sys-apps/biosdevname installed which has been deprecated"
-		ewarn "in favor of the predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "The new predictable network interface names are used by default, see:"
-	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "Example command to get the information for the new interface name before booting"
-	ewarn "(replace <ifname> with, for example, eth0):"
-	ewarn "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	ewarn
-	ewarn "You can use kernel command net.ifnames= to control this feature."
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libudev$(get_libname 0)
-
-	elog
-	elog "For more information on udev on Gentoo, writing udev rules, and"
-	elog "         fixing known issues visit:"
-	elog "         http://www.gentoo.org/doc/en/udev-guide.xml"
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if use hwdb && has_version sys-apps/hwids; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}