From 93a93e9a3b53c1a73142a305ea1f8136846942ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Dec 2021 14:08:05 +0000 Subject: gentoo resync : 22.12.2021 --- sys-fs/eudev/Manifest | 16 +-- sys-fs/eudev/eudev-3.2.10.ebuild | 237 ------------------------------------- sys-fs/eudev/eudev-3.2.11.ebuild | 235 ++++++++++++++++++++++++++++++++++++ sys-fs/eudev/eudev-3.2.5.ebuild | 234 ------------------------------------ sys-fs/eudev/eudev-3.2.7-r2.ebuild | 237 ------------------------------------- sys-fs/eudev/eudev-3.2.8.ebuild | 237 ------------------------------------- sys-fs/eudev/eudev-3.2.9.ebuild | 237 ------------------------------------- sys-fs/eudev/eudev-4.9999.ebuild | 218 ---------------------------------- sys-fs/eudev/eudev-9999.ebuild | 91 +++++++------- sys-fs/eudev/metadata.xml | 7 +- 10 files changed, 286 insertions(+), 1463 deletions(-) delete mode 100644 sys-fs/eudev/eudev-3.2.10.ebuild create mode 100644 sys-fs/eudev/eudev-3.2.11.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.5.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.7-r2.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.8.ebuild delete mode 100644 sys-fs/eudev/eudev-3.2.9.ebuild delete mode 100644 sys-fs/eudev/eudev-4.9999.ebuild (limited to 'sys-fs/eudev') diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index 96b1ff1f625f..1152cdddd1c7 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -1,16 +1,8 @@ AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d -DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c -DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40 -DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42 -DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f +DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33 EBUILD eudev-3.2.10-r1.ebuild 6973 BLAKE2B 4951dcd4fc1e1c8cba9aabb97f2d09d3447ddb7ab89adef7b049d638d6c82bf934d085f8df4f659c7e80bcf3e803b513c4b3a161ed364cfff2766cd43659bef4 SHA512 fbe1a5e1da7a836c41026ef6a4a73d4f56c20793e45faec6e114d8dd16d239d1b101efa6e80ad8447f077c6ed87824c4744e8506349eff0f02dcff03c2e3c937 -EBUILD eudev-3.2.10.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585 -EBUILD eudev-3.2.5.ebuild 6833 BLAKE2B e1a9f2ce47f6df7ed61f0544d7c134898a25d84b73842a66b94c95135bcf6ba95483999025a763264c2a44b6d5fbac0f34bc4e7051b420e90aaf50fa1cbda75f SHA512 ebadb7eb40160b3b85432cbf6b59285b47f4cbeaea7de47a3ce72fc6558edcfdcbb3956980ca3a3933c3f6887330fe0d7bcebafc1d579a42283d20b124c7d4e3 -EBUILD eudev-3.2.7-r2.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba -EBUILD eudev-3.2.8.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba -EBUILD eudev-3.2.9.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585 -EBUILD eudev-4.9999.ebuild 6105 BLAKE2B edad7d04272f0430ad3e8a347ad3f043a295298d04156ada8576757db2a4d0bfc8732f295ca6db69cb14ee2a47ef376160e06358aa25c17a2f21e2346394149e SHA512 e265895d5feeab3053595e9b84db879a4b87829b0aa28383ec16ad213cea56e6231d8742ace9c303397d261e4fad3e11dab3b2a10025e29cb65504d69e4e7426 -EBUILD eudev-9999.ebuild 6968 BLAKE2B 31272c7f13a0c06fddc6c2ffbe7bbcce75e1a9e1deb79960c2d27c509802acc85694de3d048b628b4b575c1cfc6bdf6e8b8ae8c1576201b35fff7cca9d03dc81 SHA512 8577f6c5dcccc932835efc88106feb9f1a04fffa51cb1770f9f3add1670283718ee8038f8771577d2d3033fbc58011c3c011e9a57fecad5ca2623391f5ff2862 -MISC metadata.xml 859 BLAKE2B 8a049b78d4c9a284315378d574a9774b1b90cb001102da02c9b4a2e01c603e7272ee4c5945cc8ea0531d99b006db21271b506207935143a64f83363e2785b5a3 SHA512 6aad92b8a8eeb4530c68323e87ac3550f750aec5c59b77c9a7c1d99cd2ec9a94070dbc999ace295cd1bf8a973b1092b25fd71568b15698f9e916ba9d763c95e1 +EBUILD eudev-3.2.11.ebuild 6856 BLAKE2B 88bf5e0f826ccddf58593fc9bc5e362808e69fa1ceb2600572425f00f02c0af21de0cf98717bfe9e923bdcec81b2997c6fcef02428a8beca3f46cc4c92334b48 SHA512 dc5e36e2073fd363a9582a52dab0f9c84fd16458622020a08a64e73ec81df241f73789d9fe51d35a0bf05992d15c5bbb5183afdc26a5f57b67e25fea24054324 +EBUILD eudev-9999.ebuild 6863 BLAKE2B 8cc05463b8c914bf3b460cc929df84961d8c27f63a18aef95bb6680de247a947e7dd6f01e047fa3052f4fc75be693ee14b0a8692052c284fe4bf709c80abca29 SHA512 380bfb084e4836a71a138225a77b33ab5da6b78db96dad14a78a3eedbdea585fca7fd7f9ac2a0513d55d3bfa5c29ed6b8672635e2c743cc04630b45bd8115971 +MISC metadata.xml 721 BLAKE2B 632d4454c02f58d293a7c8c8fd889085e5942a946d1238c0b8e38e4ff6a9aa7d6a7ec8c3980a36669fe05a32273ba828c4d89980d4cec8866379fc0a77d743ef SHA512 6f65edb2f3edad63fea660718bf770bac44cf4ed6bb5cc4ef8e48fcaab566378f24af8610ce7e9493e1541bcb3249d9c74324e2d0cb970e4bbfa194b8a157921 diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild deleted file mode 100644 index c2910b122451..000000000000 --- a/sys-fs/eudev/eudev-3.2.10.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 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.11.ebuild b/sys-fs/eudev/eudev-3.2.11.ebuild new file mode 100644 index 000000000000..0ad41a30ab58 --- /dev/null +++ b/sys-fs/eudev/eudev-3.2.11.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KV_MIN=2.6.39 + +inherit autotools linux-info multilib-minimal toolchain-funcs + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/eudev-project/eudev.git" + inherit 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" +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="+kmod introspection 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 + !sys-apps/systemd" +RDEPEND="${DEPEND} + acct-group/input + acct-group/kvm + acct-group/render + !sys-fs/udev + !sys-apps/systemd + !sys-apps/hwids[udev]" +BDEPEND="dev-util/gperf + virtual/os-headers + virtual/pkgconfig + >=sys-devel/make-3.82-r4 + 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, ${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" + + default + eautoreconf +} + +multilib_src_configure() { + # bug #463846 + tc-export CC + # 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=( + 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 + 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 + --disable-hwdb + ) + 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_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() { + 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_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 + + # 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-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild deleted file mode 100644 index 8dad253df479..000000000000 --- a/sys-fs/eudev/eudev-3.2.5.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -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 ~s390 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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 - - # 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.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild deleted file mode 100644 index 1038cbac1eec..000000000000 --- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -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 ~riscv ~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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 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.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild deleted file mode 100644 index 1038cbac1eec..000000000000 --- a/sys-fs/eudev/eudev-3.2.8.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -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 ~riscv ~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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 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.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild deleted file mode 100644 index c2910b122451..000000000000 --- a/sys-fs/eudev/eudev-3.2.9.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -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 ~m68k ~mips ppc ppc64 ~riscv ~s390 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" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 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-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild deleted file mode 100644 index 3299349b6218..000000000000 --- a/sys-fs/eudev/eudev-4.9999.ebuild +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 toolchain-funcs - -if [[ ${PV} = 4.9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - EGIT_BRANCH="eudev-4" - 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 ~riscv ~sparc ~x86" - KEYWORDS="" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0" -IUSE="+blkid efi +hwdb +kmod selinux smack test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !/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 - - # 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-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild index 1ed46df87518..b830fc310bc6 100644 --- a/sys-fs/eudev/eudev-9999.ebuild +++ b/sys-fs/eudev/eudev-9999.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 -KV_min=2.6.39 +KV_MIN=2.6.39 -inherit autotools linux-info multilib multilib-minimal toolchain-funcs +inherit autotools linux-info multilib-minimal toolchain-funcs if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" + EGIT_REPO_URI="https://github.com/eudev-project/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 ~riscv ~sparc ~x86" + 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" fi DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" @@ -20,36 +20,30 @@ 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" +IUSE="+kmod introspection rule-generator selinux static-libs test" RESTRICT="!test? ( test )" -COMMON_DEPEND=">=sys-apps/util-linux-2.20 +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 ) - !/dev/null - if [[ -d ${EROOT}dev/loop ]]; then + 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 @@ -204,16 +202,17 @@ pkg_postinst() { fi done - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" + 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* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then + 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" diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml index 1a5c17dcddae..4ea35bd6e025 100644 --- a/sys-fs/eudev/metadata.xml +++ b/sys-fs/eudev/metadata.xml @@ -5,16 +5,13 @@ eudev@gentoo.org - enable blkid support - enable EFI support read vendor/device string database and add it to udev database enable module loading through libkmod - enable SMACK security model 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 + that the functionality within was dropped from sys-fs/udev as it is not stable in all cases; use at your own risk - gentoo/eudev + eudev-project/eudev -- cgit v1.2.3