gentoo Easter resync : 12.04.2020

6 files changed, 269 insertions, 131 deletions

diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index d800a81b31b1..814e63e6abe2 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,8 +1,10 @@
 AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
-EBUILD udev-242.ebuild 9611 BLAKE2B f710e8890eba0889989a3da148267dcc5770ef9f099571e97c7722fd6a93a3b8a5d72a6557e6c3c4eab57040002aea96fbf7ea595a2702c7e84261a4e420217a SHA512 3cf8405ba49e4fafcc4c8df19c8a27594b521fb62e35be60a229098ef2b2b93edcff0df1a6556193d7f6fc8efda43c3fa04933121efd1770b6a22ac50694ae7c
-EBUILD udev-243-r2.ebuild 9810 BLAKE2B c9cf7802630e724ee7815dc78481e3971aa8d1ac9a0e9bf13060a356ae6ef1acc4761320663177f0468bf880baf428255f63a372af4dcf0d121b337a085ea49e SHA512 f936abdbf7a9d21a1b3b0bb558b2ebb272f43e57521ef4bcdd1282b41d9aedc97874aaf5dda495984c7251af19a0a146d337e90992dea04b5c985615a73a7bc1
-EBUILD udev-243.ebuild 9570 BLAKE2B 020a845640cb14fd9ddff78b8e5526df69964d35c6eef33ab39fa30c4001558170d89e256641f9a394ebaeba7e81bc764d8765b8fe6583fe05aefb35dfcefed2 SHA512 1644eeff8e645f5514a80cffd8f357f0077514c35d489a77d088f1006e6e43930984aabc0195576be392b83bdec9ecf02c36062084471be368798a4b81891f53
-EBUILD udev-9999.ebuild 9847 BLAKE2B 7f94e3a34b82cdffe6b2a233b9197570e4af9ca4eaa7df5a49156905d21893867b569d9dec6d350eb280b5848f101364dd96d410f3c4d47d77416951de7b7ba5 SHA512 2ed67940af79cbb0bd5743e6edeb16215371a1903eaa11e0ac48de7d030404e056a5f63d7a62f12dd6b6da39f46d44835684bf0286dc83a44e406155b8d7845e
+DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
+EBUILD udev-242.ebuild 9609 BLAKE2B 9b7923bbb7343ed03e20a2fc030e22dd6ce30312c29c6b2ab6a3afa5b87c491416ea48d1d6c06ea2a9203dbcbfa5e43ccaaa426d077f4cc7069d6679631ecac3 SHA512 434ea891c9852cbe1e7a448c7bae003c7bbc61717bfb1c97e32af984c00b000bba6f698a9a10b9bb186a2f9e76596752b1317a847f0509487592d04ce96a9876
+EBUILD udev-243-r2.ebuild 9807 BLAKE2B afd9f20de9da69ae4479bfa2c19682555cdce783194ebef1ff56be2e43e6d4df6645653a2e554532a6cf86630f3f6e7dd100e1e98ff437ac2ac962ecd2264247 SHA512 4e6aafea5860f2d9f9b905b093dcdbf1f618dc51c00eca4557aa22ac5acbd765422a962e0d4b5fff14c76f6341df93199689d36477a08046591ab277399b7d6d
+EBUILD udev-243.ebuild 9566 BLAKE2B 3f5159a90dfb4be8a55c894820db190692f36542d01cc68120efb59201a1bb65299b91175f9ee4739836477aca71618dbc28407106de9049bf9db7deb0b89637 SHA512 923ae752ec75c8d5ff42fcf929932e04972dbcd529d2ac85decaa7998ace17e0bde3ef304e8097892f29f5ed0235388742f2668b06b7653b63e19bdd19934206
+EBUILD udev-245.ebuild 5771 BLAKE2B f240fde995db1e73ab8cd9ba79d5fadd2761dc376afe627cf3be28d4fdfb3e5be56df6b0f7be90637ce029163520026b11f682bf407b5bc4dc2bc61738a44dbb SHA512 c66b30ebf223fe98c7de56d693296e04061f269e6f59dd897f26b987a0a78026bfdd36c94489cec0d8b3eef42d1c4108d94f8bd65691743cbdb1ed00840c32e3
+EBUILD udev-9999.ebuild 5771 BLAKE2B f240fde995db1e73ab8cd9ba79d5fadd2761dc376afe627cf3be28d4fdfb3e5be56df6b0f7be90637ce029163520026b11f682bf407b5bc4dc2bc61738a44dbb SHA512 c66b30ebf223fe98c7de56d693296e04061f269e6f59dd897f26b987a0a78026bfdd36c94489cec0d8b3eef42d1c4108d94f8bd65691743cbdb1ed00840c32e3
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
index d61fce036288..50636e495ad0 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.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 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index 96cb445a0a97..34e919e5c634 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.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 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-243.ebuild b/sys-fs/udev/udev-243.ebuild
index d48c72b25fa7..0a23777e5dea 100644
--- a/sys-fs/udev/udev-243.ebuild
+++ b/sys-fs/udev/udev-243.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.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 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udev/udev-245.ebuild b/sys-fs/udev/udev-245.ebuild
new file mode 100644
index 000000000000..4cdaa936a654
--- /dev/null
+++ b/sys-fs/udev/udev-245.ebuild
@@ -0,0 +1,237 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	MY_P=systemd-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	local PATCHES=(
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dstatic-libudev=$(usex static-libs true false)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if use static-libs; then
+		targets+=( src/udev/libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a src/udev/libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules.d/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules.d/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index e5fad94c8e4a..4cdaa936a654 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2003-2019 Gentoo Authors
+# Copyright 2003-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
 
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.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 ~sparc ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -25,27 +25,26 @@ IUSE="acl +kmod selinux static-libs"
 
 RESTRICT="test"
 
-COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	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"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-util/gperf
 	>=dev-util/intltool-0.50
-	>=dev-util/meson-0.40.0
-	dev-util/ninja
 	>=sys-apps/coreutils-8.16
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-3.9
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
 RDEPEND="${COMMON_DEPEND}
 	acct-group/kmem
 	acct-group/tty
@@ -59,8 +58,9 @@ RDEPEND="${COMMON_DEPEND}
 	acct-group/render
 	acct-group/tape
 	acct-group/video
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10"
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-26"
 
@@ -227,110 +227,9 @@ multilib_src_install_all() {
 }
 
 pkg_postinst() {
-	mkdir -p "${ROOT%/}"/run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
-	if [[ -d ${ROOT%/}/dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, https://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	elog
-	elog "Starting from version >= 197 the new predictable network interface names are"
-	elog "used by default, see:"
-	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
-	elog
-	elog "Example command to get the information for the new interface name before booting"
-	elog "(replace <ifname> with, for example, eth0):"
-	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	elog
-	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
-	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
-	elog "to disable the feature."
-
-	if has_version 'sys-apps/biosdevname'; then
-		ewarn
-		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
-		ewarn "detected to be installed with the new predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-	if has_version 'sys-apps/openrc'; then
-		ewarn "For sys-apps/openrc users it is:"
-		ewarn "# /etc/init.d/udev --nodeps restart"
-	fi
-
-	elog
-	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
-	elog "fixing known issues visit:"
-	elog "https://wiki.gentoo.org/wiki/Udev"
-	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
-
-	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
-	# do the same for 80-net-setup-link.rules to keep the old behavior
-	local net_move=no
-	local net_name_slot_sym=no
-	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
-	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
-	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
-	if [[ ! -e ${net_setup_link} ]]; then
-		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
-		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
-			net_move=yes
-			net_name_slot_sym=yes
-		fi
-	fi
-	if [[ ${net_move} == yes ]]; then
-		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
-		if [[ ${net_name_slot_sym} == yes ]]; then
-			ln -nfs /dev/null "${net_setup_link}"
-		else
-			cp "${net_name_slot}" "${net_setup_link}"
-		fi
-		eend $?
-	fi
-
 	# Update hwdb database in case the format is changed by udev version.
 	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
+		udevadm hwdb --update --root="${ROOT}"
 		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
 		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
 		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload