gentoo resync : 29.12.2022

3 files changed, 293 insertions, 33 deletions

diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1cc20f9d4455..80c3c7366574 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,6 +1,8 @@
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
 AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88
 DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33
+DIST eudev-3.2.12-pre3.tar.gz 2166940 BLAKE2B 46cb4e2daa7302380f169b2505e01483a1c879f83802537b718d1380b9411621db9b58454eaf828ca22aa8e913342b52b682593604c365d7159ddc1df82fe719 SHA512 a450ef8ccfb0ec8817e03ae666464cb43390849d1b340f057e047bc42b246ff30e13cfef148417c7452755316bce858ef0c89bf94abf27af143f87db7de9f446
 EBUILD eudev-3.2.11-r2.ebuild 6886 BLAKE2B 94227204719bde1e703882979a32202510de947c3581e6e1e7bfe59e9b0e39182685bc56e3c8b2ad2fd009ced10ee9b4668324c882cf04a2a9463ccb3b3e2dbe SHA512 faadb9ca00bbd9b7d8cafc4446fa7c9399c49455d63bcaf0f94a59f7c8d31ff220c5409d94de101c538c4b849f8823c176b8616c0347b7fcdbdb2fe02d8b3080
-EBUILD eudev-9999.ebuild 6894 BLAKE2B b28cfa3485ada40b226a248f87ee2b56df00b83bbf0df1a6860a323e15cba5e9c9421efc2c513c39716d224ce0fa71df6115de73a34fcb3aacac9a87332d2821 SHA512 c428baf33d7cb86b3d4cdcdadc50be75f86177adcb11d185fdbc65182fb09ab8ffece38f0ab283ef6f5451e2ce1ed721ac20e368969c1b73a6a137734669945e
+EBUILD eudev-3.2.12_pre3.ebuild 6790 BLAKE2B 4d1744b62f949e57bdf0594ff01ed3c784c9de9142feb21ccaac56284965999fb0fa669f30e06fb09231abccdb208049c964266085ae140bf22f20f498f5dbe0 SHA512 c7a07f52602b8dc7fef177f64d4b169fd8e9a99224989f52268fb8d6786155d41cdbcca918cb1e4caaa08cd50d63f06f395a5d1b33db4b5e73fd7c23ff7c54fb
+EBUILD eudev-9999.ebuild 6790 BLAKE2B 4d1744b62f949e57bdf0594ff01ed3c784c9de9142feb21ccaac56284965999fb0fa669f30e06fb09231abccdb208049c964266085ae140bf22f20f498f5dbe0 SHA512 c7a07f52602b8dc7fef177f64d4b169fd8e9a99224989f52268fb8d6786155d41cdbcca918cb1e4caaa08cd50d63f06f395a5d1b33db4b5e73fd7c23ff7c54fb
 MISC metadata.xml 629 BLAKE2B c67407dd805c6e8d4fb0c5152e897263ca56649d1d5c7692c74a69a751e7824a2b6084fe1ce0f8cd1b13dbdd0ae3f082430d6552807690a9d52d83c907f43f64 SHA512 204a04a68ee53fe8fec226ad82fdbb3f2ee478f538379466343bbf55fd0146a71889ac11742d59261ef954bb9b8e09e8d2b9416079da63cc78ab400efd2ba49b
diff --git a/sys-fs/eudev/eudev-3.2.12_pre3.ebuild b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
new file mode 100644
index 000000000000..d286cedd7a14
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.2.12_pre3.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KV_MIN=2.6.39
+
+inherit linux-info multilib-minimal toolchain-funcs udev
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/eudev-project/eudev.git"
+	inherit autotools git-r3
+else
+	MY_PV=${PV/_pre/-pre}
+	SRC_URI="https://github.com/eudev-project/eudev/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/eudev-project/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+kmod rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=sys-apps/util-linux-2.20
+	>=sys-kernel/linux-headers-${KV_MIN}
+	virtual/libcrypt:=
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+RDEPEND="${DEPEND}
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	!sys-apps/systemd-utils[udev]
+	!sys-fs/udev
+	!sys-apps/systemd
+	!sys-apps/hwids[udev]"
+BDEPEND="dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+	)"
+PDEPEND=">=sys-fs/udev-init-scripts-26"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${PN} 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() {
+	default
+
+	# 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"
+
+	if [[ ${PV} == 9999* ]] ; then
+		eautoreconf
+	fi
+}
+
+multilib_src_configure() {
+	# bug #463846
+	tc-export CC
+	# bug #502950
+	export cc_cv_CFLAGS__flto=no
+
+	local myeconfargs=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
+		--enable-split-usr
+		--enable-manpages
+	)
+
+	# 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
+		myeconfargs+=(
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		myeconfargs+=(
+			--disable-static
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+			--disable-hwdb
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	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
+	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_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+
+	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
+
+	# 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 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* ]] && [[ -z ${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-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index a4edb4657be9..d286cedd7a14 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,32 +1,36 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KV_MIN=2.6.39
 
-inherit autotools linux-info multilib-minimal toolchain-funcs
+inherit linux-info multilib-minimal toolchain-funcs udev
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/eudev-project/eudev.git"
-	inherit git-r3
+	inherit autotools git-r3
 else
-	SRC_URI="https://github.com/eudev-project/eudev/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	MY_PV=${PV/_pre/-pre}
+	SRC_URI="https://github.com/eudev-project/eudev/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz"
+	S="${WORKDIR}"/${PN}-${MY_PV}
+
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
+HOMEPAGE="https://github.com/eudev-project/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="+kmod introspection rule-generator selinux static-libs test"
+IUSE="+kmod rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 DEPEND=">=sys-apps/util-linux-2.20
 	>=sys-kernel/linux-headers-${KV_MIN}
 	virtual/libcrypt:=
-	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!sys-apps/gentoo-systemd-integration
@@ -42,8 +46,10 @@ RDEPEND="${DEPEND}
 BDEPEND="dev-util/gperf
 	virtual/os-headers
 	virtual/pkgconfig
-	>=sys-devel/make-3.82-r4
-	test? ( app-text/tree dev-lang/perl )"
+	test? (
+		app-text/tree
+		dev-lang/perl
+	)"
 PDEPEND=">=sys-fs/udev-init-scripts-26"
 
 MULTILIB_WRAPPED_HEADERS=(
@@ -52,7 +58,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 pkg_pretend() {
 	ewarn
-	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "As of 2013-01-29, ${PN} provides the new interface renaming functionality,"
 	ewarn "as described in the URL below:"
 	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
 	ewarn
@@ -79,12 +85,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# change rules back to group uucp instead of dialout for now
+	default
+
+	# 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"
 
-	default
-	eautoreconf
+	if [[ ${PV} == 9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 multilib_src_configure() {
@@ -93,14 +102,13 @@ multilib_src_configure() {
 	# bug #502950
 	export cc_cv_CFLAGS__flto=no
 
-	# Keep sorted by ./configure --help and only pass --disable flags
-	# when *required* to avoid external deps or unnecessary compile
-	local econf_args
-	econf_args=(
+	local myeconfargs=(
 		ac_cv_search_cap_init=
 		ac_cv_header_sys_capability_h=yes
+
 		DBUS_CFLAGS=' '
 		DBUS_LIBS=' '
+
 		--with-rootprefix=
 		--with-rootrundir=/run
 		--exec-prefix="${EPREFIX}"
@@ -114,19 +122,17 @@ multilib_src_configure() {
 
 	# 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+=(
+	if multilib_is_native_abi ; then
+		myeconfargs+=(
 			--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+=(
+		myeconfargs+=(
 			--disable-static
-			--disable-introspection
 			--disable-kmod
 			--disable-selinux
 			--disable-rule-generator
@@ -134,11 +140,11 @@ multilib_src_configure() {
 		)
 	fi
 
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi ; then
 		emake
 	else
 		emake -C src/shared
@@ -147,22 +153,21 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
-	# make sandbox get out of the way
-	# these are safe because there is a fake root filesystem put in place,
+	# 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
+	# 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
+		default
 	fi
 }
 
 multilib_src_install() {
-	if multilib_is_native_abi; then
+	if multilib_is_native_abi ; then
 		emake DESTDIR="${D}" install
 	else
 		emake -C src/libudev DESTDIR="${D}" install
@@ -178,7 +183,13 @@ multilib_src_install_all() {
 	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
 }
 
+pkg_postrm() {
+	udev_reload
+}
+
 pkg_postinst() {
+	udev_reload
+
 	mkdir -p "${EROOT}"/run
 
 	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766