summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-12 08:41:54 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-12 08:41:54 +0100
commit4df3bf9762850b34cd1ead5c80374d1a0fc3362e (patch)
tree3080c5cb7ad17abcb63776a9f21c4947845546a6 /sys-fs
parent814f4cf860e299a046b649eaee5463427984c09c (diff)
gentoo resync : 12.07.2021
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/Manifest.gzbin21563 -> 21561 bytes
-rw-r--r--sys-fs/bees/Manifest4
-rw-r--r--sys-fs/bees/bees-0.6.5-r1.ebuild (renamed from sys-fs/bees/bees-0.6.5.ebuild)7
-rw-r--r--sys-fs/bees/bees-9999.ebuild8
-rw-r--r--sys-fs/e2fsprogs/Manifest2
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild2
-rw-r--r--sys-fs/genfstab/Manifest2
-rw-r--r--sys-fs/genfstab/genfstab-24.ebuild2
-rw-r--r--sys-fs/mtools/Manifest8
-rw-r--r--sys-fs/mtools/mtools-4.0.30.ebuild46
-rw-r--r--sys-fs/mtools/mtools-4.0.31.ebuild2
-rw-r--r--sys-fs/mtools/mtools-4.0.32.ebuild (renamed from sys-fs/mtools/mtools-4.0.29.ebuild)0
-rw-r--r--sys-fs/multipath-tools/Manifest4
-rw-r--r--sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch226
-rw-r--r--sys-fs/multipath-tools/metadata.xml3
-rw-r--r--sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild88
-rw-r--r--sys-fs/udev/Manifest5
-rw-r--r--sys-fs/udev/files/249-libudev-static.patch26
-rw-r--r--sys-fs/udev/udev-249-r1.ebuild232
-rw-r--r--sys-fs/udev/udev-9999.ebuild10
20 files changed, 613 insertions, 64 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 33ddfdb23be1..33e4da92cfc5 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
Binary files differ
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index de2f6c58b6b6..d0e9582af0f9 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,5 +1,5 @@
AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc
DIST bees-0.6.5.tar.gz 125987 BLAKE2B 459cec5f3c706045ee12a6efe2e32315d71ca16c966bbdb4d6c813f726a7cc411cf4bd272c082ba0bbfc33e9ec4c715a6be773ba929c2b5b31f1731e10ad137c SHA512 db4cf6bc8c7709ee9aa1e2faa2ac1c6323fb8c7407470cec0c370a0f910ec4a1f3cf6ebe695d16383aaec00b62b3de77aa5bbdd47502bdb564e247b3b8879e0b
-EBUILD bees-0.6.5.ebuild 3221 BLAKE2B 691a3ff0dc53473392ed9b38a0c8cdc9531cdf9063a979cf60c2160cba4dd7c1de0204acb4127424ecc6427140a1d65134e48b3ec3b3f263d6cc1a27402352b9 SHA512 b82844817a11ba984862716f8619f61e019c238e68e87e2fd38636f28ab510a2887ba15686e797bcd85b164da1923eee9a7e5574868fa900806d80a2c7911440
-EBUILD bees-9999.ebuild 3071 BLAKE2B 0b4f8cc24bdc8f1045a56ca49bd5b6dff791f48d8129bac99a3e769c8b792f1b159124932116666081a1d3338768b0a1065f30f0aed032bbdd96abd7fb85b1c5 SHA512 ec51670d6fbf96475d58af13833bc232a2516f9349327ce5f4da247077f99e013eafb1a4779439caf17b6361c0d97a98961870f786b0f48fc99452d44e8e4c62
+EBUILD bees-0.6.5-r1.ebuild 3403 BLAKE2B 751cfa80fbe49cab4eab2b3071c936ad589c93cbf373d82458375a2995a1d9e64be72bd1b1ca1bc17325778753ac8455d3d33eb7d40fd709fe5860b96af18bc6 SHA512 49bcf89cd12b0d11617c8d4f88287fa318afeed13ad92408908b6e019513e4403a69e434b72fd0955363eb85d001d0ef8dfee199e2803f2a9977cb52e5977465
+EBUILD bees-9999.ebuild 3217 BLAKE2B f91c2f9529d2afb81a1b1f5634d8975bc54f75e27a13b86cd03888be6c9deb573d98d5cabff450c9faf385e1c04e4b9e4c4b92f0f4f398e6927633b61f48e1a5 SHA512 67096a3444e35be517e9001698466c763fb8668f56532edc2340bc1175c7259ec1eb7c5acbca941214dadd74cb865efe0280cc06c601ddab714206f7c8046dc3
MISC metadata.xml 621 BLAKE2B ad7950528a5e6cedcfd19fa0f1ce9e56a865a27cdd385140109378554d420a4aaece5ffedc7be785a5a3968a85415955618442986de458adb2ce268d7afaead9 SHA512 82f309ea8403bddff65a4e7843647f99084543aa008b5d183b22d9b165f0590043f25a79f504f02b1a6e578d50f87008b88d9c453fa7afa287d1cab1d92fa669
diff --git a/sys-fs/bees/bees-0.6.5.ebuild b/sys-fs/bees/bees-0.6.5-r1.ebuild
index a52e8e18f6c9..ee339e86c5d3 100644
--- a/sys-fs/bees/bees-0.6.5.ebuild
+++ b/sys-fs/bees/bees-0.6.5-r1.ebuild
@@ -77,6 +77,7 @@ src_prepare() {
src_configure() {
tc-export CC CXX
cat >localconf <<-EOF || die
+ ETC_PREFIX="${EPREFIX}/etc"
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
PREFIX="${EPREFIX}/usr"
LIBDIR="${EPREFIX}/$(get_libdir)"
@@ -92,3 +93,9 @@ src_configure() {
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
fi
}
+
+src_compile() {
+ default
+ # localconf quotes leak in the systemd unit but are still needed for spaces
+ sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 7777d0ea45fd..7fffe63931c2 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -74,9 +74,9 @@ src_prepare() {
src_configure() {
tc-export CC CXX AR
cat >localconf <<-EOF || die
+ ETC_PREFIX="${EPREFIX}/etc"
LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
PREFIX="${EPREFIX}/usr"
- LIBDIR="${EPREFIX}/$(get_libdir)"
SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
DEFAULT_MAKE_TARGET=all
EOF
@@ -87,3 +87,9 @@ src_configure() {
echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
fi
}
+
+src_compile() {
+ default
+ # localconf quotes leak in the systemd unit but are still needed for spaces
+ sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index de6fbfeaa867..96ca74c91cb2 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -11,5 +11,5 @@ DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c1346
EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
-EBUILD e2fsprogs-1.46.2.ebuild 4013 BLAKE2B 4ba387f46dc9dac622408c00d24746073aa9d35cef5c7f0ea07e5436c0effa7d81dbf57bd6b0408c867bfec825eeab1f4b98671885a48e1b3875499e4a2b36f8 SHA512 1e1708add89583247ae5a240a8c73f0f58df7604785f60cde5687dbde8accf94b9e65710acb83144d122fc83662ed1a54328546cc7feb71af8dfc03cc0005377
+EBUILD e2fsprogs-1.46.2.ebuild 4015 BLAKE2B 6aabd166fce82e441e6214fcc911033c3b58ac114870b221c29e4d55978adf8819d8dfa09d0b8549ca6fbd5e964fa2bb3de5afe8a1006e31c92fa4785949ace0 SHA512 6faff94db1cff5d1ae4c726afb9c8e5a31cb2f435f009af4b66668d65ffc88375d98ed4a187c744abb368d1804db6c193bceef7a76057d94df94cb4ad9bb61b5
MISC metadata.xml 634 BLAKE2B c11dd95ebf99bba614e96cec545a7b37ec9503105d37ce33bde91601efcae5b535fbb5e73fb908e70e87156ba3c2808037926f52f88205a09f22d1a0f6e6b83c SHA512 7c06b2fdfb370ace38d2c765a37ae1351e8d5316ba5ddc640f625f0f24671a70bdade38cdd58678c2cdaacf05833b735517561426f6658d970874abfd8fb9391
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
index a7700f01e7dd..35a2562be6d2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD"
RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index 5d50e37347c3..efb68caef8d6 100644
--- a/sys-fs/genfstab/Manifest
+++ b/sys-fs/genfstab/Manifest
@@ -1,3 +1,3 @@
DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661
-EBUILD genfstab-24.ebuild 467 BLAKE2B a452279d1c7895a6891460d9b38e38d520ce44154183e8a1766e3457918f2407d778bf3a822796801b077c86e816ef0cea59d54db79ac9c0e6c999eb62dec70b SHA512 d928efdc32706251c4d7851b26eb573140d4aef02ff90e074d528280eef3ab1821a3601186e213143f050e8883e5c29b1041ccde2f3fd0a8c51bf8b444c9b136
+EBUILD genfstab-24.ebuild 465 BLAKE2B f0a595b1f929dd1033c7266f889c9262a4577e3bad9282321042390d4f8ce7a610df80b54903ca1586e2a9a9f1e707a75af72cf0f898ead342e4dbeec757f661 SHA512 9a42728709900e0e8c691e527e267798d58544e337bada26a037db136d8cf09923a2b71e9e06c2cd2d9816c0bf7dc7df4f14b9b1ac6719f3bf6d1c405efba562
MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
index 7773f1880dce..d26d48dc6e40 100644
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ b/sys-fs/genfstab/genfstab-24.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
BDEPEND="app-text/asciidoc"
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index fe730bafdc14..03b9a747708d 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,9 +1,7 @@
DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
-DIST mtools-4.0.29.tar.bz2 440446 BLAKE2B b448fad8f5669230dc4fe32442c3a8b0ee570e1b084ac6b99b3239fa16fa97ba0ac5263aee34fefcb8726999178829a9ad6ed0444f41361518e5d24cfb3de083 SHA512 3671fa835bf7b410b33acbe0e4694da1609f284a99268e7c64ebdbf3ce9fc9e78cc5594d06eae5487e380b983ead190098d01a9fc1bc88b4eda324046172e62e
-DIST mtools-4.0.30.tar.bz2 442886 BLAKE2B dd66897c814c2afd842d6cb2a0865b4559a38c0c99468f6d96f16c869ed088f4a136c4ce798af39ca3115076dff9f303bd79145f17d502bc25d4b5b0a81f11e2 SHA512 9871dd2237c595286334d162bf9f494bc389cfc2cf098012484994212eff2c522fce357567b3fa5a7b314cc7336f7329fd9d71a2e1a0be2fdb3293dcbc4d98f5
DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
+DIST mtools-4.0.32.tar.bz2 436537 BLAKE2B 6b057be3d053ecf1ebee72b6b73324ec2cdbd7daf87c927f6ec2f6ef203345ddb869d6d7cb645e21054304ae68fc7a33e77e7a0f0cb606d3b755da36e66ca69a SHA512 a66e7483c422abdaddbe9e6b2cd0ecc2f87b0bc4f40929ac2e4db8b8d88cfacf118b126cba3207307bff376d5572170a1ee5803618de0544f68d420ed06bcab9
EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
-EBUILD mtools-4.0.29.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
-EBUILD mtools-4.0.30.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
-EBUILD mtools-4.0.31.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.31.ebuild 1053 BLAKE2B e2f1e01bc4e7ca2ec6780695dcc1ea308bd546c331486810267d494761f1cc728dd1994d531643537d603fddae96bc100a4c71082542344aabeb16bfc0803bf3 SHA512 c6d35dffd8ed5b889b44aed6518cd8aef7e647d9b03c2db36a906e87469d04cbae976b991e2cdc5b7703738d0178c08042ac380c617bff1ef30e5f8e73a77a58
+EBUILD mtools-4.0.32.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.30.ebuild b/sys-fs/mtools/mtools-4.0.30.ebuild
deleted file mode 100644
index 3ebdd3b6df91..000000000000
--- a/sys-fs/mtools/mtools-4.0.30.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-RDEPEND="
- !elibc_glibc? ( virtual/libiconv )
- X? (
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXt
- )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- use !elibc_glibc && use !elibc_musl && append-libs "-liconv" #447688
- local myeconfargs=(
- --sysconfdir="${EPREFIX}"/etc/mtools
- $(use_with X x)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local -a DOCS=( README* Release.notes )
- default
-
- insinto /etc/mtools
- doins mtools.conf
-
- # default is fine
- sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
index 3ebdd3b6df91..87146d25de94 100644
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
IUSE="X elibc_glibc"
RDEPEND="
diff --git a/sys-fs/mtools/mtools-4.0.29.ebuild b/sys-fs/mtools/mtools-4.0.32.ebuild
index 3ebdd3b6df91..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.29.ebuild
+++ b/sys-fs/mtools/mtools-4.0.32.ebuild
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 025af351052b..2e37ad06efce 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,6 +1,8 @@
AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47
+AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538fc5c7babe920b47e94af8e8bca53f4c8e71f612517430a64d371d6fb2480c5d9b706198f32015ed323c45f9034d22c8bddaecc2bd11d0c671513 SHA512 446c756fd947daecae790733f9c15ca0e7bc902b9aa832a4f4f4625d3fc74f5f7772402f37fd48f0498ca281ae484690d3f1c913cc2dfea6cca9f7b5f8b43b4b
AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
+EBUILD multipath-tools-0.8.6-r1.ebuild 2143 BLAKE2B e43f6abb36ea701d747513b6ac01344872b9e36c976f3f8213a51406d767047af9e69e0f1e4c6436852397fc597c57f89dc819985249362fed8e491015a47211 SHA512 c958b3bc9ade0daa842992efe67499ecd86d7948057bd1fcc88d158e5109539e5ac20ce5aaa17d6d73125158a38aa4dabbe4eb150dec8f282ebfa3b189b0d062
EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a
-MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
+MISC metadata.xml 452 BLAKE2B e950c42b1b03518526a348e0bb2a6ad8d2b912e14f71562d4249d1adeaf149443621d4518a6fdf7912e8efeb40634177a0da7d944d2142c7eb851231356a353c SHA512 2bd1aab9e07240502a4bd344c9ed73df3c677f41083f76865862e679c613dbf23957bce83469b5ddb9afa43fda13b7cf2fa4efb31da9b89a9ec91631260111b2
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
new file mode 100644
index 000000000000..d8521436d955
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch
@@ -0,0 +1,226 @@
+From 80cca1a75f24ee239ace5577d49ccfec511480ca Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Mon, 12 Jul 2021 06:04:04 +0100
+Subject: [PATCH] Don't compress man pages
+
+---
+ kpartx/Makefile | 5 ++---
+ libdmmp/Makefile | 13 ++++---------
+ libmpathpersist/Makefile | 14 +++++---------
+ mpathpersist/Makefile | 5 ++---
+ multipath/Makefile | 10 ++++------
+ multipathd/Makefile | 5 ++---
+ 6 files changed, 19 insertions(+), 33 deletions(-)
+
+diff --git a/kpartx/Makefile b/kpartx/Makefile
+index 2906a98..cd351a4 100644
+--- a/kpartx/Makefile
++++ b/kpartx/Makefile
+@@ -21,7 +21,6 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS)
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ install: $(EXEC) $(EXEC).8
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -33,11 +32,11 @@ install: $(EXEC) $(EXEC).8
+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+ $(INSTALL_PROGRAM) -m 644 del-part-nodes.rules $(DESTDIR)$(libudevdir)/rules.d/68-del-part-nodes.rules
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ $(RM) $(DESTDIR)$(libudevdir)/kpartx_id
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/11-dm-parts.rules
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules
+diff --git a/libdmmp/Makefile b/libdmmp/Makefile
+index 764a0bc..a859786 100644
+--- a/libdmmp/Makefile
++++ b/libdmmp/Makefile
+@@ -21,13 +21,13 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden -I$(libdmmpdir) -I$(mpathcmddir) \
+ LIBDEPS += $(shell $(PKGCONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
+
+ all: $(LIBS) doc
+-.PHONY: doc doc.gz clean install uninstall check speed_test dep_clean
++.PHONY: doc clean install uninstall check speed_test dep_clean
+
+ $(LIBS): $(OBJS)
+ $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
+ $(LN) $@ $(DEVLIB)
+
+-install: doc.gz
++install: doc
+ mkdir -p $(DESTDIR)$(usrlibdir)
+ $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(usrlibdir)/$(LIBS)
+ $(INSTALL_PROGRAM) -m 644 -D \
+@@ -41,7 +41,7 @@ install: doc.gz
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+ perl -i -pe 's|__INCLUDEDIR__|$(includedir)|g' \
+ $(DESTDIR)$(pkgconfdir)/$(PKGFILE)
+- $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3.gz
++ $(INSTALL_PROGRAM) -m 644 -t $(DESTDIR)$(man3dir) docs/man/*.3
+
+ uninstall:
+ $(RM) $(DESTDIR)$(usrlibdir)/$(LIBS)
+@@ -55,7 +55,7 @@ uninstall:
+
+ clean: dep_clean
+ $(RM) core *.a *.o *.gz *.so *.so.*
+- $(RM) docs/man/*.gz
++ $(RM) docs/man/*
+ $(MAKE) -C test clean
+
+ include $(wildcard $(OBJS:.o=.d))
+@@ -66,13 +66,8 @@ check: all
+ speed_test: all
+ $(MAKE) -C test speed_test
+
+-doc.gz: doc $(patsubst %,%.gz,$(wildcard docs/man/*.3))
+-
+ doc: docs/man/dmmp_strerror.3
+
+-docs/man/%.3.gz: docs/man/%.3
+- gzip -c $< >$@
+-
+ docs/man/dmmp_strerror.3: $(HEADERS)
+ TEMPFILE=$(shell mktemp); \
+ cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
+diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile
+index 57103e5..37c765a 100644
+--- a/libmpathpersist/Makefile
++++ b/libmpathpersist/Makefile
+@@ -12,7 +12,7 @@ LIBDEPS += -lmultipath -lmpathcmd -ldevmapper -lpthread -ldl
+
+ OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o
+
+-all: $(DEVLIB) man
++all: $(DEVLIB)
+
+ $(LIBS): $(OBJS) $(VERSION_SCRIPT)
+ $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ \
+@@ -21,10 +21,6 @@ $(LIBS): $(OBJS) $(VERSION_SCRIPT)
+ $(DEVLIB): $(LIBS)
+ $(LN) $(LIBS) $@
+
+-man:
+- $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz
+- $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz
+-
+ install: all
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir)
+ $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS)
+@@ -32,14 +28,14 @@ install: all
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir)
+ $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(includedir)
+ $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir)
+- $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir)
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_in.3 $(DESTDIR)$(man3dir)
++ $(INSTALL_PROGRAM) -m 644 mpath_persistent_reserve_out.3 $(DESTDIR)$(man3dir)
+ $(INSTALL_PROGRAM) -m 644 mpath_persist.h $(DESTDIR)$(includedir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(syslibdir)/$(LIBS)
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz
+- $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3
++ $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3
+ $(RM) $(DESTDIR)$(includedir)/mpath_persist.h
+ $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB)
+
+diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile
+index 5126801..0aba3cb 100644
+--- a/mpathpersist/Makefile
++++ b/mpathpersist/Makefile
+@@ -14,13 +14,12 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS)
+ $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ install:
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ clean: dep_clean
+ $(RM) core *.o $(EXEC) *.gz
+@@ -29,7 +28,7 @@ include $(wildcard $(OBJS:.o=.d))
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+
+ dep_clean:
+ $(RM) $(OBJS:.o=.d)
+diff --git a/multipath/Makefile b/multipath/Makefile
+index 0828a8f..55b6f7b 100644
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -16,8 +16,6 @@ all: $(EXEC)
+
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
+
+ install:
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -26,16 +24,16 @@ install:
+ $(INSTALL_PROGRAM) -m 644 11-dm-mpath.rules $(DESTDIR)$(udevrulesdir)
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).rules $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+ $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules
+ $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
+- $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
++ $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+
+ clean: dep_clean
+ $(RM) core *.o $(EXEC) *.gz
+diff --git a/multipathd/Makefile b/multipathd/Makefile
+index d053c1e..cf3339f 100644
+--- a/multipathd/Makefile
++++ b/multipathd/Makefile
+@@ -38,7 +38,6 @@ all : $(EXEC)
+
+ $(EXEC): $(OBJS) $(multipathdir)/libmultipath.so $(mpathcmddir)/libmpathcmd.so
+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS)
+- $(GZIP) $(EXEC).8 > $(EXEC).8.gz
+
+ cli_handlers.o: cli_handlers.c
+ $(CC) $(CFLAGS) -Wno-unused-parameter -c -o $@ $<
+@@ -52,11 +51,11 @@ ifdef SYSTEMD
+ $(INSTALL_PROGRAM) -m 644 $(EXEC).socket $(DESTDIR)$(unitdir)
+ endif
+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(man8dir)
+- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(man8dir)
++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(man8dir)
+
+ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/$(EXEC)
+- $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8.gz
++ $(RM) $(DESTDIR)$(man8dir)/$(EXEC).8
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service
+ $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket
+
+--
+2.32.0
+
diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 9a20c9e5bc2b..9b1922756da5 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -8,4 +8,7 @@
<use>
<flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
</use>
+ <upstream>
+ <remote-id type="github">opensvc/multipath-tools</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..8dff4dda6bf3
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/json-c:=
+ dev-libs/libaio
+ dev-libs/userspace-rcu:=
+ >=sys-fs/lvm2-2.02.45
+ >=virtual/libudev-232-r3
+ sys-libs/readline:0=
+ rbd? ( sys-cluster/ceph )
+ systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+ "${FILESDIR}"/${PN}-0.8.6-no-compress-man-pages.patch
+)
+
+src_prepare() {
+ default
+
+ # The upstream lacks any way to configure the build at present
+ # and ceph is a huge dependency, so we're using sed to make it
+ # optional until the upstream has a proper configure system
+ if ! use rbd ; then
+ sed \
+ -e "s/libcheckrbd.so/# libcheckrbd.so/" \
+ -e "s/-lrados//" \
+ -i libmultipath/checkers/Makefile \
+ || die
+ fi
+}
+
+src_compile() {
+ # LIBDM_API_FLUSH involves grepping files in /usr/include,
+ # so force the test to go the way we want #411337.
+ emake \
+ CC="$(tc-getCC)" \
+ LIB="${EPREFIX}/$(get_libdir)" \
+ LIBDM_API_FLUSH=1 \
+ PKGCONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+ dodir /sbin /usr/share/man/man{3,5,8}
+ emake \
+ DESTDIR="${D}" \
+ LIB="${EPREFIX}/$(get_libdir)" \
+ RUN=run \
+ unitdir="$(systemd_get_systemunitdir)" \
+ libudevdir='${prefix}'/"$(get_udevdir)" \
+ pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+ install
+
+ newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+ newinitd "${FILESDIR}"/multipath.rc multipath
+
+ einstalldocs
+
+ find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "If you need multipath on your system, you must"
+ elog "add 'multipath' into your boot runlevel!"
+ fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 13d0a2fdcf14..9100350e73d5 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,11 +1,14 @@
+AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
+DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092
EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9
EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a
EBUILD udev-248.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2
-EBUILD udev-9999.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2
+EBUILD udev-249-r1.ebuild 5616 BLAKE2B d6a83d6572c3916eeefbe84f3dce9b0ecd839d120084b7747f0d06858544270871940d072267994155ec364551000c449d00cf99282608e5e0b2ba489ff238f5 SHA512 e40f6d47c4f9002cdcfe30aac2cc028f7b0d75bd72d39feb07215e093df5fe7c00ca49c4f7db680b485460ed70e94d32908d95a3392c621a151ea807e5b6ec25
+EBUILD udev-9999.ebuild 5575 BLAKE2B 8298696ad05cb845a59b117bec1231a25b8a1ebf3284515607b77827b69d68a59ae9fb61f66dca95bdf37072c9aa3d845154653311e9c1ecc541e1a934e4b7d7 SHA512 14efa15db19ebe88fa20a20ab2193c67bbdfc31709d010fbfa5cf793223ce8605c126fe2134fbdabb92409ce748979edb22440851d47e61019e1f9d41f4eff0c
MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/files/249-libudev-static.patch b/sys-fs/udev/files/249-libudev-static.patch
new file mode 100644
index 000000000000..73375b716e9b
--- /dev/null
+++ b/sys-fs/udev/files/249-libudev-static.patch
@@ -0,0 +1,26 @@
+From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 9 Jul 2021 13:05:23 -0400
+Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc
+
+This resolves a failure when linking cryptsetup.static against libudev.a.
+
+```
+libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread
+/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq':
+(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr'
+```
+---
+ src/libudev/libudev.pc.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in
+index 89028aaa6bf2..1d6487fa4084 100644
+--- a/src/libudev/libudev.pc.in
++++ b/src/libudev/libudev.pc.in
+@@ -16,4 +16,5 @@ Name: libudev
+ Description: Library to access udev device information
+ Version: {{PROJECT_VERSION}}
+ Libs: -L${libdir} -ludev
++Libs.private: -lrt -pthread
+ Cflags: -I${includedir}
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
new file mode 100644
index 000000000000..0154e132439e
--- /dev/null
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 2003-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ if [[ ${PV} == *.* ]] ; then
+ MY_PN=systemd-stable
+ else
+ MY_PN=systemd
+ fi
+ MY_PV="${PV/_/-}"
+ MY_P="${MY_PN}-${MY_PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/systemd/${MY_PN}/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
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ ${PYTHON_DEPS}
+"
+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-34"
+
+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() {
+ local PATCHES=(
+ "${FILESDIR}/249-libudev-static.patch"
+ )
+
+ default
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ $(meson_native_use_bool acl)
+ -Defi=false
+ $(meson_native_use_bool kmod)
+ $(meson_native_use_bool selinux)
+ -Dlink-udev-shared=false
+ -Dsplit-usr=true
+ -Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+ $(meson_use static-libs static-libudev)
+
+ # Prevent automagic deps
+ -Dgcrypt=false
+ -Dlibcryptsetup=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dp11kit=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
+ python_setup
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ # meson creates this link
+ local libudev=$(readlink libudev.so.1)
+
+ local targets=(
+ ${libudev}
+ src/libudev/libudev.pc
+ )
+ if use static-libs; then
+ targets+=( src/udev/libudev.a )
+ fi
+ if multilib_is_native_abi; then
+ targets+=(
+ udevadm
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/fido_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/udev.pc
+ 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
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
+ )
+ fi
+ eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+ local libudev=$(readlink libudev.so.1)
+
+ dolib.so {${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
+
+ dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+
+ # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
+ 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
+
+ # Install static rules (${S}/rules.d/*.rules)
+ insinto /lib/udev/rules.d
+ doins rules.d/*.rules
+ doins "${FILESDIR}"/40-gentoo.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 676b5a0be4e7..d23c86c0aeb8 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -137,6 +137,7 @@ multilib_src_compile() {
local targets=(
${libudev}
+ src/libudev/libudev.pc
)
if use static-libs; then
targets+=( src/udev/libudev.a )
@@ -149,6 +150,7 @@ multilib_src_compile() {
src/udev/fido_id
src/udev/mtd_probe
src/udev/scsi_id
+ src/udev/udev.pc
src/udev/v4l_id
man/udev.conf.5
man/systemd.link.5
@@ -156,6 +158,8 @@ multilib_src_compile() {
man/udev.7
man/systemd-udevd.service.8
man/udevadm.8
+ rules.d/50-udev-default.rules
+ rules.d/64-btrfs.rules
)
fi
eninja "${targets[@]}"
@@ -180,7 +184,7 @@ multilib_src_install() {
exeinto /lib/udev
doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
- rm rules.d/99-systemd.rules || die
+ # Install generated rules (${BUILD_DIR}/rules.d/*.rules)
insinto /lib/udev/rules.d
doins rules.d/*.rules
@@ -203,10 +207,10 @@ multilib_src_install_all() {
insinto /lib/systemd/network
doins network/99-default.link
- # see src_prepare() for content of 40-gentoo.rules
+ # Install static rules (${S}/rules.d/*.rules)
insinto /lib/udev/rules.d
+ doins rules.d/*.rules
doins "${FILESDIR}"/40-gentoo.rules
- doins "${S}"/rules.d/*.rules
dobashcomp shell-completion/bash/udevadm