gentoo resync : 22.04.2018

27 files changed, 131 insertions, 321 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e4b71c834853..5eb646e5f957 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 7153ddb734f9..d1dbfeb0cd94 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,5 +1,7 @@
 DIST btrfsmaintenance-0.3.1.tar.gz 19698 BLAKE2B f792d7e55dd738b4be2f18aa4047c8b2c092244b71c50e32cf881a7862b14a2d897a170515388fcee40a89763c4c91d357ca3ceb559e372ca3c673d0b1d3aec2 SHA512 89be6da3d6bb3f85f645ac899f173d19cb787e938dd2fc91be16b3202a6784ca33dc4a4d9f9ee78ac6a96468dbaa4f4dc7a2f2e6998d550ea44d7af24198dbfb
+DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
 DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.3.1.ebuild 1381 BLAKE2B c3dcf441fb735792133f6dca9a5bdf5d2cb76d03fc46540a2ac87ea0211b83027249706c6eb55494aaab223ac222c0e3dfd65d09cfa169c37b950436daa46a59 SHA512 f681469cc0db852d21625736f3ecca7cd745c2dae6ef3d2d1b7ca1a4cf51645e904346ab18ce0d19abcd5b372aa40d42822629c9e113dd7fee856e7481b5c2c6
+EBUILD btrfsmaintenance-0.4.1.ebuild 2008 BLAKE2B ad5bf783282a0eb8a58b3d059d8996dfd7c4b374ccf21f80379cab09c0bd4c90b02d205f6849f3e2d8416227118524fddf935591c4756ab1c02559eb785d986c SHA512 0a40cef065c104f976241a80bc4377d07eeb8f8f9a4920e650127d897e1e64fa77bdb601c709ac23014b1e0c9a77884b9d96112bb1fdf13b8f9ec22563038967
 EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild
new file mode 100644
index 000000000000..1a84583a1cbd
--- /dev/null
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
+HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
+SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+RDEPEND="systemd? ( sys-apps/systemd )
+	sys-fs/btrfs-progs
+	virtual/cron"
+
+src_prepare() {
+	# Fix config path into watching service
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+		die "Unable to patch btrfsmaintenance-refresh.*"
+	default
+}
+
+src_install() {
+	dodoc README.md CONTRIBUTING.md CHANGES.md
+	insinto /etc/default
+	newins sysconfig.btrfsmaintenance btrfsmaintenance
+	insinto /usr/share/btrfsmaintenance
+	doins btrfsmaintenance-functions
+	exeinto /usr/share/btrfsmaintenance
+	doexe btrfs*.sh
+	systemd_dounit *.service *.timer *.path
+}
+
+pkg_postinst() {
+	elog "Installing default btrfsmaintenance scripts"
+	if use systemd; then
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+	else
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+	fi
+	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
+	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
+	elog "update cron symlinks or run"
+	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
+	elog "to update systemd timers."
+	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
+	elog "monitor the config files changes and update systemd timers accordly."
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		elog "Removing symlinks from btrfsmaintenance cron tasks"
+		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+	fi
+}
diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest
index 66ef3bffc4c1..b51a8ff717e4 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,3 +1,5 @@
 DIST dfc-3.0.5.tar.gz 43310 BLAKE2B 4698c5f5caf249695598b01dab471c978e9a5b83b2c1610af466588bbac182ea7f51a7017d6be0b0f753f1abf41b7aa054e67049ff74344271c2dc5c01a8ef02 SHA512 f828ede8aee0a496518d1ee9583ba71495cdd01ee0d22833e3b46aeb5f5f870ce7de629923d129a7bf795b458feec10f9a16882134dae34dd2ace7ea9eebb134
-EBUILD dfc-3.0.5-r1.ebuild 838 BLAKE2B fb7a31c9c5e769da6f4972d413a2022bb1715e60b39623ff4c25b2f6fbe1a145cc177bc5123f57a44f5d3ea94e48a06b4050547a84105d018647d24504ae3b68 SHA512 e962103b8151061def9bae37a24d56bfbcb0920cd3db9dd07879fca77c56955c9e2321838806cb6f81ca066d9f903442d18df200d5bada19d9557b51bb519ed2
+DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
+EBUILD dfc-3.0.5-r1.ebuild 837 BLAKE2B 426be217cb7632aa73f753f91e0f0b42837a177958e44ee11d27d4e4cbe2df5d4d505dbf9d81d2b02f9cf3259c1f8627168cf513e66de9dc96f5e44435918443 SHA512 6da36825906f0d23b3a0148fed5b6365049931eaebf08ca2aabb4d14e7d84c8d11f34894c64e3054264b50f61fddd45924c9d6c1c51e68ac84d71f5a1c8f0f1a
+EBUILD dfc-3.1.1.ebuild 831 BLAKE2B fbe2b17ddf14461875b9f8449fb1f771069a403c53dada147927353aac245a1f7b1c6bb8606253d200b6a20a4cb92310a2f179058428aca52081731b9c99f996 SHA512 2b0e6b9beaa4e5228fb6879ddc657cb85acadd4e133ea0729edaecb4dca9882f38b96649aff99cd02a9af2d7edaa2afef1ebeebbac0fcb4dcb229443fe93a8c3
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/sys-fs/dfc/dfc-3.0.5-r1.ebuild b/sys-fs/dfc/dfc-3.0.5-r1.ebuild
index 989df7268997..6f2e4f27b221 100644
--- a/sys-fs/dfc/dfc-3.0.5-r1.ebuild
+++ b/sys-fs/dfc/dfc-3.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://projects.gw-computing.net/attachments/download/467/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="nls"
 
 DEPEND="nls? (
diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild
new file mode 100644
index 000000000000..d13715350a12
--- /dev/null
+++ b/sys-fs/dfc/dfc-3.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="A simple CLI tool that display file system usage, with colors"
+HOMEPAGE="http://projects.gw-computing.net/projects/dfc"
+SRC_URI="http://projects.gw-computing.net/attachments/download/615/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="nls"
+
+DEPEND="nls? (
+	virtual/libintl
+	sys-devel/gettext
+)"
+RDEPEND="nls? ( virtual/libintl )"
+
+src_configure() {
+	mycmakeargs=(
+		# avoid installing xdg config in /usr
+		-DXDG_CONFIG_DIR="${EPREFIX}"/etc/xdg
+		# use the standard Gentoo doc path
+		-DDFC_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		# disable automagic dependency
+		-DNLS_ENABLED="$(usex nls)"
+		-DLFS_ENABLED=ON
+		-DGRIM=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 8741163d4703..ab6900f3b4d6 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -3,8 +3,8 @@ AUX eudev-include-sysmacros-header.patch 4516 BLAKE2B 2c02cece2f2dfc48cff03696a0
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
 DIST eudev-3.1.5.tar.gz 1745524 BLAKE2B d030e78f8ef751ac1d677f50200898fb2089940a7d8a828080059fb6330012e615638e47ba21dd6b35fcf89248783d20e47387b8f009f7f4cc1f3fac203e6f58 SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
-EBUILD eudev-3.1.5.ebuild 7338 BLAKE2B 433e257a5c8e6417cdc3c5a51de72372f7fb3e7ae2b2f4fc79f0cf1f25a5a4d201c7a70856418a30dfd1e243cdd9e6131b50fb78a6224922272ac03856704c2a SHA512 7fd0008ee5c98d439b3b189d581ee980444f51faac775d03ff957d7014c7155973a0d410552a833d9f98418836a1c4422638757493ab7c102916bd43642b4721
-EBUILD eudev-3.2.5.ebuild 7321 BLAKE2B 24bcda95e668a0f7ae6acee6e90bb6216f18f9672b7b74c6bf0f6a7b330217c6c2b619d682656407efbbf81245d2615000f8eecf499d4847e52b9beddfa7778f SHA512 0eb3046d9b6b98d1162104b26452a50c08c1438969ae7f63feee8da4f46430bef796d589197c7f1023a2d9d317b1bd80154c551710f6df30541b8cf310b9b55c
-EBUILD eudev-4.9999.ebuild 6618 BLAKE2B f52253e9829b8a1728d5dd690bb80ed9666521698edc8d0319374c30748258061899ee70e7969b4dbe295a7294614e4bb9c69c25cf9c2db535333438f58c5ef1 SHA512 27678748bb1281fd43a0fe0efe3d26d5ff6750ceac978a5334ed6b8f23972624da5c73789cb225066f5dc1a507d715e401cd949b018a7afc12b8ef57be5dde6d
-EBUILD eudev-9999.ebuild 7328 BLAKE2B cbe3318408e32df3b5fb35fb6f8de4c2b3ded5a0cbb969a39d011fccb1f2c4b2d5e02fb2f10aceda364313e2c8448a049f0f94802ca04f9774e18654c7b2be8e SHA512 9e833f666b8401e809f2d11ca24f784af238c25bf625e8e6cffcea4fb36a37ddec39444a9277b28c62a249d9d862cc5e38bc334c5d0d2c627120d2a14185c4b9
+EBUILD eudev-3.1.5.ebuild 7208 BLAKE2B 845b3c538f77c1bbee8c74ae84fa58d5883bbe3e97e96e90c00dda74c8b24a2a28b676f8893269aba214c60e212104b3f28dfab4070bf3e1c9b022d46e7577ef SHA512 c3b94258f03fb86cdf2d1f0ca89a8496a23d43df1da865edeca4122dd259c0be8d0203be45ed37b00daeab91d4abf9805a82a2d1483ff94a2c197768884bbe5d
+EBUILD eudev-3.2.5.ebuild 7191 BLAKE2B 58532c776a4e25cbc9994f69686a746e600d948df58fa7f90074ab42e49373fe5bd4dae0686347e24ede2dc416cf85c1340499b4586c0315a130bd8334b3b556 SHA512 07990a1553f3b395dabdc638fe1c2ca5beaf2dad3ff5cb6800ea138229bc3dee5f2f9ea2a111cfd452172121cb27e9b34a647014b9b4e1792f1856843730f03c
+EBUILD eudev-4.9999.ebuild 6488 BLAKE2B 2ceafba483af00e76edd7d07a92ecd6036a3e99723823384928731ec6080e3e86a0dddf548a4abc1da097d247e0c54842a0ac6c9d2a639d9715c6e1568ff28cc SHA512 95f43eda615a37307c25ad6dd1997070ff5efcc936752611546542b07a242ce1a4299f775758d7f480fcbf55d25da764bcc43e2c3f9f0c10fd9083c987aba9e8
+EBUILD eudev-9999.ebuild 7198 BLAKE2B 839f4305b8dde6aba52a463d0053928f63ac5d2ab4ecc773ffac442de82d1f52c7aa6839c95b57a04b8fd021be7d49566f05e039113f5c4b2e76851147756b0d SHA512 5f4652feb5a4aa3166471513405ee08e1b5bff7de05f29dffdb88b76a5eb841f52f557d18f2104e6e8e0834d1a2bb5f5b26bf3eab6ca1cecf782c409341929e9
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 99eda5dc01c4..1a1aa6cc3111 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	virtual/os-headers
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index ca9066fea928..53390437fcef 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	virtual/os-headers
diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index b5e3ec9c3111..8e32a0f959f0 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	virtual/os-headers
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 63bc0e99dec5..4e3f3bb3c604 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -28,11 +28,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	virtual/os-headers
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index ab44f0e5f647..c8db2b9c7e25 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,9 +1,3 @@
-DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
-DIST loop-AES-v3.7k.tar.bz2 327457 BLAKE2B 3210a6214abc36c1fb464be8e83d37a1bc70d16b883649e493f2eb7bc46a59d8ab9c51f7c5e19ae6e170d352f6860b39a548acd26e11cfa5a8966eb292552c29 SHA512 91144642818f81343a1326759a087cc2e9dbf6c3594472d1d508ce811215d5215d673681ad8d563c8c6b2e9203b0e10314829988932b2f9d3382cb1a13d7cacf
-DIST loop-AES-v3.7l.tar.bz2 328646 BLAKE2B 27c2475823eff194a75dbf0dce987403b3526abf7058d8f9d4e6cba55acf218ddf8499a7f29d218291c657a68ef6f12488ec72d7b46ed0197cc0d2047912eb3e SHA512 368a9186e3fb08e281facafbcdc7a37ccfea701c2b34564319e80d8b379e4c7d58f5b6416218616b6597ee01a2f5160491b9c9758fbb69a1f8b17c2b2382af94
 DIST loop-AES-v3.7m.tar.bz2 329763 BLAKE2B eed2590ed7b23dbb5ffb07143f8c89a693cfa8741337e7620b2c0e9a7426bf48a11a219f24996636000c07f3bbedabd75a3cf31d95ebb463b108919f9aea314a SHA512 22cdf301e12d185789fe00a5e5b750e33ae4280dc45c98e71193504b7b46899bb973a083ba526657a62c5e3ab641b3d2f03ebf28e424d50caedad2c7a5f87be5
-EBUILD loop-aes-3.7j.ebuild 2048 BLAKE2B aa09b243abdba1349ca27a8fac8c8a335fab0bc858fa166060f9a2152199289817bc2e207d38d16119ccce1e80c7d85dd5dbf289cb437640df0b9262fa12af65 SHA512 617c2a7662706be9778537e308cb74bd54e8c5cc5e5b3552fc4bc794f3c7d4f26ff60cea8a6944184993195d189f1944a3dcc619005f2055ae3d113e4a9d4605
-EBUILD loop-aes-3.7k.ebuild 2048 BLAKE2B aa09b243abdba1349ca27a8fac8c8a335fab0bc858fa166060f9a2152199289817bc2e207d38d16119ccce1e80c7d85dd5dbf289cb437640df0b9262fa12af65 SHA512 617c2a7662706be9778537e308cb74bd54e8c5cc5e5b3552fc4bc794f3c7d4f26ff60cea8a6944184993195d189f1944a3dcc619005f2055ae3d113e4a9d4605
-EBUILD loop-aes-3.7l.ebuild 2048 BLAKE2B aa09b243abdba1349ca27a8fac8c8a335fab0bc858fa166060f9a2152199289817bc2e207d38d16119ccce1e80c7d85dd5dbf289cb437640df0b9262fa12af65 SHA512 617c2a7662706be9778537e308cb74bd54e8c5cc5e5b3552fc4bc794f3c7d4f26ff60cea8a6944184993195d189f1944a3dcc619005f2055ae3d113e4a9d4605
 EBUILD loop-aes-3.7m.ebuild 2048 BLAKE2B aa09b243abdba1349ca27a8fac8c8a335fab0bc858fa166060f9a2152199289817bc2e207d38d16119ccce1e80c7d85dd5dbf289cb437640df0b9262fa12af65 SHA512 617c2a7662706be9778537e308cb74bd54e8c5cc5e5b3552fc4bc794f3c7d4f26ff60cea8a6944184993195d189f1944a3dcc619005f2055ae3d113e4a9d4605
 MISC metadata.xml 633 BLAKE2B 364ea3f67381f2878af750cdf6da32980f96bad6f277d4cdc4c943e72a554e50e9c91fdce007a8ac63e3f9c715481740688b242947a8c19a25996b9f5621d726 SHA512 75e4ed0408d32a91012b03de7ac1f4ac4aac8a20ccc73ad612a9fe79e9046d79eee189e40692c13822e219b8ee35800b04fe36c88168be24248222c6ddd6193c
diff --git a/sys-fs/loop-aes/loop-aes-3.7j.ebuild b/sys-fs/loop-aes/loop-aes-3.7j.ebuild
deleted file mode 100644
index b548d0430472..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7j.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-
-	ewarn
-	ewarn "Please consider using loop-aes-losetup package instead of"
-	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
-	ewarn "without patching util-linux package"
-	ewarn
-	ewarn "In future only loop-aes-losetup will be available in portage"
-	ewarn
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.7k.ebuild b/sys-fs/loop-aes/loop-aes-3.7k.ebuild
deleted file mode 100644
index b548d0430472..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7k.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-
-	ewarn
-	ewarn "Please consider using loop-aes-losetup package instead of"
-	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
-	ewarn "without patching util-linux package"
-	ewarn
-	ewarn "In future only loop-aes-losetup will be available in portage"
-	ewarn
-}
diff --git a/sys-fs/loop-aes/loop-aes-3.7l.ebuild b/sys-fs/loop-aes/loop-aes-3.7l.ebuild
deleted file mode 100644
index b548d0430472..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7l.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-mod
-
-MY_P="${PN/aes/AES}-v${PV}"
-
-DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
-HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
-
-DEPEND="app-crypt/loop-aes-losetup"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	CONFIG_CHECK="!BLK_DEV_LOOP"
-	MODULE_NAMES="loop(block::tmp-d-kbuild)"
-	BUILD_TARGETS="all"
-
-	BUILD_PARAMS=" \
-		V=1 \
-		LINUX_SOURCE=\"${KERNEL_DIR}\" \
-		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
-		USE_KBUILD=y MODINST=n RUNDM=n"
-	use cpu_flags_x86_aes && BUILD_PARAMS="${BUILD_PARAMS} INTELAES=y"
-	use keyscrub && BUILD_PARAMS="${BUILD_PARAMS} KEYSCRUB=y"
-	use cpu_flags_x86_padlock && BUILD_PARAMS="${BUILD_PARAMS} PADLOCK=y"
-
-	if use extra-ciphers; then
-		MODULE_NAMES="${MODULE_NAMES}
-			loop_blowfish(block::tmp-d-kbuild)
-			loop_serpent(block::tmp-d-kbuild)
-			loop_twofish(block::tmp-d-kbuild)"
-		BUILD_PARAMS="${BUILD_PARAMS} EXTRA_CIPHERS=y"
-	fi
-}
-
-src_install() {
-	linux-mod_src_install
-
-	dodoc README
-	dobin loop-aes-keygen
-	doman loop-aes-keygen.1
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo
-	einfo "For more instructions take a look at examples in README at:"
-	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
-	einfo
-	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
-	einfo "you may want to consider using the aes-ni use flag. It will"
-	einfo "use your processors native AES instructions giving quite a speed"
-	einfo "increase."
-	einfo
-
-	ewarn
-	ewarn "Please consider using loop-aes-losetup package instead of"
-	ewarn "util-linux[loop-aes], it will enable all loop-aes services"
-	ewarn "without patching util-linux package"
-	ewarn
-	ewarn "In future only loop-aes-losetup will be available in portage"
-	ewarn
-}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7a7e478fc8b2..3e25701e1123 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,13 +11,13 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST systemd-237.tar.gz 6871350 BLAKE2B 4734a110a297fbbd6679bced6302fcdca55ab5d4207905e8dee9f5545f1de841d5adeaa4fd89961b9e63709d04b5c862b8bc81481311cf8e72ee327e459c9d91 SHA512 15ef4b92815a6dd9a6c51672dbc00fd7cd0f08068ef0cbeaca574f68d330b28bc67ba1946f24f75ef3d9e7b63843a73eea700db54688061dbf5c9f8470394c3b
 DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
 DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
-EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68
-EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d
-EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
-EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
-EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236-r1.ebuild 10181 BLAKE2B 4592e9e9407548ffe8813945edd74419a33f2f7b109512b512026e0b9ee18688e0891de2362e78adaa506f7acc8db661ed65f356eb01bc683a8481fedaca5165 SHA512 4e70cec4d45ee0d4cc5a3f55f641541216bfa899b69b4eb1a81c1aa4b2f2f4f61a0b4a791657deda8dd3e480696d415d0fcee48e9c50d8b39dcf2df141ce528a
-EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
-EBUILD udev-238.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
-EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
+EBUILD udev-216.ebuild 15081 BLAKE2B adc66d5478de63a817c208832802557672c072368d98495b9d1e8f53d790a4171bbe451503c81efd53d293e43426cb1b44acc0f8ae755dfe33a8138665c35b5a SHA512 8884c4ab00af90cd6e910e6137674f9dbe6baa846876a16e6048e6960dba74dd685407a24343e9e20f61d18299b1900f7eab1b9c9eab726ddba9a62ebd826709
+EBUILD udev-225-r1.ebuild 13436 BLAKE2B 551c495815193eeaf89dd70e1b0d969bb717200f18eedd241b6a308cbfe62388c5fb9bcd801597482f5c4f8451475c61b628b4f38de1df01d62a7cce11361cfb SHA512 b3310daf82972b710c37a6ee25776369bc09beac4926ea056d73421bd01627f93c2aaacdb2bd2b0819989629d82eea619d475ae4c6cd4179be2201cf7ec632a7
+EBUILD udev-233.ebuild 12904 BLAKE2B 53e3f5f68bf504acf0085f5e957894c1a3462bdcf8282e2399787a6d2ccf0a3b409116cbac5a3df22432d7576604807c8400755102731031416e9cec3a899fca SHA512 d7bc4f8d9c68ce67b25de78669301b39816c1ab2221e498dcf27c80c62466db99db32581648e5aab79fd960989c498cd035794c3f80666c388d363e6a9628c9c
+EBUILD udev-234-r1.ebuild 9860 BLAKE2B c639b5809d65ae4aabf2b205803a4ffa91e621003c1389b800fdc3907857a394d934cd33b6412586887a40e9cb2e81b98af1c0f5fa5a9cde6824ecc92f52fd03 SHA512 cadbafd59a47fd281bccacb13a2a7b4e9e5791861c15c6575c88241b7c15ad7bf63547c1576474b6b4a149682dea4284d89b49dd90cf2e0f4a0d02ea316db465
+EBUILD udev-235.ebuild 9858 BLAKE2B b065f8fd829ce9db02454ad88052aa482573eea5af6d08bd27e141ef5173a94046eb239c61c56bcf20476613854288d70d6342be75878d783ce2fce4da7045cd SHA512 bc81ad5b1d2fe4ba09d8a5733b44055206645dd3024a09e0246e91c8199f9a95f74ee03fc1ce0adb0640b4af0a66be2b59f8010ccbadc6eccc24016bb8019e2c
+EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee
+EBUILD udev-237.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
+EBUILD udev-238.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
+EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild
index 39ea2e597567..3d009073e05b 100644
--- a/sys-fs/udev/udev-216.ebuild
+++ b/sys-fs/udev/udev-216.ebuild
@@ -37,11 +37,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	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(-)]
-	)"
+	!sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/sys-fs/udev/udev-225-r1.ebuild b/sys-fs/udev/udev-225-r1.ebuild
index 8108a9b3c74b..ee167a2d7eca 100644
--- a/sys-fs/udev/udev-225-r1.ebuild
+++ b/sys-fs/udev/udev-225-r1.ebuild
@@ -35,11 +35,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.24
 	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(-)]
-	)"
+	!sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index 0b8e3832c2d7..9ca311c705fc 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 # Force new make >= -r4 to skip some parallel build issues
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
diff --git a/sys-fs/udev/udev-234-r1.ebuild b/sys-fs/udev/udev-234-r1.ebuild
index dba9ae2424cb..58780e73818e 100644
--- a/sys-fs/udev/udev-234-r1.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udev/udev-235.ebuild b/sys-fs/udev/udev-235.ebuild
index 6c88b45642fe..b92b31ab23ca 100644
--- a/sys-fs/udev/udev-235.ebuild
+++ b/sys-fs/udev/udev-235.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild
index 606402bb58a8..fbd64daf5c41 100644
--- a/sys-fs/udev/udev-236-r1.ebuild
+++ b/sys-fs/udev/udev-236-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udev/udev-237.ebuild b/sys-fs/udev/udev-237.ebuild
index 3b794e7c3ded..5825a197ca7d 100644
--- a/sys-fs/udev/udev-237.ebuild
+++ b/sys-fs/udev/udev-237.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udev/udev-238.ebuild b/sys-fs/udev/udev-238.ebuild
index 3b794e7c3ded..5825a197ca7d 100644
--- a/sys-fs/udev/udev-238.ebuild
+++ b/sys-fs/udev/udev-238.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 3b794e7c3ded..5825a197ca7d 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -29,11 +29,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
 	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(-)]
-	)"
+	!sys-apps/systemd"
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-util/intltool-0.50
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index f0a9b966b06b..d3bcfee86767 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,3 @@
 DIST udiskie-1.1.1.tar.gz 62207 BLAKE2B 47dea106580fbd037970b274205b896fa95e1f41cd8593bc9a14c8d19f40c3c44281e7334d4b0aaab0aa5e37146b8fa702afc4b82a2ed0e00549d2f9eb475533 SHA512 0524aeafb4777039a35be8854a0cf3bdbefd43eccb758da9aa2fa71fc4041816ff009dbbff20b4906c9bac281995c9923fcf542107a83c76ecb8c45d6b20b1ba
-EBUILD udiskie-1.1.1.ebuild 1081 BLAKE2B 55d3627cd716c018e49760ce5f93f4bca0969381abe83e9be7552d9d9410d9a2048c6ca7e744e12fa5720e96d36a6ae9c8ac4ccdfbf8cef404c3fe9033051980 SHA512 e2a6114feee80e8c169610ed89dc877854037c5395866189c152dda80a87d378abc7c49542b14448476b9413689ac24b52f17be4c4eefd39387169ef2d6f6945
+EBUILD udiskie-1.1.1.ebuild 1077 BLAKE2B 79182e84052ff6ec96d938847e2c32ba6063988267f7f5df1ff83187f02bc6fb88b2ed3c5c8e28d049d1263e72835bd41a93450118034538c56cdf998f784c9b SHA512 fcd58ed6fec0493cc13bfbafac36169ab3a5f6d71c8e7202adbac989515020f3d5218a75fc35ef5075251e42bb79db8c45bcd402eaf57b9c5ee47ab821f7879c
 MISC metadata.xml 270 BLAKE2B 5189aebfdd1b9a7cad5cef37c93c06aeae088156a4938b69b66aeb622ffd9d98235c9a2bf4441d69eba42fe19c46236c83527cd45b660c23c31e0883809c4b01 SHA512 88b1a34217420c25625124b4730a6a9c13ab0022b64c8905a5235b87ac8e2dc0aa44af1204bc96b022ad408b40658276c44897176348f4c43244fbeba3d3d306
diff --git a/sys-fs/udiskie/udiskie-1.1.1.ebuild b/sys-fs/udiskie/udiskie-1.1.1.ebuild
index 22d3ae29b3ce..4546e227b8ca 100644
--- a/sys-fs/udiskie/udiskie-1.1.1.ebuild
+++ b/sys-fs/udiskie/udiskie-1.1.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.python.org/pypi/udiskie https://github.com/coldfix/udiskie"
+HOMEPAGE="https://pypi.org/project/udiskie https://github.com/coldfix/udiskie"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"