gentoo resync : 20.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-20 17:35:36 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-20 17:35:36 +0100
commit: b620fb1b0929ff9657a2588aaa42b85e3021c102 (patch)
tree: 5c4e9e39b5d3ea7fc569c26b0d4ba6db582249e6 /sys-fs/eudev
parent: d473a706836012853193afc7000922601e4ada61 (diff)
14 files changed, 130 insertions, 1530 deletions
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 412e8bbcfcfd..28512a17a888 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,24 +1,12 @@
 AUX 40-gentoo.rules 365 SHA256 e11d66732dc0d629fdb8c06357db8be5339f2ecf28c2572c5af8637449f549ec SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b WHIRLPOOL 54d962fa515255df5f37bc5c71a3774a909a809809138dba12ed22c6fda78ef336f4e98014f37dbc44289de1ba08f5f2ea31311e14b29a0bbe2cc3d6587d7425
-AUX eudev-exclude-MD.patch 2887 SHA256 3e9889862756ad7b683593e5a63316b4531a1836bec324c0dec647339f53cf53 SHA512 955013bcb849f156b8c3b17d99c52699ac371b05c0fa866a473b7db049c77cd86ef41192301bf78af97ea944e8e6d09e60288348198b73f340517fd2be19004b WHIRLPOOL 745b16d56a6000d88a2b711a21bbbfe1d96a9d33d8eb6d9e51491a26266924b5092cf8b8a4ffa5f0247887a3ef0a83b2ea4c8ee8ad620c601b9f7ae8e530c57a
-AUX eudev-fix-disk-by-id.patch 2381 SHA256 3f1e1bcbcfeb024b09f5e80210f24a89fd0bba254633f60856513c10a4af9579 SHA512 f5a6fdeaaebb64d4086c153ab0629cc826be961a3f8f7f5bbf4283617cb30b1f228e983ef76f023805ea00bff2b1f5c903a549c0d4675227b94c104f69e3fefe WHIRLPOOL 0e73e4c3b0e2b285c519eb12d6fa85f18f153b0a030803af07381cfece35beffb79e70d933c01ca28b1f0c4cad1f2bd650954ccd93260fe6272a48a70bec79e3
-AUX eudev-fix-selinux-headers.patch 788 SHA256 5845b7b5e337e7202fe9dede75d9f4c6b70ce5cb25252397bd16419e634981d5 SHA512 ee11d435bb40e64fa3f88799be3e803e30d779009389b5faecd6416fa8eebee36e55ec7e2d59c4894268881f838ea94ba56240a425694fdbfd9dc5fe297c1bcb WHIRLPOOL 14c086d5bc37933b7ac2e0b3b54d65cbe2c8a8afefe798c1ead516bb36196b783c4cbb13abf298be8918915bde3c4475a74545a793fed4393a93d67c719c773a
-AUX eudev-fix-selinux-linking.patch 919 SHA256 9d40fe52fa899334725e40b6cf56a92e7b1e276bfc15315026e8330a22125860 SHA512 27f15fb1ead796206cbbbd7296813303b01aaae35f67388dd7e126e1fab07231cad5735cb63d5a4bbade0d9736949af76c4cff9119be14f3bbeef8014e02daa1 WHIRLPOOL fb4a49beea0bdf8c91c78fbf314e8737ad7c2f26b374c921005a5171d34d672ffdeb5f0fa7198a9574ba822ac6cd59c321c9073149035d773c1c8f3331eabb20
+AUX eudev-include-sysmacros-header.patch 4516 SHA256 8ecf09b46d4162756e5221f211be9b558f4429364d6d35a179139c3d7e0fed22 SHA512 29633fca7e348ef7e69fae7f0fc47a2155b20956dd396205c06032d356ea58269f5ce8e0277ed36aa7108385d0e244a311b53b9490c418c9180986e4742d623f WHIRLPOOL 78099e261efef5af8a851f43fe20f025e676dd6997f95aec93d8f99a338bc18c2493ce40cca4bb82426ffb28440e12f3b32553a66e309b6877a958c3d95040de
 AUX udev-postmount 1208 SHA256 b0327069dbb57b39600079b87df80915dabb77c2fa298d6ae109ca04f8ba08b5 SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 WHIRLPOOL d5263b61f1531822b9fd9f994d796c4328d7c4ccc0958bca27ca2c64b44549e5ca73334c94fd0e58aebc0f136ed8d60429736c2b8ee79d49572108525f362d45
-DIST eudev-1.10.tar.gz 1776717 SHA256 401eeb29147d3e24d87849a8006df62eadeb369d913484d59e9e35f3f73a20d1 SHA512 76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f WHIRLPOOL d3251a1ef18e46e000a0941156ca4daa33b54a6147fece4cee6d863f86c98068e88bc11bc8a90f45c578ed62338218c5c8b4b06bb6132610e3d4a30bf79fe192
-DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293
-DIST eudev-3.1.2.tar.gz 1858004 SHA256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 SHA512 d9aeb37a163ce4a0c116f75a927b4b99f8445d06624fbb3c28ade18f3effd8c54af5a4a52477c31a0452822a3dc0901468263195256e9dbf79d2ef08cf46f2b6 WHIRLPOOL 2249128672d2adfa968c123a2538063331348bc8e8481ad9c25bf8d9fb4d2d3c8a05417439f155d9ababe657b19a595c18c6ba60ad0d5584a8ead86220b39577
 DIST eudev-3.1.5.tar.gz 1745524 SHA256 f75885a430cd50fe4b31732f808ba7f9b2adf0f26b53b8ba2957b0c1d84b6f2a SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e WHIRLPOOL bc845c474101635c039515489e1316053156d3dd5f9c915c312324b9a1a6168f831e7476eeff834487fc83289e5d5eea2ba764c10bb6628b7c18d188de5f3846
-DIST eudev-3.2.2.tar.gz 1821812 SHA256 3e4c56ec2fc1854afd0a31f3affa48f922c62d40ee12a0c1a4b4f152ef5b0f63 SHA512 38465ba6a68c3a8756d750ac36dfde0e220c3b13d058a8fcb664ee628e95d2f83b4155cb080a7bd518a5435c7c502aa3fa785a99233ebb24dda406441a753f7a WHIRLPOOL bcebd850c5c9b0ffea21bbb3517feb15f2328f602366daa2fd13b62ce62b0834815b98618fbe80bbe9db9d27085a6ef917c4b1e597f6ad47182acf7386786bbb
 DIST eudev-3.2.4.tar.gz 1856432 SHA256 dddcf4c89b21f5f3210f7e4d3888c92cbfc657ff734ac21b6bdd3f5bcb146fed SHA512 1843a42d8c670379fec034e4401120202ae9383b74f81e52d93d83199a69016c27f7f7bf421e16abd3523dfa8158f9f28cd554f12f99a28e3004ece1c0342200 WHIRLPOOL 6856678fb37020f265f564fef31d2372655f8e7c7919f8124e1d50df41aae250a64f301ef200f8779b05c70c3b9b43b12ed464dc47a73b802e69f8e7720788c2
-EBUILD eudev-1.10-r2.ebuild 9129 SHA256 2184dad4a675c01575d819f8a6e45d1d9133db76ef933b8f508fc4aceceaf688 SHA512 4e5ad6d4f127ab487e901c881afc1793dd3daeb7bf0c9acef74073328c3aeefdfece4db6661306d645f5f02cacd371fb5bc3bfc3b5cf18f01ed8d307b063f635 WHIRLPOOL 67a6620cdb2464347fdf976110b2a15ca969ef00b449eb3323753b6fef221328d1e74d28ce9d12c746b0b53c6b89c9d7eb5b71dea2cfe97cfc0c2f799eb0c97b
-EBUILD eudev-1.9-r2.ebuild 9161 SHA256 51ba95509e938db6bea507fda1876ce2ce13c73fb2b9f70a7da26a0f8a755e6e SHA512 6ea5a209ce20b08c6b70744901deabde6ce77a5a7d8aede4998a76f68ec9fb632093e5621660e58f3560ce7f16013e5382885283bdb031c419c1cae350378aa7 WHIRLPOOL 0952090399764c202ea6841c3af3d69612cfd3e9c214965d8f9fd79f0a56ee004e38f1d69118a484150fd9f2987a922340a57a2d424035e05ed8aaac98723015
-EBUILD eudev-3.1.2.ebuild 7935 SHA256 980bee77592b21817f57399ab0afc8915eef49b5a54e8ef8e8dc0380f6f91989 SHA512 5c6e370e54856f5ed3c5c386b9dae42555afaaada6e21982f99fc4474b34ddf71f51c1f743da5386773bedaf36d8a2227521dfe418d09c6be5374a094b8a1641 WHIRLPOOL 3cd016033f92fb4235bcf9fc9524c3d7a86d2a7a994a37d2ff9825139fdf43afd22a05bcb46c841d82353022c2c053273f098b638c131106a60139e0092a4253
-EBUILD eudev-3.1.5.ebuild 7263 SHA256 61af8458c13d2136f3c9057459c774b4f50c23f2a67971cc2c3e850a8e5ded95 SHA512 78e671ad126858117926336debf2126278fec9f2175427f3d7ff045cba1d365c9c0eb4c04d1ebe2e99daf0d314993e163067aeb84ec560a5c6c5af2d243794b2 WHIRLPOOL 837352ec2981c2bae144acfaa3941adfdee60498d4de4945795a62c39a8a7befec485190eaa6d5c04cc7a53f8370668036bed250db7ab8acbf59a1cc9fa27a2f
-EBUILD eudev-3.2.2-r1.ebuild 7364 SHA256 f6edc879b8cc642fd2d7cfab45017782237ab6bdb779036184ba1751e1b20554 SHA512 f92aa71ccac9aed7038dff3cb75dbf2c849d61edd5b3eb86a56b467d3bb07881aa4057baba0163a7751fbbd15778ca6299ff6095614705bde9359e2c9647052c WHIRLPOOL c12effcd482129c862d751c6f7824872ff758e51f11313b1a4037c89c2179a766d6dc7de1afb5184c62ebc31b061b24f65a507e8aef9d34e78af760478f3e757
-EBUILD eudev-3.2.2.ebuild 7320 SHA256 d93fdc6bd53c6e493c704e7883b6b73ba4acf746602f5bb0ef61bec0b92b19bd SHA512 bb92bbad63ec770d8eae06d88ded85d96928a5a30e3c5b1ca022ea134b245022a73b1cf212e7d4dc149341b30db61f001b2f122d4e9d9ff152277c326c3989c5 WHIRLPOOL dbc9fdb961fafd462c4e543ab9d02bd1747fec0815b5149881fb21833cb18f8119bb28b59f47a950b6118e591790f3916543086ba84288354d12f4cdb5d7382c
-EBUILD eudev-3.2.4.ebuild 7314 SHA256 2f4d16e2e19ddcf7345489790c1e46136f6fcaa5ce5b60cbb9c796d317923101 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef WHIRLPOOL 8f70e588d326573a58906eab1d72fd210fb840b69022a04b53245fe497a3a4edb87f2d1110a605fbbf4bd4bb5d8adf44c41394f516de0554a67525f66665bee0
+EBUILD eudev-3.1.5.ebuild 7324 SHA256 76f5f333c1d7d097b800582a64378923be708bce2c4cbb40cd40d86c37c54226 SHA512 caba559c00546389c4a8ae0cd62cd1926877939d89b97060e175e8bfc7ba3bc2d081e8400a34bf830a269d8a1102a2a56e00b19e2b23b75b98347fdcbec4908f WHIRLPOOL 6e8e30c612ce71deaa07ba429f2b719152f50d6b72ba4e364818027a8af0fd33230e9175cc8a347968521d65616e9bce240d09fa2014ffffcc597fe106a273db
+EBUILD eudev-3.2.4.ebuild 7374 SHA256 2dc36df9cbf1ab01a35aaa207f716ddc7ec2cfc2dccabf39cb6f5cfe9b937261 SHA512 1953a761499144642ef49552116d66aff1fdb2aeb56d86c8dcf9118040f0f2ecd160666ffe3281288a812228433b0f4c58c19be70cf9b2eca871d6fd627b95bd WHIRLPOOL 77b5c006ea4225261eb5623008754a833aa31097cc536066cc75a829bdbf69cf78222e7fad1282383bebd2c342511c2e649fd7fa61689793efd7d66d3ba79341
 EBUILD eudev-4.9999.ebuild 6604 SHA256 0e903c0c2fc7443195a50ec69b56b75d05dd7020411aeb382f2b33912ec718af SHA512 c5b231b5dc6406255b38e67e99b054e429f5c482614eb905f9a9c0c03af9c7107c30c29850f0a2566e6731f4d206e957b4d714ef59739c60835e80a0b6a3e4fd WHIRLPOOL 56b50f2ae709c994d14362d689db60c44e2a00d263e647a3b990d65fac88557941101bd62a55e25e5599006b7944c067c9081dec6ca1f683ff013f08be4e49b8
 EBUILD eudev-9999.ebuild 7314 SHA256 2f4d16e2e19ddcf7345489790c1e46136f6fcaa5ce5b60cbb9c796d317923101 SHA512 bba81dcce7562500933c7836a951ce1f7a71a7755b106c604189938b782697a837fd7d712cc5a0bedacb0eab6d260728a6a109c6a8876e48d4d4541341d34fef WHIRLPOOL 8f70e588d326573a58906eab1d72fd210fb840b69022a04b53245fe497a3a4edb87f2d1110a605fbbf4bd4bb5d8adf44c41394f516de0554a67525f66665bee0
 MISC ChangeLog 11021 SHA256 4bf9e16fe9607d25dad137eb30308233c3d3c2dd89fb68ee8008a11dfaa70a15 SHA512 b54c268eea07b0e60d4e0b88a2efc66295e001da6d0a0c4d26b77f7e81cab0a2df46b82b6aa9444c9838eb4c63f479dc655207c5f8b39395ba54509341f10dfe WHIRLPOOL 3873661dbaefc20ec3f9f77c7e73df6404b7d324de90166b69f279549022424dcef185d7b00dde172fa22036f5984947abae97ee28361c01e3912b5a16f54f47
 MISC ChangeLog-2015 24551 SHA256 1990a418a2339df1b5df0b00aa6acc102d84261ef33203913b443fea20991f29 SHA512 a4d91049fa4267605fa8eb994a1dbca226d54f440ab9126d0623c51aa9078b50a1e1988310b2a1a2fb73a7fb5af252c41feddce1dc1e0f634be0510cf2a31cbf WHIRLPOOL 6d6e506833f409c3b6dca123c967bfcc0665d000bb4eb182bfe0a0afe27ce883499e508055d21992b64557537efdf303bc79476fbd48e9ad6f1ae1d98a296f61
-MISC metadata.xml 1157 SHA256 ba03136f85c5709e7a5d6759ac8552626420aac0e192ea738a9d2846f97dfd13 SHA512 cff7201ebbe8f4d3de081755c7b2fab115cbde63f73dec4bb4d9a3e878ee62ff28559e4fed2ad0e571c5448029c4f3162466011dfcbc1efcb5296864d6f5ffcb WHIRLPOOL 9e7e177d3d73cd96b8c8de4f928045e2d92a41202ccfd1201f657e43efd5ed24399f412ccc2057aaef894fb6f928f2aadc252c1c16b39a6fa738edb5d7da5d8c
+MISC metadata.xml 858 SHA256 49ee3726e5c4ebd5189e9353962d6590ded44a36e589545c33df06702354c513 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79 WHIRLPOOL f03a317faa946f0475fd84c20f1b47e1a53f0231fbbd40ae152716bdc7de6c6b5c2e613ccda45b62bd33bb86cb6f85af0eccbd1faeb309f3b9e955fbce5b7981
diff --git a/sys-fs/eudev/eudev-1.10-r2.ebuild b/sys-fs/eudev/eudev-1.10-r2.ebuild
deleted file mode 100644
index da554bc8b022..000000000000
--- a/sys-fs/eudev/eudev-1.10-r2.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-26 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	if ! use rule-generator; then
-		ewarn
-		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-		ewarn "as described in the URL below:"
-		ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-		ewarn
-		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn "exists:"
-		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn
-		ewarn "We are working on a better solution for the next beta release."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	# Bug #520684
-	epatch "${FILESDIR}"/${PN}-fix-selinux-headers.patch
-	epatch "${FILESDIR}"/${PN}-fix-selinux-linking.patch
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable keymap)
-			$(use_enable kmod libkmod)
-			$(usex kmod --enable-modules $(use_enable modutils modules))
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-keymap
-			--disable-libkmod
-			--disable-modules
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
-	# drop distributed hwdb files, they override sys-apps/hwids
-	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	insinto /usr/share/doc/${PF}/html/gudev
-	doins "${S}"/docs/gudev/html/*
-
-	insinto /usr/share/doc/${PF}/html/libudev
-	doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && use openrc && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-1.9-r2.ebuild b/sys-fs/eudev/eudev-1.9-r2.ebuild
deleted file mode 100644
index 3a6dfbe8e4bc..000000000000
--- a/sys-fs/eudev/eudev-1.9-r2.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )
-	openrc? ( >=sys-fs/udev-init-scripts-26 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	if ! use rule-generator; then
-		ewarn
-		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-		ewarn "as described in the URL below:"
-		ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-		ewarn
-		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn "exists:"
-		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn
-		ewarn "We are working on a better solution for the next beta release."
-		ewarn
-	fi
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	# Exclude MD from block device ownership event locking, bug #517986
-	epatch "${FILESDIR}"/${PN}-exclude-MD.patch
-
-	epatch_user
-
-	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
-		elibtoolize
-	fi
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable keymap)
-			$(use_enable kmod libkmod)
-			$(usex kmod --enable-modules $(use_enable modutils modules))
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-keymap
-			--disable-libkmod
-			--disable-modules
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
-	# drop distributed hwdb files, they override sys-apps/hwids
-	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	insinto /usr/share/doc/${PF}/html/gudev
-	doins "${S}"/docs/gudev/html/*
-
-	insinto /usr/share/doc/${PF}/html/libudev
-	doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && use openrc && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.1.2.ebuild b/sys-fs/eudev/eudev-3.1.2.ebuild
deleted file mode 100644
index b80fcbbe4aa9..000000000000
--- a/sys-fs/eudev/eudev-3.1.2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18
-		app-text/docbook-xml-dtd:4.2
-		app-text/docbook-xml-dtd:4.5
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd
-	gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-
-	if use doc; then
-		gtkdocize --docdir docs || die "gtkdocize failed"
-	else
-		echo 'EXTRA_DIST =' > docs/gtk-doc.make
-	fi
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--docdir=/usr/share/doc/${PF}
-		--libdir=/usr/$(get_libdir)
-		--with-rootlibexecdir=/lib/udev
-		--with-html-dir="/usr/share/doc/${PF}/html"
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix=/
-
-		$(use_enable gudev)
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir=/$(get_libdir)
-			$(use_enable doc gtk-doc)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-gtk-doc
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-		use gudev && emake -C src/gudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-		use gudev && emake -C src/gudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	if ! [[ ${PV} = 9999* ]]; then
-		insinto /usr/share/doc/${PF}/html/gudev
-		doins "${S}"/docs/gudev/html/*
-
-		insinto /usr/share/doc/${PF}/html/libudev
-		doins "${S}"/docs/libudev/html/*
-	fi
-}
-
-pkg_preinst() {
-	local htmldir
-	for htmldir in gudev libudev; do
-		if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
-			rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
-		fi
-		if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
-			dosym ../../doc/${PF}/html/${htmldir} \
-				/usr/share/gtk-doc/html/${htmldir}
-		fi
-	done
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index c02a8b50c5ee..10b380fda54d 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -9,7 +9,7 @@ inherit autotools eutils linux-info multilib multilib-minimal user
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
+	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	epatch_user
 	eautoreconf
 }
diff --git a/sys-fs/eudev/eudev-3.2.2-r1.ebuild b/sys-fs/eudev/eudev-3.2.2-r1.ebuild
deleted file mode 100644
index ea86f7733805..000000000000
--- a/sys-fs/eudev/eudev-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-KV_min=2.6.39
-
-inherit autotools linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	eapply "${FILESDIR}"/${PN}-fix-disk-by-id.patch
-
-	eapply_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-rootlibexecdir="${EPREFIX}"/lib/udev
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.2.2.ebuild b/sys-fs/eudev/eudev-3.2.2.ebuild
deleted file mode 100644
index aab0ee8dc61e..000000000000
--- a/sys-fs/eudev/eudev-3.2.2.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-KV_min=2.6.39
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
-	inherit git-2
-else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
-	test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10
-	!sys-fs/udev
-	!sys-apps/systemd"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
-	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-	ewarn "as described in the URL below:"
-	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	ewarn
-	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
-	ewarn
-}
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
-	linux-info_pkg_setup
-	get_running_version
-
-	# These are required kernel options, but we don't error out on them
-	# because you can build under one kernel and run under another.
-	if kernel_is lt ${KV_min//./ }; then
-		ewarn
-		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
-		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	# change rules back to group uucp instead of dialout for now
-	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
-	|| die "failed to change group dialout to uucp"
-
-	epatch_user
-	eautoreconf
-}
-
-multilib_src_configure() {
-	tc-export CC #463846
-	export cc_cv_CFLAGS__flto=no #502950
-
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
-		ac_cv_search_cap_init=
-		ac_cv_header_sys_capability_h=yes
-		DBUS_CFLAGS=' '
-		DBUS_LIBS=' '
-		--with-rootprefix=
-		--with-rootrundir=/run
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-rootlibexecdir="${EPREFIX}"/lib/udev
-		--enable-split-usr
-		--enable-manpages
-		--disable-hwdb
-		--exec-prefix="${EPREFIX}"
-	)
-
-	# Only build libudev for non-native_abi, and only install it to libdir,
-	# that means all options only apply to native_abi
-	if multilib_is_native_abi; then
-		econf_args+=(
-			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
-			$(use_enable introspection)
-			$(use_enable kmod)
-			$(use_enable static-libs static)
-			$(use_enable selinux)
-			$(use_enable rule-generator)
-		)
-	else
-		econf_args+=(
-			--disable-static
-			--disable-introspection
-			--disable-kmod
-			--disable-selinux
-			--disable-rule-generator
-		)
-	fi
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C src/shared
-		emake -C src/libudev
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake -C src/libudev DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
-	# but sandbox seems to evaluate the paths of the test i/o instead of the
-	# paths of the actual i/o that results.
-	# also only test for native abi
-	if multilib_is_native_abi; then
-		addread /sys
-		addwrite /dev
-		addwrite /run
-		default_src_test
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-}
-
-pkg_postinst() {
-	mkdir -p "${EROOT}"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 "${EROOT}"dev/loop 2>/dev/null
-	if [[ -d ${EROOT}dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
-	# https://bugs.gentoo.org/246847
-	# https://bugs.gentoo.org/514174
-	enewgroup input
-
-	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
-	# process it as a list.  We only care about the zero case (new install) or the case where
-	# the same version is being re-emerged.  If there is a second version, allow it to abort.
-	local rv rvres=doitnew
-	for rv in ${REPLACING_VERSIONS} ; do
-		if [[ ${rvres} == doit* ]]; then
-			if [[ ${rv%-r*} == ${PV} ]]; then
-				rvres=doit
-			else
-				rvres=${rv}
-			fi
-		fi
-	done
-
-	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		# reload database after it has be rebuilt, but only if we are not upgrading
-		# also pass if we are -9999 since who knows what hwdb related changes there might be
-		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
-			udevadm control --reload
-		fi
-	fi
-	if [[ ${rvres} != doitnew ]]; then
-		ewarn
-		ewarn "You need to restart eudev as soon as possible to make the"
-		ewarn "upgrade go into effect:"
-		ewarn "\t/etc/init.d/udev --nodeps restart"
-	fi
-
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
-	elog
-	elog "For more information on eudev on Gentoo, writing udev rules, and"
-	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
-}
diff --git a/sys-fs/eudev/eudev-3.2.4.ebuild b/sys-fs/eudev/eudev-3.2.4.ebuild
index a864deb766cc..5e4cf893273a 100644
--- a/sys-fs/eudev/eudev-3.2.4.ebuild
+++ b/sys-fs/eudev/eudev-3.2.4.ebuild
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	eapply "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	eapply_user
 	eautoreconf
 }
diff --git a/sys-fs/eudev/files/eudev-exclude-MD.patch b/sys-fs/eudev/files/eudev-exclude-MD.patch
deleted file mode 100644
index d56026168809..000000000000
--- a/sys-fs/eudev/files/eudev-exclude-MD.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2e5b17d01347d3c3118be2b8ad63d20415dbb1f0 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Thu, 24 Jul 2014 23:37:35 +0200
-Subject: [PATCH] udev: exclude MD from block device ownership event locking
-
-MD instantiates devices at open(). This is incomptible with the
-locking logic, as the "change" event emitted when stopping a
-device will bring it back.
----
- src/udev/udevd.c | 23 +++++++----------------
- 1 file changed, 7 insertions(+), 16 deletions(-)
-
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index a45d324..db935d6 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -285,26 +285,17 @@ static void worker_new(struct event *event)
-                                 udev_event->exec_delay = exec_delay;
- 
-                         /*
--                         * Take a "read lock" on the device node; this establishes
-+                         * Take a shared lock on the device node; this establishes
-                          * a concept of device "ownership" to serialize device
--                         * access. External processes holding a "write lock" will
-+                         * access. External processes holding an exclusive lock will
-                          * cause udev to skip the event handling; in the case udev
--                         * acquired the lock, the external process will block until
-+                         * acquired the lock, the external process can block until
-                          * udev has finished its event handling.
-                          */
--
--                        /*
--                         * <kabi_> since we make check - device seems unused - we try
--                         *         ioctl to deactivate - and device is found to be opened
--                         * <kay> sure, you try to take a write lock
--                         * <kay> if you get it udev is out
--                         * <kay> if you can't get it, udev is busy
--                         * <kabi_> we cannot deactivate openned device  (as it is in-use)
--                         * <kay> maybe we should just exclude dm from that thing entirely
--                         * <kabi_> IMHO this sounds like a good plan for this moment
--                         */
--                        if (streq_ptr("block", udev_device_get_subsystem(dev)) &&
--                            !startswith(udev_device_get_sysname(dev), "dm-")) {
-+                        if (!streq_ptr(udev_device_get_action(dev), "remove") &&
-+                            streq_ptr("block", udev_device_get_subsystem(dev)) &&
-+                            !startswith(udev_device_get_sysname(dev), "dm-") &&
-+                            !startswith(udev_device_get_sysname(dev), "md")) {
-                                 struct udev_device *d = dev;
- 
-                                 if (streq_ptr("partition", udev_device_get_devtype(d)))
--- 
-1.8.5.5
-
diff --git a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch b/sys-fs/eudev/files/eudev-fix-disk-by-id.patch
deleted file mode 100644
index 07bc0c518c62..000000000000
--- a/sys-fs/eudev/files/eudev-fix-disk-by-id.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ruN eudev-3.2.2-orig/rules/60-persistent-storage.rules eudev-3.2.2-new/rules/60-persistent-storage.rules
---- eudev-3.2.2-orig/rules/60-persistent-storage.rules	2016-12-11 16:41:58.000000000 +0100
-+++ eudev-3.2.2-new/rules/60-persistent-storage.rules	2017-04-26 23:14:04.197109882 +0200
-@@ -83,6 +83,9 @@
- # by-id (World Wide Name)
- ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}"
- ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION}-part%n"
-+#(Temporary) Compatibility rule for old broken WWNs in case some uses them:
-+ENV{DEVTYPE}=="disk", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}"
-+ENV{DEVTYPE}=="partition", ENV{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}=="?*", SYMLINK+="disk/by-id/wwn-$env{ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE}-part%n"
- 
- # by-partlabel/by-partuuid links (partition metadata)
- ENV{ID_PART_ENTRY_UUID}=="?*", SYMLINK+="disk/by-partuuid/$env{ID_PART_ENTRY_UUID}"
-diff -ruN eudev-3.2.2-orig/src/ata_id/ata_id.c eudev-3.2.2-new/src/ata_id/ata_id.c
---- eudev-3.2.2-orig/src/ata_id/ata_id.c	2016-11-17 22:14:19.000000000 +0100
-+++ eudev-3.2.2-new/src/ata_id/ata_id.c	2017-04-26 23:18:51.116127146 +0200
-@@ -645,10 +645,22 @@
-                  * All other values are reserved.
-                  */
-                 word = identify.wyde[108];
--                if ((word & 0xf000) == 0x5000)
--                        printf("ID_WWN=0x%1$"PRIu64"x\n"
--                               "ID_WWN_WITH_EXTENSION=0x%1$"PRIu64"x\n",
--                               identify.octa[108/4]);
-+                if ((word & 0xf000) == 0x5000){
-+			uint64_t wwn;
-+
-+			wwn = identify.wyde[108];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[109];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[110];
-+			wwn <<= 16;
-+			wwn |= identify.wyde[111]; /* Could possibly done nicer ? */ 
-+                        printf("ID_WWN=0x%1$" PRIx64 "\n"
-+                               "ID_WWN_WITH_EXTENSION=0x%1$" PRIx64 "\n",
-+                               wwn);
-+			printf("ID_WWN_WITH_EXTENSION_REVERSED_DO_NOT_USE=0x%" PRIu64 "x\n",
-+			       identify.octa[108/4]);
-+		}
- 
-                 /* from Linux's include/linux/ata.h */
-                 if (identify.wyde[0] == 0x848a ||
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch b/sys-fs/eudev/files/eudev-fix-selinux-headers.patch
deleted file mode 100644
index 1d1d8dcc236f..000000000000
--- a/sys-fs/eudev/files/eudev-fix-selinux-headers.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 361aa273d6fedda161c14b24302f009a58331693 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Tue, 2 Sep 2014 21:20:24 +0200
-Subject: [PATCH] fix SELINUX build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
- src/shared/label.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/shared/label.c b/src/shared/label.c
-index 3c6277a..e674241 100644
---- a/src/shared/label.c
-+++ b/src/shared/label.c
-@@ -23,6 +23,11 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- 
-+#ifdef HAVE_SELINUX
-+#include <selinux/selinux.h>
-+#include <selinux/label.h>
-+#endif
-+
- #include "label.h"
- #include "util.h"
- #include "path-util.h"
--- 
-2.1.0
-
diff --git a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch b/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
deleted file mode 100644
index 6a5e05bcaf1e..000000000000
--- a/sys-fs/eudev/files/eudev-fix-selinux-linking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e7f7217b9b9dbb3304116eae2b0ad90c84ede034 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net>
-Date: Wed, 3 Sep 2014 11:01:31 +0200
-Subject: [PATCH] link libudev against SELINUX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
----
- src/libudev/Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am
-index 868a9fc..72e43bc 100644
---- a/src/libudev/Makefile.am
-+++ b/src/libudev/Makefile.am
-@@ -54,7 +54,8 @@ libudev_la_LDFLAGS = \
- 	-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
- 
- libudev_la_LIBADD = \
--	$(top_builddir)/src/shared/libudev_shared.la
-+	$(top_builddir)/src/shared/libudev_shared.la \
-+	$(SELINUX_LIBS)
- 
- libudev_private_la_SOURCES = \
- 	$(libudev_la_SOURCES) \
--- 
-2.1.0
-
diff --git a/sys-fs/eudev/files/eudev-include-sysmacros-header.patch b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
new file mode 100644
index 000000000000..ca622bff5479
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
@@ -0,0 +1,121 @@
+diff -ruPN eudev-3.1.5.old/src/cdrom_id/cdrom_id.c eudev-3.1.5/src/cdrom_id/cdrom_id.c
+--- eudev-3.1.5.old/src/cdrom_id/cdrom_id.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/cdrom_id/cdrom_id.c	2017-10-11 21:45:10.929671748 -0400
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device.c eudev-3.1.5/src/libudev/libudev-device.c
+--- eudev-3.1.5.old/src/libudev/libudev-device.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device.c	2017-10-11 21:44:42.774672156 -0400
+@@ -32,6 +32,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device-private.c eudev-3.1.5/src/libudev/libudev-device-private.c
+--- eudev-3.1.5.old/src/libudev/libudev-device-private.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device-private.c	2017-10-11 21:44:39.445672204 -0400
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-enumerate.c eudev-3.1.5/src/libudev/libudev-enumerate.c
+--- eudev-3.1.5.old/src/libudev/libudev-enumerate.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-enumerate.c	2017-10-11 21:44:36.279672250 -0400
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/scsi_id/scsi_serial.c eudev-3.1.5/src/scsi_id/scsi_serial.c
+--- eudev-3.1.5.old/src/scsi_id/scsi_serial.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/scsi_id/scsi_serial.c	2017-10-11 21:45:20.195671614 -0400
+@@ -36,6 +36,7 @@
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+ #include <linux/bsg.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevadm-info.c eudev-3.1.5/src/udev/udevadm-info.c
+--- eudev-3.1.5.old/src/udev/udevadm-info.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udevadm-info.c	2017-10-11 21:44:33.032672297 -0400
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevd.c eudev-3.1.5/src/udev/udevd.c
+--- eudev-3.1.5.old/src/udev/udevd.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udevd.c	2017-10-11 21:44:59.791671910 -0400
+@@ -45,6 +45,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-event.c eudev-3.1.5/src/udev/udev-event.c
+--- eudev-3.1.5.old/src/udev/udev-event.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-event.c	2017-10-11 21:44:29.652672346 -0400
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <sys/signalfd.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -ruPN eudev-3.1.5.old/src/udev/udev-node.c eudev-3.1.5/src/udev/udev-node.c
+--- eudev-3.1.5.old/src/udev/udev-node.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-node.c	2017-10-11 21:44:25.864672401 -0400
+@@ -28,6 +28,7 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "smack-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-rules.c eudev-3.1.5/src/udev/udev-rules.c
+--- eudev-3.1.5.old/src/udev/udev-rules.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-rules.c	2017-10-11 21:44:21.611672463 -0400
+@@ -28,6 +28,7 @@
+ #include <dirent.h>
+ #include <fnmatch.h>
+ #include <time.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "path-util.h"
+diff -ruPN eudev-3.1.5.old/test/test-libudev.c eudev-3.1.5/test/test-libudev.c
+--- eudev-3.1.5.old/test/test-libudev.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/test/test-libudev.c	2017-10-11 21:45:27.782671504 -0400
+@@ -27,6 +27,7 @@
+ #include <getopt.h>
+ #include <fcntl.h>
+ #include <sys/epoll.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "udev-util.h"
diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml
index 39ad39998e68..ccfc41779746 100644
--- a/sys-fs/eudev/metadata.xml
+++ b/sys-fs/eudev/metadata.xml
@@ -7,12 +7,8 @@
   <use>
     <flag name="blkid">enable blkid support</flag>
     <flag name="efi">enable EFI support</flag>
-    <flag name="gudev">enable libudev gobject interface</flag>
     <flag name="hwdb">read vendor/device string database and add it to udev database</flag>
-    <flag name="keymap">map custom hardware's multimedia keys</flag>
     <flag name="kmod">enable module loading through libkmod</flag>
-    <flag name="modutils">enable module loading support - use modutils calls if kmod not enabled</flag>
-    <flag name="openrc">install the OpenRC init scripts</flag>
     <flag name="smack">enable SMACK security model</flag>
     <flag name="rule-generator">install legacy rule generator rules and support scripts - note
     that the functionality within was dropped from sys-fs/udev as it is not stable in
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-20 17:35:36 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-20 17:35:36 +0100
commit	b620fb1b0929ff9657a2588aaa42b85e3021c102 (patch)
tree	5c4e9e39b5d3ea7fc569c26b0d4ba6db582249e6 /sys-fs/eudev
parent	d473a706836012853193afc7000922601e4ada61 (diff)