diff options
Diffstat (limited to 'sys-fs')
136 files changed, 1898 insertions, 1948 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 9e79e5273ed1..d95524c3a7c7 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest index 9467d3698d95..ca0fa39c8a17 100644 --- a/sys-fs/android-file-transfer-linux/Manifest +++ b/sys-fs/android-file-transfer-linux/Manifest @@ -1,8 +1,4 @@ -DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8 -DIST android-file-transfer-linux-4.1.tar.gz 820290 BLAKE2B 598a4ae25cc5110c38534d1b2b49c034f3dee3f8ab9e47835b4543acecf80521c102e0b8cdf89a19801b178a8fdbbd09e866b957b3ab5886700a26e6c00f8a1b SHA512 76151089dcce304fb688a54a4f94ea605fa3d048765119c631a2ff2c8d107678062ed4d485a983dfb0b337c9b4d3639e3f76640b6bcc73e3e6449764e99298ab DIST android-file-transfer-linux-4.2.tar.gz 823609 BLAKE2B dfd9b6ef4a92b1bc7851fd160837366b97fa95db5a998b9df156dd8543be554e07d02aae9be9f27b1cd9ee96aacc2003e06e4c7670c49b478e07779c92829817 SHA512 88ee6bf0af6cf6b2f6b97dee8e79d20905d2a84c271d68d874b87ccc797f198f1e480565633feea08a585ebb55e77da9742bd9cd87b59d88e677c44c69e95659 -EBUILD android-file-transfer-linux-3.9.ebuild 1193 BLAKE2B 8b0d02c8d933b9dcb08cd4d256d2b349694fb4db8a6fc07fff613aad18b217fefe0290a12cb3544dd765c68cf956141b9d1d232571914177bad2461c812235f5 SHA512 fcfc9a94eace56b09890fb2cf4abeece387a9d934c2ae483ec17ba5a62282685dd4609ab59176e51e19b10171d0946b60159d3a9440e0e616d2ef13de0316522 -EBUILD android-file-transfer-linux-4.1.ebuild 1618 BLAKE2B 75fa5b09fda33f3da136c2d9f3ce0b25487c497960bf25a670d4467dad218ea4c3344bf619e161763f687e2806808c21be6c8d1c67b90457b0719e3605e20156 SHA512 eda8652e4d63e02b9455e738082d1fd67973325ba670ce828dc4ff2c837138d848f0f053c967a05b7a95abcec976d0b50a8f57873325c90ca75be82fb0bd3b61 -EBUILD android-file-transfer-linux-4.2.ebuild 1618 BLAKE2B 75fa5b09fda33f3da136c2d9f3ce0b25487c497960bf25a670d4467dad218ea4c3344bf619e161763f687e2806808c21be6c8d1c67b90457b0719e3605e20156 SHA512 eda8652e4d63e02b9455e738082d1fd67973325ba670ce828dc4ff2c837138d848f0f053c967a05b7a95abcec976d0b50a8f57873325c90ca75be82fb0bd3b61 -EBUILD android-file-transfer-linux-9999.ebuild 1619 BLAKE2B d2c20b866a5ba6ae8b6ef770d8598b895b1d2fe122c4db50240f915bc6878b79eab67c9dd59cdcfa3dde46501a4a3bb7504af45824519ae4e024ab1f15b09836 SHA512 a98a46314c68346616eb7539d0e11cf50de49246e49ab3987f02b03e3bc3c68fff74aee1824cb4e6e8c77a65bcea9890de0a3a097403dc1d1aa14f68dddd9f50 -MISC metadata.xml 493 BLAKE2B 183878a5a6551cc3ef3c16d6dc0dc9329f4796304e257c32f90ded5b701f5c24f5f7ef102fed48a6bc7372b589bca759d623945179671a35519203b0f99b626a SHA512 45dbdc6aa2b393d6f8387c4d8424a2d5b083d5137c30c4aa5655ad6b0b0a7fa43a1e722521d1bb321a1de65aee13205831caf6546875fb62af9c3908ac45a028 +EBUILD android-file-transfer-linux-4.2.ebuild 1619 BLAKE2B 54e3faaf764a3a5675c6b0afe1e160b59cb73907ee33b47029738a269c0823dcfd55a62c4e2500ca3b5540c2e80157c4b25a846bb30cf3e5dfaaee74071add62 SHA512 e316d392eec484a48057ab68b2df42522630631961d4e28ae50adc1bbcfbd61ff4e1dd3a7d24624bfe56efa43dfce6b932a75db1770fb254f8cc56dc5a008123 +EBUILD android-file-transfer-linux-9999.ebuild 1620 BLAKE2B ebdb23aa76df586f353b2351ad073cbd47e6ce8789393c803140e193732bf9c7a7ff942258736eaf500faa34384b32b918e4de486b4eaa150e5bdbd22b7941ce SHA512 22d7a9d6ed4beb2b6817bc11e26409ac1aa8ed01b9b5e2664e81ec79ceda24eb2bd4f89114d124361a55dea8a5fffa0f80ab20f82a8434cf66d4034c5feed042 +MISC metadata.xml 404 BLAKE2B 09a744466822e45ff378269c52b5aea8192b203bb1a6364de5e23690994ee57906ebeb28be99f8a3569f62ebfdfdc07497cdd28809cfc21014c67fb80b755e42 SHA512 7650fb9e5b3b86aa0233a2429ccc65bd144065e3e349fa1f1147570377a4f33b3663fffcc73a42416453e317bbf2c7bbd33baabc497a838cc91c705999b97497 diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild deleted file mode 100644 index e2ce2ae66cfe..000000000000 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg - -DESCRIPTION="Android File Transfer for Linux" -HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux" - -if [[ "${PV}" = *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git" -else - SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="fuse qt5" - -RDEPEND=" - sys-apps/file - sys-libs/readline:0= - fuse? ( sys-fs/fuse:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" - -DEPEND="${RDEPEND}" - -# required to override src_prepare from xdg eclass -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_FUSE="$(usex fuse)" - -DBUILD_QT_UI="$(usex qt5)" - -DBUILD_SHARED_LIB="ON" - # Upstream recommends to keep this off as libusb is broken - -DUSB_BACKEND_LIBUSB="OFF" - $(usex qt5 '-DDESIRED_QT_VERSION=5' '') - ) - cmake_src_configure -} - -pkg_preinst() { - xdg_pkg_preinst -} - -pkg_postinst() { - xdg_pkg_postinst -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild deleted file mode 100644 index 0b38a78cc13e..000000000000 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit cmake python-single-r1 xdg - -DESCRIPTION="Android File Transfer for Linux" -HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux" - -if [[ "${PV}" = *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git" -else - SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="LGPL-2.1" -SLOT="0" - -IUSE="fuse python qt5 taglib zune" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-apps/file - sys-libs/readline:0= - fuse? ( sys-fs/fuse:0 ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pybind11[${PYTHON_USEDEP}] - ') - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - ) - taglib? ( media-libs/taglib ) - zune? ( - dev-libs/openssl:0= - ) -" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig - qt5? ( dev-qt/linguist-tools:5 ) -" - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -# required to override src_prepare from xdg eclass -src_prepare() { - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_FUSE="$(usex fuse)" - -DBUILD_MTPZ="$(usex zune)" - -DBUILD_PYTHON="$(usex python)" - -DBUILD_QT_UI="$(usex qt5)" - -DBUILD_SHARED_LIB="ON" - -DBUILD_TAGLIB="$(usex taglib)" - # Upstream recommends to keep this off as libusb is broken - -DUSB_BACKEND_LIBUSB="OFF" - $(usex qt5 '-DDESIRED_QT_VERSION=5' '') - ) - cmake_src_configure -} diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild index 0b38a78cc13e..242c2c0cc226 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 xdg diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild index 344d6b2e6548..c4f1917e99d4 100644 --- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild +++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit cmake python-single-r1 xdg diff --git a/sys-fs/android-file-transfer-linux/metadata.xml b/sys-fs/android-file-transfer-linux/metadata.xml index b460969636ef..3b18b9d156bb 100644 --- a/sys-fs/android-file-transfer-linux/metadata.xml +++ b/sys-fs/android-file-transfer-linux/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">whoozle/android-file-transfer-linux</remote-id> </upstream> diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest index 8c23dcae1a9f..898dd1194a75 100644 --- a/sys-fs/bcache-tools/Manifest +++ b/sys-fs/bcache-tools/Manifest @@ -2,6 +2,6 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca -EBUILD bcache-tools-1.1-r1.ebuild 1461 BLAKE2B 1f3a6847c05058f35ac9dcfbf1195f3d1b6b4a06116280deea9e4a4d3a9148d57c39d5a4d7abbce78c7f6f442c2ab5563153ee206c7a6bf73581a9f9133a3de0 SHA512 6d6053f8dd3972e683b3f8d6bb5a81623a7691aa14d85378a87715f43eddba9d76f21abd279c60c418c0ed55611cbb17fd8213cba0a07b8aaff7c05284935048 -EBUILD bcache-tools-9999.ebuild 1431 BLAKE2B ed6ab5aa846a1b8d819b99bb4e0d70b97bb66282dcb525f0813f5366876fa628fd080677171e4fb69704954adc12b61794e183696941b2c4b1dd30622e3c8c57 SHA512 7f4f3ba740f5ffe4211adf15cbf1abcdd28b51adcb6fd45f13ceb1fc865339b31f548fd32fa2ced1cc06c72d16251be1a9ecee7f27cfbbe93b60883919b2dd77 +EBUILD bcache-tools-1.1-r1.ebuild 1492 BLAKE2B 31ece9ffa87aeb37b09819625d5397171ab4d40b7d049018f1a952a5603bb2e1e06fd61184bd14aa374ab0e928e59bcd3bef2be2ae6f156b2469196d51c5ca9e SHA512 9c357c7ff24c97123fbb8281b0b0deca2e789edef2cc4a8513fe94ff41d294388a46ada6280e4dc0f66f73040c164aa33c97f15e22cd9aaf254a51df5a5ebaa3 +EBUILD bcache-tools-9999.ebuild 1462 BLAKE2B 35273095869cb29825c8c2677eab9a618feba6ac3642daa625d46070444128f690610074542f55e8d6886742ca75bdda678cc323d1dd8f3c7e42dd2a96cac2b9 SHA512 4b7f53a18f1f5dfce41aa4db443b9edb7bfc21dd3466fa659e1e9ae3385cbf227c8c7ca169c45c61149c33ca2cfff001f935b82c2220c938612bd8153f3c3539 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c diff --git a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild index f2e436d2fa27..9e6dc7c64771 100644 --- a/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild @@ -69,3 +69,7 @@ src_install() { pkg_postinst() { udev_reload } + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild index 31a8bc178342..1afc686aacaf 100644 --- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild +++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -67,3 +67,7 @@ src_install() { pkg_postinst() { udev_reload } + +pkg_postrm() { + udev_reload +} diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest index 478b1284af46..3095ebdb853d 100644 --- a/sys-fs/bees/Manifest +++ b/sys-fs/bees/Manifest @@ -1,5 +1,7 @@ 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 +DIST bees-0.7.tar.gz 164311 BLAKE2B b0b7f1bc24257e385b6201f473bf9377021d542a257b341c5c8ba5372fa604697e717bb65329d57abf2d2ac4311325e3242c481430629c911fcee3e42e1ea55e SHA512 beee7563ae0ea43247465941ef15f7bab2d86d5d164ccb280c378678b0bf61a67a4718881b94a5f3a72d4d0296eda92bfd7464dae0faeaa72b0e2a4ebef39a53 EBUILD bees-0.6.5-r1.ebuild 3403 BLAKE2B 751cfa80fbe49cab4eab2b3071c936ad589c93cbf373d82458375a2995a1d9e64be72bd1b1ca1bc17325778753ac8455d3d33eb7d40fd709fe5860b96af18bc6 SHA512 49bcf89cd12b0d11617c8d4f88287fa318afeed13ad92408908b6e019513e4403a69e434b72fd0955363eb85d001d0ef8dfee199e2803f2a9977cb52e5977465 +EBUILD bees-0.7.ebuild 3217 BLAKE2B 077a8c4697ef966cef8f6d0c6c47fed0495a2f9efd600308884b86390796af3ae46f96c46831752e326073c4c68e896fae192863083bf33be728f403475d57a6 SHA512 8835095a1acb44d75ac5e4d1e93117fe1ec61a682058ca488f6b2a09901a914d0beb805561d9aa8dbc8d935262e1df507adf243b6ae794dc488266180149b7a5 EBUILD bees-9999.ebuild 3217 BLAKE2B f91c2f9529d2afb81a1b1f5634d8975bc54f75e27a13b86cd03888be6c9deb573d98d5cabff450c9faf385e1c04e4b9e4c4b92f0f4f398e6927633b61f48e1a5 SHA512 67096a3444e35be517e9001698466c763fb8668f56532edc2340bc1175c7259ec1eb7c5acbca941214dadd74cb865efe0280cc06c601ddab714206f7c8046dc3 MISC metadata.xml 622 BLAKE2B fc27438101691a12742484547df8b94fc3d22822cc3aefe81468e435a917373c25c5736506bfa2cf637bc265a3686c7f03d7431eaf54e5405f7ad2738390e872 SHA512 382ea31887a310f375bed14aa88d433831964b080faf3c7fb209a0d73b1d0d3da38a8e222ceda267b4ada4e81fa36cad94d4ddf180e7a2f39dfe3e9439b60321 diff --git a/sys-fs/bees/bees-0.7.ebuild b/sys-fs/bees/bees-0.7.ebuild new file mode 100644 index 000000000000..a37916aa1764 --- /dev/null +++ b/sys-fs/bees/bees-0.7.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info systemd toolchain-funcs + +DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent" +HOMEPAGE="https://github.com/Zygo/bees" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/Zygo/bees.git" +else + SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="tools" + +DEPEND=" + >=sys-apps/util-linux-2.30.2 + >=sys-fs/btrfs-progs-4.20.2 +" +RDEPEND="${DEPEND}" + +CONFIG_CHECK="~BTRFS_FS" +ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != buildonly ]]; then + if kernel_is -lt 4 11; then + ewarn "With kernel versions below 4.11, bees may severely degrade system performance" + ewarn "and responsiveness. Especially, the kernel may deadlock while bees is" + ewarn "running, it's recommended to run at least kernel 4.11." + ewarn + elif kernel_is -lt 4 14 29; then + ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()" + ewarn "messages in the kernel log. These messages can be ignored and this is fixed" + ewarn "with more recent kernels:" + ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0" + ewarn + fi + if kernel_is -lt 5 1 0; then + ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption" + ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically" + ewarn "later kernel, that includes older LTS versions released after 5.0.4:" + ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+" + ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching" + ewarn + fi + if kernel_is -lt 5 3 4; then + ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running" + ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst" + ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x" + ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force" + ewarn "the device RO without writing corrupted meta-data. More details:" + ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md" + ewarn + fi + + elog "Bees recommends running the latest current kernel for performance and" + elog "reliability reasons, see README.md." + fi +} + +src_prepare() { + default + sed -i 's/ -Werror//' makeflags || die +} + +src_configure() { + tc-export CC CXX AR + cat >localconf <<-EOF || die + ETC_PREFIX="${EPREFIX}/etc" + LIBEXEC_PREFIX="${EPREFIX}/usr/libexec" + PREFIX="${EPREFIX}/usr" + SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)" + DEFAULT_MAKE_TARGET=all + EOF + if [[ ${PV} != "9999" ]] ; then + echo BEES_VERSION=v${PV} >>localconf || die + fi + if use tools; then + 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/bindfs/Manifest b/sys-fs/bindfs/Manifest index a963225fe662..7fe81f2198df 100644 --- a/sys-fs/bindfs/Manifest +++ b/sys-fs/bindfs/Manifest @@ -1,7 +1,9 @@ DIST bindfs-1.14.9.tar.gz 410344 BLAKE2B 3875c436e7f52a59c0b7aeb2d7fbcfa7d4edfc3f8397bf7d2a920a260f857ec16df64b78655175f9b0929b93788fb6af46c2844f30ee59c30b6ef9fb5beb4cf7 SHA512 e8c454b4edd65faa64255c7706c195aa1cab6436a0d3481e434a5e535a3c24df1b13342b72ed3da097e68e9d94582237d682dbb675734061d115e863d5767ffd DIST bindfs-1.15.0.tar.gz 415596 BLAKE2B e80bf7e233668ceddb6f57b7b939a68c918f3a6635d99bdc0efdacd67d74fdea66aa3d03ced6cfeddfc1a402e9866d27d83bcbe39dc6c25c50247c6b42739d9a SHA512 4f11dcb29321daa950bc8d778c7cc0269f200535367534c5ebb1e85f2f9e0e37359ebaa0d033fefc2140f07915d6ad7e884d185ac168db31c32e2e52175d0bfa DIST bindfs-1.15.1.tar.gz 415676 BLAKE2B 1d18d7a51e60e5ef304cdd13e908ebf5ca3e684b640f6c21678be685c3ff15ed43a20edcecfd6ef13d631974b11c5c7145e4365bf52f7e9280a53772f1377b84 SHA512 da9003f141b7aa2c23651b3b836b1d979bf1b19915f307c05e40ae6906aab738036cc8b5df6caeec158e4fa6b7bca71489ea7884ff1607c6fea72a603a048d59 +DIST bindfs-1.16.1.tar.gz 421240 BLAKE2B 1c33891d7f8f6beed2d18a50e2742c5cf8474f9b27b2afdac593f8a923445d7e2af9027371655845846d4fc67a858f1863a207cb8a78335a179329501a52454f SHA512 6fc6121dc5a9db040f444b432aed4c720250e268087c68e5a0c9a652370a431c94c05fddfa8515ffb86a0f76582bb9a8fa4f9ef66608b82a3b8a5fbb00d2f3dc EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3 EBUILD bindfs-1.15.0.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6 EBUILD bindfs-1.15.1.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6 +EBUILD bindfs-1.16.1.ebuild 494 BLAKE2B df54b3781a6b974360e373bf54771af91ce9c58b31466453788a8850026dd0e2829ee8f5e95c3c48b03c001aa59db43eabde056328916b8ab5d0fed4be3a7e9b SHA512 4ade233d80777d90a586004697567bb8598330ef734d32a4d01da9cc44d76ad416d0398b1d020bd716796755dcecec9ef8ecf3f4c826327aebc97a531c1c6696 MISC metadata.xml 326 BLAKE2B 4618fbe2b0a0ec5941e217fe7e22752e275db8a7e8caa55ec8b6a4a7d69727e8a97d06670e3ffddd0a1497fcb8b1e788c2f4b0cb2456b7f7c1bccb4a7c055a33 SHA512 0c040a701da5588f06a94f487591e80000bfa351ba940ab42ea86ffbaa3f77548f4419f03bf104be3ac10fc457692c4100f39aae9142152d7f5f2303a840e591 diff --git a/sys-fs/bindfs/bindfs-1.16.1.ebuild b/sys-fs/bindfs/bindfs-1.16.1.ebuild new file mode 100644 index 000000000000..f884f36abe85 --- /dev/null +++ b/sys-fs/bindfs/bindfs-1.16.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="FUSE filesystem for bind mounting with altered permissions" +HOMEPAGE="https://bindfs.org/" +SRC_URI="https://bindfs.org/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=sys-fs/fuse-3.10.2:3" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +RESTRICT="test" + +src_configure() { + econf $(use_enable debug debug-output) --with-fuse3 +} diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 502b89019992..3038fc83890d 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -4,10 +4,14 @@ DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a8 DIST btrfs-progs-v5.16.2.tar.xz 2334464 BLAKE2B a21809a840107c370f1598e19f8b07d8bdd704e8ff3ce4cb78431000e7560802e1047d8200c523a45a761d59a311f1ec384946bd585826a129b05a1a5fd0250e SHA512 c89a763e8b099e0e9d04ff239dfee156a15fc783c515bbd48597f5645f720c377dbb4f2dfe9065971a65d3ade9d8fcb24cf37d527811bf4204153a06f7c8c3a7 DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 DIST btrfs-progs-v5.17.tar.xz 2286016 BLAKE2B 013acc4f9ec294d8d88b04e9f0ee33c450bfa6621b029005d18885add7c0a1da7e645c1f984931749ebd8f3166e8d849ec128a0f95cc189c15878d45acc0901b SHA512 4c2bfafe0fcae47f01bad41910c2e2b3d48a12b88ca1891a9ea63ac1e65699c2e22f481492c7dd11fbea546647ab78718ab9b6997bb257fc29d1482fde9b08d1 -EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7 -EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922 -EBUILD btrfs-progs-5.16.2.ebuild 3074 BLAKE2B 55a72f9fbc7d61bed468e1a2d545c18ab9f9cf88a4880e508a75ab25673adfda3d9f376b203e62d93da6164782fc4d17c29e62385736d5252e74531c3cc7fd60 SHA512 19ba56e736a3f390e722b915c2b50f40657dbdf69e9e613b787721ab727ae5e025d0a076e1f94c3791aa0f91659399edc10f3eb1c7551163811c0d992eea9799 -EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9 -EBUILD btrfs-progs-5.17.ebuild 3048 BLAKE2B 0e98e5faaed1f27b9c9dea9de8c0d267c531a034713f5f53654d18482de4af21491ddec6f8ff6ca75dc631abb0ba8457ee9e05749868de6f70dad4c4e4212b0d SHA512 44c6e94c8ea05033ca8c60a2b9e42876c47bb5de5b46c0ecea087257e78e47d7e462b932fee3294258c213edc38927ced944000e5d4090e5915cafaffab0ea44 -EBUILD btrfs-progs-9999.ebuild 3074 BLAKE2B 55a72f9fbc7d61bed468e1a2d545c18ab9f9cf88a4880e508a75ab25673adfda3d9f376b203e62d93da6164782fc4d17c29e62385736d5252e74531c3cc7fd60 SHA512 19ba56e736a3f390e722b915c2b50f40657dbdf69e9e613b787721ab727ae5e025d0a076e1f94c3791aa0f91659399edc10f3eb1c7551163811c0d992eea9799 +DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e +DIST btrfs-progs-v5.18.tar.xz 2293620 BLAKE2B dd5da4618e53d7d1c6636b4dcf9adb0e24e2e735a13ff1858bc55d21a90ad31cb2a7a11ab12beddd44682c62673fda41ebc7517aa80c81cd61cc1b195668a0e1 SHA512 142d9c133a41c0843ab8442018a6caf5186757d6c8d73f9a69a2245f62590d93a448dae6fdde2ebc5f091cc39da9a79ad0e8c94e1873d75e6c723dcc79d74309 +EBUILD btrfs-progs-5.10.1-r1.ebuild 3046 BLAKE2B ca40892695507f2d8ded08d2d43b0cddead63279b84a621eb003e87cdc41b48d98a307363f2e04c5b3ef1d287fcf66c00805c5ac99acd60856abb50be04f2120 SHA512 9c0c0dc2d6991686f076cb2376edabac7253b916b4e4f9446dcce403b70eb10e3c40c7ab6c92035b755a08144e492eb87ea178c9717b20db71d9b4d21f3429e6 +EBUILD btrfs-progs-5.15.1.ebuild 3084 BLAKE2B 1e22d8639ca8792ddf3bc7840091d375831489ad63bab756e445342009f80e3681d1432761a5aad561727c8deb076ece57e74b9ddc32af2cfd7341979f6704a9 SHA512 61c2fa949b59a185cf70ed40ca3109f50d5038b924690a3da543d51962d79e61061042a15e3349a1a3f7ca9a42cae6cad80438ac343bfb78752452c0680d0fce +EBUILD btrfs-progs-5.16.2.ebuild 3139 BLAKE2B 44cd4f768d4d2beffc54a0325b22572096e978742786916f55e539d0573ed2d8f13d452edd94b2adde51a4a17cc64e5d3abc279039a610faded84b2f64ad9fe6 SHA512 deb3b2a793d381a957d2273438e39cb4df1f3b7d9c63cb4a400f7ea4a6745360ca9d3ff2f8cce166daffc58bc1865c34e65b797da0330ef0fa80196a2211c43a +EBUILD btrfs-progs-5.16.ebuild 3155 BLAKE2B 70bedb119f3bc6d90de05558963a3663f763b5919f02dd85c76e3c8d34b515e817e0f579eac4bbdbac9b7513be9e20e6da2445c8b855b6a209321a380255dc9b SHA512 d00762deb927876a4384ec874bcf527c8c69a384fa99a1c15a84805b8dc1e56e9a0fd6e5c4808ea759b0c4988f840ad7735d7fd1564bd8d7e3f870718c67bc78 +EBUILD btrfs-progs-5.17.ebuild 3113 BLAKE2B b55f749346e5a0dc1c004dae7d7f888bafc5da8a0bd1c5032697a1e38f53903950f45e8004fea86ff04cabe4e5488a0dc31f064349a357188c0c21634af76cca SHA512 9e6bc0163180246cc96b992cc90c7960e3141f4cec9bc81fdbe6547051ff1d8e3e7158e36c505cea14f2576125190a99fc81363c56e62f60f33a7c866c5baabe +EBUILD btrfs-progs-5.18.1-r1.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710 +EBUILD btrfs-progs-5.18.ebuild 3404 BLAKE2B ffca9e8d9839b900e8fe04ae8e0e33564fd994e63b91080c8b4ef857e3259465e7441156192fafbdf8009a1362bf7ca89e0cbe8d93585ab7b86f105899cb39e0 SHA512 b7dcfb64b5a8331330e26e950f448461905a28de523bb0f01cc3c7a7a85dc58b187ed48819113ff4c27ec6c68a927668efe38d26eb0b1c963eb7e28755307e1d +EBUILD btrfs-progs-9999.ebuild 3315 BLAKE2B 21bcee35074e908afed1b369f07609565bbcc864def87f3c28bc4c5c9b2f8e02e37d7591f655cfdfb640186b0a3bcf4160c7784c556b0754385b9830cf0477a1 SHA512 c483f3ae0784548120a6a9db16c4be656b51097e676e6e333df778a499ba1cce8c6486dd951455468be0be39f26441f798138c4623232fc9431868d8da2a9710 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild index ec36b2152a52..01164d323b79 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -125,3 +125,7 @@ src_install() { # install prebuilt subset of manuals use doc || doman Documentation/*.[58] } + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild index 64cc91680915..8132f35bc6ac 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -126,3 +126,7 @@ src_install() { # install prebuilt subset of manuals use doc || doman Documentation/*.[58] } + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild index b9b56b46d14f..5c1aabd39fb4 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.2.ebuild @@ -131,3 +131,7 @@ src_install() { # install prebuilt subset of manuals use doc || doman Documentation/*.[58] } + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild index 015b81367170..81d242c828ef 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild @@ -134,3 +134,7 @@ src_install() { # install prebuilt subset of manuals use doc || doman Documentation/*.[58] } + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild index 70f276f2ea37..a8119d0182c4 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.17.ebuild @@ -142,3 +142,7 @@ src_install() { pkg_postinst() { udev_reload } + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild new file mode 100644 index 000000000000..cc8ae19c469e --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.1-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 2008-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 python-single-r1 udev + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} +else + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert python +man reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" + +# Tries to mount repaired filesystems +RESTRICT="test" + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd[static-libs(+)] ) + ) +" +BDEPEND="virtual/pkgconfig + man? ( dev-python/sphinx )" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + AT_M4DIR="m4" eautoreconf + + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + + --enable-lzo + --disable-experimental + $(use_enable convert) + $(use_enable man documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable udev libudev) + $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi + --with-crypto=builtin + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static install-static '') + ) + + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + + newbashcomp btrfs-completion btrfs + + use python && python_optimize +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild new file mode 100644 index 000000000000..b6d87b7e0f05 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.18.ebuild @@ -0,0 +1,152 @@ +# Copyright 2008-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 python-single-r1 udev + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} +else + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert python +man reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" + +# Tries to mount repaired filesystems +RESTRICT="test" + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) +" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-5.10 + convert? ( sys-apps/acl ) + python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + ) + static? ( + dev-libs/lzo:2[static-libs(+)] + sys-apps/util-linux:0[static-libs(+)] + sys-libs/zlib:0[static-libs(+)] + convert? ( + sys-fs/e2fsprogs[static-libs(+)] + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] + ) + ) + zstd? ( app-arch/zstd[static-libs(+)] ) + ) +" +BDEPEND="virtual/pkgconfig + man? ( dev-python/sphinx )" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + if [[ ${PV} == 9999 ]]; then + AT_M4DIR="m4" eautoreconf + + mkdir config || die + local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" + [[ -e ${automakedir} ]] || die "Could not locate automake directory" + + ln -s "${automakedir}"/install-sh config/install-sh || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die + ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die + fi +} + +src_configure() { + local myeconfargs=( + --bindir="${EPREFIX}"/sbin + + --enable-lzo + --disable-experimental + $(use_enable convert) + $(use_enable man documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable udev libudev) + $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi + --with-crypto=builtin + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static install-static '') + ) + + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + + newbashcomp btrfs-completion btrfs + + use python && python_optimize + + # Install prebuilt subset of manuals (very few) + use man || doman Documentation/*.[58] +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index b9b56b46d14f..cc8ae19c469e 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -3,24 +3,26 @@ EAPI=7 -# TODO: change to sphinx for docs in 5.17 PYTHON_COMPAT=( python3_{8..10} ) -inherit bash-completion-r1 python-single-r1 +inherit bash-completion-r1 python-single-r1 udev libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" - [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - S="${WORKDIR}/${PN}-${MY_PV}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + fi + + S="${WORKDIR}"/${PN}-${MY_PV} else - WANT_LIBTOOL=none - inherit autotools git-r3 EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" EGIT_BRANCH="devel" + WANT_LIBTOOL="none" + inherit autotools git-r3 fi DESCRIPTION="Btrfs filesystem utilities" @@ -28,14 +30,18 @@ HOMEPAGE="https://btrfs.wiki.kernel.org" LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" -IUSE="+convert doc python reiserfs static static-libs +zstd" +IUSE="+convert python +man reiserfs static static-libs udev +zstd" +# Could support it with just !systemd => eudev, see mdadm, but let's +# see if someone asks for it first. +REQUIRED_USE="static? ( !udev )" -RESTRICT="test" # tries to mount repaired filesystems +# Tries to mount repaired filesystems +RESTRICT="test" RDEPEND=" dev-libs/lzo:2= - sys-apps/util-linux:0=[static-libs(+)?] - sys-libs/zlib:0= + sys-apps/util-linux:=[static-libs(+)?] + sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( @@ -43,7 +49,8 @@ RDEPEND=" ) ) python? ( ${PYTHON_DEPS} ) - zstd? ( app-arch/zstd:0= ) + udev? ( virtual/libudev:= ) + zstd? ( app-arch/zstd:= ) " DEPEND="${RDEPEND} >=sys-kernel/linux-headers-5.10 @@ -63,16 +70,11 @@ DEPEND="${RDEPEND} >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) - zstd? ( app-arch/zstd:0[static-libs(+)] ) - ) -" -BDEPEND=" - doc? ( - || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) - app-text/docbook-xml-dtd:4.5 - app-text/xmlto + zstd? ( app-arch/zstd[static-libs(+)] ) ) " +BDEPEND="virtual/pkgconfig + man? ( dev-python/sphinx )" if [[ ${PV} == 9999 ]]; then BDEPEND+=" sys-devel/gnuconfig" @@ -87,10 +89,12 @@ pkg_setup() { src_prepare() { default if [[ ${PV} == 9999 ]]; then - AT_M4DIR=m4 eautoreconf + AT_M4DIR="m4" eautoreconf + mkdir config || die local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" [[ -e ${automakedir} ]] || die "Could not locate automake directory" + ln -s "${automakedir}"/install-sh config/install-sh || die ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die @@ -100,12 +104,19 @@ src_prepare() { src_configure() { local myeconfargs=( --bindir="${EPREFIX}"/sbin + + --enable-lzo + --disable-experimental $(use_enable convert) - $(use_enable doc documentation) + $(use_enable man documentation) $(use_enable elibc_glibc backtrace) $(use_enable python) $(use_enable static-libs static) + $(use_enable udev libudev) $(use_enable zstd) + + # Could support libgcrypt, libsodium, libkcapi + --with-crypto=builtin --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) @@ -127,7 +138,12 @@ src_install() { newbashcomp btrfs-completion btrfs use python && python_optimize +} + +pkg_postinst() { + udev_reload +} - # install prebuilt subset of manuals - use doc || doman Documentation/*.[58] +pkg_postrm() { + [[ -n ${REPLACING_VERSIONS} ]] || udev_reload } diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest index ab31b13d83ab..05ea5c2c77a4 100644 --- a/sys-fs/cryfs/Manifest +++ b/sys-fs/cryfs/Manifest @@ -3,5 +3,5 @@ AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87 -EBUILD cryfs-0.10.3-r1.ebuild 2321 BLAKE2B 8d16389c2d55aa809cc584a84f1dc7e31673ec87bd55906a595d77522436eee2a351fb27b184d7992e20fb0326839e82f740f823d0d6f521f6d8dae13eda0710 SHA512 40fc4a40b39a0eb8ebce13be9baf5691fcc2dea281c0e3644ec7177c54b44d7b798364befe48517bbb66d5b5544fbd2e75a6ebf820a40e8b86bccaa85e5aba85 +EBUILD cryfs-0.10.3-r1.ebuild 2328 BLAKE2B 9307d0eb1166049cdab384f69a25362cc9a753067f549987dd6ec5f279a0bab640ecf371cd3e5c92035db8d86a83a314b353c4f2ce82f8bf521cf472ac8ed4fd SHA512 cc0bf07bb48010934dfcefa637d219344f742bd7e19c048ff3baf7ae46c4eac4197fef8637882a79521858cb8cb4262c68554398e4caf0e8126c4f77e0a71686 MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395 diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild index f209908d30e4..4e9c60bd68d7 100644 --- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild +++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/cryfs/cryfs" else SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" + KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" S="${WORKDIR}" fi diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest index f011fbd8decb..5d02089dd916 100644 --- a/sys-fs/cryptmount/Manifest +++ b/sys-fs/cryptmount/Manifest @@ -1,3 +1,3 @@ DIST cryptmount-5.3.3.tar.gz 545925 BLAKE2B 7a20d3a3b5805b1fe9ed84aafe6aaebeab4c62652dc8f53ecd70a7e0a0aa993ab5a03d54967910b94e6d8bde28f7ee7bb90a115a2bf101c9d4f4177fee26f90d SHA512 9945630316feee513a64e11dffa61ece77d0dff43a7b611d91fcb0a7c902402effb30ba15266d52c2f5381aa3ab7290a9a0999ca391c3c15cbdb83debe7dcca0 -EBUILD cryptmount-5.3.3-r1.ebuild 1694 BLAKE2B 9312e96ef7b8a95370c7f778b9a1f0ef3bda48d155c65a06307f892cfc3ebf4067d98704021aedae14cf7d5677564152f911309ed3af842aff5dba9acddc9b51 SHA512 a2faad97dd586e35a6564fb389b621bc6638a7afede5ca0d570fdd610ecd1c0908b069caa7471098d42ac90afdcf22490d19babbd6af6eddca656b7afe9c46df +EBUILD cryptmount-5.3.3-r2.ebuild 1707 BLAKE2B 2791db508e85d46a0a4b05311c483f7ec6ea62ed6f56eba07574431e877301d5fefb843eae5072b8b34c9d8ac8ff7b14bc80ad3f686b8d4c4b4400b7e32a2d9d SHA512 e47ef52dce04f6ad56a244dc5efccc9da5b39c9ac8a5fd75bcded2cf822ea26d6f9d185e93cbe6a027ca521fbc77e725a31a18a88afcbded6de498af4daa86ca MISC metadata.xml 2146 BLAKE2B 9547e66f62ddf51455e742a6c6f5b350eb8cb4ff62cc4f605607f8970714587758dff8e9437d355e1781a2ce2e25e38e184730de0c39cd5d191b8459bc540c3a SHA512 09d3385123051712f2a264f5c2793f1d99090ed095af17b4753ad925f73e0af85c355fc985966f7fc3cb8b8225dbb9fab23e254308d29633a73bcb6173dde029 diff --git a/sys-fs/cryptmount/cryptmount-5.3.3-r1.ebuild b/sys-fs/cryptmount/cryptmount-5.3.3-r2.ebuild index ceafbdd5eb6d..ec1442f7ac9c 100644 --- a/sys-fs/cryptmount/cryptmount-5.3.3-r1.ebuild +++ b/sys-fs/cryptmount/cryptmount-5.3.3-r2.ebuild @@ -19,13 +19,14 @@ REQUIRED_USE=" " RDEPEND=" + sys-fs/lvm2 + virtual/libiconv + virtual/libintl gcrypt? ( dev-libs/libgcrypt:0= ) luks? ( sys-fs/cryptsetup ) openssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) udev? ( virtual/udev ) - virtual/libiconv - virtual/libintl " DEPEND=" diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 25c5e9b63e21..74acfe1c6b60 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -3,6 +3,6 @@ AUX 2.4.0-dmcrypt.rc 9059 BLAKE2B 622320bd69a9e2d2779bd0eb97034635335125d2def73f AUX 2.4.3-dmcrypt.confd 4306 BLAKE2B 107697c85548a8c5f1f4ffc1ae6ec785bcb9c63a55e52a97fd24c1a3c5e7867d031f494030a27be1efb8eab448a94e466c186c964b2638fd4d95250005fbf31d SHA512 d80701d1507c682d619e2ec433bebab2d64cc3e27c5ddc2e7c8408e07dcd353b4d66e9b8505719fa88fa734d7a7930fc90f5b8279e185580c3c038ac7ef7a02a AUX 2.4.3-dmcrypt.rc 9693 BLAKE2B a426ad90c9e4540a82873cd3a1594def778063c97278b2f82cfefd79cedecda97f1b6038775ce34433ba25519e3fb565bc0b79eedb39b46080a2fec68d564a99 SHA512 9f2ff42e0ef1ab3046b545c550153e13ae7d2446560b4154c23e32ca2dd8c2871e68b07bf8cc273c18730ad6e13b50b07aadb91ae7f43077ab08bdce01db5323 DIST cryptsetup-2.4.3.tar.xz 11242152 BLAKE2B f5859d794d626cb19426a2c9afc4655fac3a1bae462daa42b37b925882804d5146aadff8733799dea89dcfdc311e628e5b806754495824705709ba105f91682f SHA512 2d52498497be37a837126d9cdc9b6331236eccf857c3482fe3347eb88fccc3cd0fd3d8b4490569603e18cfaa462431ae194bce0328f3eafa8bfe3e02e135a26e -EBUILD cryptsetup-2.4.3-r1.ebuild 4219 BLAKE2B f2f0194dc69ad7ae321023e4d06a489ec6fefbb9acba1bf967fd0f153aa5cad568722caa53a717bceca47e7ab36d23454eb8af1e03e1a35627477759238006a6 SHA512 e057ea860c061034a94d341b906cef74cdf4efc323484631ff70d5947cfd6c4d563b30a5c5eb07cbdc5350d2f8cc8bd3445d5bbd08f8ffa410755b845712ef89 +EBUILD cryptsetup-2.4.3-r1.ebuild 4267 BLAKE2B 09f256f89a4ea428a471e0db1fda0a4caa970ba01b9c660f4612b241e66fa7fe6d1f5e26523f50a8377813131643476f051f81fdbeb15f92246b41ab0305b1db SHA512 3922cccb38818dbc6f68c3859c68f1390ebc150690c915a9a098ec7bc61256314a2d257b016a69a7b667bbe7a888988ec335b4b99a818f81c812b24596f9285f EBUILD cryptsetup-2.4.3.ebuild 4172 BLAKE2B 769f38ca8f374b8e08916ab3d7baa4a5bbb250d8fd4dc7f58b8f6a00a062b7def3e033a89781227f1edb15111da7b005dce2e5fe012d747f56d2e995f313baeb SHA512 d671d6d91158d2233b85b026f82fcfb79bf72d8bc0434bfe18cd803d974310c9962bcb4c98bd1bec23590fae7d073fea48bfbf2516322815a08a375679cec5fe MISC metadata.xml 1132 BLAKE2B 4e7b9a495fa1208119744ad84a75117ea3010e5ca2c55bc542017d280b35e8a2b7f3b5f38e45373660c11ffe58e8bc2243e704513f1f80c2f32b7d33e032fb04 SHA512 5cb04665b058d4895969510f5ffd5bc4bf7d6c753a4c6a78b0be0b4468fc67d2aa2eec700ceb434d757721b0b9dc5a1f258806cbaf11bff5ba4ff40ebd576f86 diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild index 339d9d761672..48ef57af21a5 100644 --- a/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-2.4.3-r1.ebuild @@ -19,7 +19,9 @@ CRYPTO_BACKENDS="gcrypt kernel nettle +openssl" IUSE="${CRYPTO_BACKENDS} +argon2 fips nls pwquality reencrypt ssh static static-libs test +udev urandom" RESTRICT="!test? ( test )" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - static? ( !gcrypt !ssh !udev !fips )" # 496612, 832711 + static? ( !gcrypt !ssh !udev !fips ) + fips? ( !kernel !nettle ) +" # 496612, 832711, 843863 LIB_DEPEND=" dev-libs/json-c:=[static-libs(+)] @@ -75,7 +77,7 @@ src_configure() { local myeconfargs=( --disable-internal-argon2 --enable-shared - --sbindir=/sbin + --sbindir="${EPREFIX}"/sbin # for later use --with-default-luks-format=LUKS2 --with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d" diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest index df15b4b0619c..27ce2ca3450b 100644 --- a/sys-fs/ddrescue/Manifest +++ b/sys-fs/ddrescue/Manifest @@ -1,5 +1,5 @@ DIST ddrescue-1.25.tar.lz 87001 BLAKE2B 45054ecb6ca12f8fe27d6b783f7e339fc11a9a3425160012e0682e39644fd3c91362ecd568a2a0b93f9f0af87fae2415b33a7c3fcd8fff2262898e8474818a00 SHA512 90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8 DIST ddrescue-1.26.tar.lz 91930 BLAKE2B c545499e380587729eb3fcc90a7baf66288348dc88027dfc14401ec72254cc786d8ab7be076a346964327668ff719048dada916c9f1514a765a255f02c5666c7 SHA512 bbe414563d459a1ad1c4e55848214d195e01f8bc455104eddbeff7046623f5bc21d961457d27ace2605d13dff68c7948182706b8afe6755e5c363e8cad86a1cc EBUILD ddrescue-1.25.ebuild 875 BLAKE2B f536aa8813c6c4b848ff13bcb4a0a7c906d1ab657f512bcbc19d551bdb2e1db45b5724c642577af307294e967d9121122fae36ee59ad6b5bf084a85c4b14c000 SHA512 aa48c34785bc64d91efe68cd2e72c97e60da455d3cdfc694e42a075e85140a6b0d85c7b55dc6ce09b5608f6734593e84ee09cda472cebe63516f96754d35a31e -EBUILD ddrescue-1.26.ebuild 886 BLAKE2B faee62ffe2bc281d9eec70483d378bd99122cbe5d70ab621d1751dd2637b7c83ba06762dbb73ed7652c02dc6cea7f54107d8bb5dc78957a20501ea011ad08a61 SHA512 62dc49f0483a5ce54fee5d71976466b643690cff907e9756bcafc0363e473ac930fc3ebcc09177ad5fe19dd6b5ccb5429dc38422b8ae6ae2917c235927692346 -MISC metadata.xml 258 BLAKE2B bd458e931e669f3599d041086b28cb8e05f9daca13a17504ca4bdf6a19f9e0e0bce389981d9b65875a04e7a6e068aab4d7f92819a6c545638a1e37ed462866ac SHA512 f3d8019f0e5fb12b60d75645d9d8468cc5ca283d1df19b23604a58221cf08b7a5b63744e4e99f26c80b798e2caf52c5a69f8d383c3aed06f7a1996e72f7f36bc +EBUILD ddrescue-1.26.ebuild 882 BLAKE2B 50103fcaaf576b03288821646cc18471c51239a28e8632c5c7aea8e9d07ae727317c14d81bf51839ed00fc4eb67f0887e69c44c354eec25d7c640306cc59699e SHA512 2c315ca5d457e99f4e180f697eaddf64544a51b7aef4acbc63a75611b489934dc19449d36da334f36789185f76648ab33bd65e8da66d2f5f4aae7fdadd5d3442 +MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/sys-fs/ddrescue/ddrescue-1.26.ebuild b/sys-fs/ddrescue/ddrescue-1.26.ebuild index c4d47c739d0d..d9028f4ce2c3 100644 --- a/sys-fs/ddrescue/ddrescue-1.26.ebuild +++ b/sys-fs/ddrescue/ddrescue-1.26.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux" IUSE="static" DEPEND="$(unpacker_src_uri_depends)" diff --git a/sys-fs/ddrescue/metadata.xml b/sys-fs/ddrescue/metadata.xml index 2ac0eef8d76b..bef24d2c2337 100644 --- a/sys-fs/ddrescue/metadata.xml +++ b/sys-fs/ddrescue/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sys-fs/dmraid/Manifest b/sys-fs/dmraid/Manifest index 8657d9b8322f..6fd6ab5cb54f 100644 --- a/sys-fs/dmraid/Manifest +++ b/sys-fs/dmraid/Manifest @@ -5,5 +5,5 @@ AUX dmraid-1.0.0_rc16-return-all-sets.patch 283 BLAKE2B 5278f1df08db2a63519b6d31 AUX dmraid-1.0.0_rc16-static-build-fixes.patch 3840 BLAKE2B 713e255890dfbfd7ded83cc914a136cf88a40943ac310f10e574f6ee3683e4cd61b1e369a38ddfb6ad767c904b95b2a04c04b1a38833998485aa4b1e29006870 SHA512 ff2aaebec2be1ace40377a4bcd91c802c190ac4047643478d6f99e3023cf69b4a5e8230519ce2f3febe5d6419a54557184739bcbeaa08047354ca93f27e4ec67 AUX dmraid-1.0.0_rc16-undo-p-rename.patch 531 BLAKE2B eef9d2ef5f2766773bf83bba93d44a02a450a03b1e338f3120473512fe60d7a5f60d4bb2ae25ed019e0c58b89c5e67fd81426ae0fd5e06220976640b84d29d67 SHA512 b5b93d49e716c585284dfd89fe4651fd5bb6921196a053797aeec9cf5654f11da7b2ed1ad93f2df15fd3ef47c95efd67aeecc196fcfd3feb22f7903ad103a8c6 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e -EBUILD dmraid-1.0.0_rc16-r5.ebuild 3379 BLAKE2B 52b613cafcb6e96c324c272e4a416cba8322cd1eaeb3751ab4b8516b215f22fb039786f06f2231e15d1b3ded94542d6406c0e5168ccc32e07934e3dc78b58058 SHA512 0ecea9a88585faf1b4a01f48b639bcb1ba5124836e387bd67f880b90fd87e02fd918f2513ee435b890d4e9b8b8ff042f75dea2258f5db2c936c8a15c9085241f +EBUILD dmraid-1.0.0_rc16-r5.ebuild 3386 BLAKE2B 8740322a75f4a00e236946de196ac146abdceb05718bfe8166e8da1e49c4360d2e01202e868a72b739374067de1a4f897d355c05cfa2430d5d30a4f4c6b4db3d SHA512 ab4469cff1250910e4067a42d704585a275759927b62f4a48e003f0d5136534bb68ca7b854e0cabb86dbe9d854866c66da51b9016e487e67d1120a480881fdb2 MISC metadata.xml 545 BLAKE2B 0d4317fb1e814bba1afbc2b68f24ed37a2b9025453544bd7d73362c82c2caaea3fd359ee2b4a9006bc02dfc7f4ae25d0baca5e7f5263edd972b7d2768e955944 SHA512 24a78570fbdb099474e43319ad3586653173928227a3d2d49edc9160e415d8ad01687c3c1a2afaeb3920d17d94d8c5b1f7e40efc65700d5c5b1c9bd1ac2c14f1 diff --git a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild index 7751241ce571..4d1ce63d0172 100644 --- a/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild +++ b/sys-fs/dmraid/dmraid-1.0.0_rc16-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}/${MY_PV}/${PN}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" IUSE="intel_led led mini static" RDEPEND=">=sys-fs/lvm2-2.02.45" 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 diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest index 8d3cacdeb468..f2ff2bb03c2b 100644 --- a/sys-fs/extundelete/Manifest +++ b/sys-fs/extundelete/Manifest @@ -1,6 +1,5 @@ AUX extundelete-0.2.4-clang.patch 551 BLAKE2B b578c182df4c6540b5ebdfff8f1a88cce021778f35da171b6d04f8d3946f5107c331ec6cb0514a56a37773ba30c5dc5c3bd947c5c514a3365cddbd58665503a9 SHA512 c4083ec916332648a8b89cdc36cda8b87dd6181517e3b2a6ad56139965fd8bcbf1f353f8ff4c10d156f29b4ba42c814a09b29428a47605740d4e6262b6d386ec AUX extundelete-0.2.4-e2fsprogs.patch 582 BLAKE2B 12176abdccb06b9ad2a55dac5dabfbef402a95ac00ca28ba951e4fcba024d5f99e0355b1f6f0bf38f6b2878cd190cde6774136c1b0b1bbba27b73fc3d0a7adee SHA512 c0df34bfdef07e931503cc8f3270cd070328b54053da1d8dbfefb8a49a81c4234cbdb4205d30cf654b5d5ca42dd27ad104f08f6ab7839d5f3d0cebc6ec6ef499 DIST extundelete-0.2.4.tar.bz2 108472 BLAKE2B 3627c092672957e25f2bd351a6d92f6d32a0e322a0555766edc35545cccab7ee47fb0c471ebea31692779bdf44433bb98a07cab0bc26141f1f09b33601da57ea SHA512 5c896055b6fa3c38f283a043cca744513fdc1a60e212eac0c78fa868064a8eeb11f540c4cc5ca89ac68da0c1705a40fe45731c203b6748808f85e9870a207bcd -EBUILD extundelete-0.2.4-r1.ebuild 437 BLAKE2B 21b794bb0785d1f2259a79868cfda968751d546c781e4da8e10e0495d0153f1b4cd140bc3922895a08eeae3ea1cddea9afee3db3daa76c7e3e5c7f1ff6926835 SHA512 de31308ab3d5c73aab3ce55e5f102d76f5a8f0c0fb0d5bf87436f975fa4b18d3cca665f486640a07b9cae5bab1c58f1051d9caebc43afce9e34c2321a9b97802 -EBUILD extundelete-0.2.4-r2.ebuild 481 BLAKE2B fae921057d7ab086f57e45edb41795e4f7a0a4124d0bd38444acbaf80b249d2b8c59e006f78d2e707e824c82365ddc920677369ee82297de73118b8c5bb71404 SHA512 6cfac0ad35cf6e31988d8f8b05345b83d327b7f89d4a8017efacc2d7029d13b9abdfdec45169e2b5691408cb072b94da1840789e196ebb358d470ce06ac0ce0d +EBUILD extundelete-0.2.4-r2.ebuild 479 BLAKE2B 18a2ff3735bcdb158495f3aec09b678dae6ae01066f2e5e3c2641d703ec13aae9b857b073b56a77df02d27b6baf8a31062c6b1cda55b357cfca82869d81036b6 SHA512 cde4ec6177597321673c8b0e4bcc96c3afb3ed335d56c6537867f320f01f635e9bf45a166323f33a523402d888b1412dd13ba2fbe50b4fa9b12a4070a6fe8a96 MISC metadata.xml 407 BLAKE2B 30d6168e6fdac8b0528262d69e04bcba524dec5620d79d66a8b3cee7a04430026d92dedda1c96a321fad7fa4684c142d7dfea1a802fadef8032d4316eb4e6612 SHA512 207a713127eda7bb582f66d841a2aaf8825a8d0c0b4e9e8e7b0a4d8ec9eedd9fccf22be14fff09c98e57c339257a1cdba526036f54cb1170aaf8ab65032c06a2 diff --git a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild b/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild deleted file mode 100644 index 88a235cf4f4b..000000000000 --- a/sys-fs/extundelete/extundelete-0.2.4-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition" -HOMEPAGE="https://extundelete.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" - -RDEPEND="sys-fs/e2fsprogs" -DEPEND=${RDEPEND} - -PATCHES=( "${FILESDIR}/${P}-e2fsprogs.patch" ) diff --git a/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild b/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild index dd0d828f64b5..0902cb8474ea 100644 --- a/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild +++ b/sys-fs/extundelete/extundelete-0.2.4-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm ~riscv ~sparc x86" RDEPEND="sys-fs/e2fsprogs" DEPEND="${RDEPEND}" diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest index 5c95ac13f228..46505594208b 100644 --- a/sys-fs/f2fs-tools/Manifest +++ b/sys-fs/f2fs-tools/Manifest @@ -1,3 +1,5 @@ DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d -EBUILD f2fs-tools-1.14.0.ebuild 830 BLAKE2B 0a28f29ca8c4e1ceae7d119bc892413387c22772f52f0b5bfa7b53489e690970e5e186a4ebbf09b23c030c4a2fedf33c6ec15ba2534a69d4cf7ded95dade5d12 SHA512 610cdcab1942c5c8b116c7772bce50e933509035cad24b6a3c6bc9421e6113d5e6c09c78b94ef06a9fe496ba59bc34238a59706cdb856851d10fe19916ed73ee +DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387 +EBUILD f2fs-tools-1.14.0.ebuild 837 BLAKE2B 2ea6e841526daf9f2bb0ab59edd35e60d811b4b57af64053046c8590ce3f0dedd093c58ac88ed2db1b6d192364589385817c6f37b4d4ae5ac297d5dbb6dade21 SHA512 3eefc0bccc21238919659c197a6083097711e4c2f77dc8d0914b542782be4a54e816a7f986d2fa214b160779bc94568fd957571c3ea0cf170a7c61713714459c +EBUILD f2fs-tools-1.15.0.ebuild 858 BLAKE2B 38d592734707b89008aea86847cbc5ee35defc6ddacbeeb33b99b755bc70f679d59d333a4c1ef40383e72cf72ac5fbe7aeb900fb0063f5d11fc457a2d2d249b5 SHA512 ea4a2f01496e3dba4ce7c2f60b32f1f4cf4a801623508ae7e6c4a6b6e584baf0586c254b4e24e2fa1640256d881bfc31ad26cbd138cb50913b8b4771541ca5d3 MISC metadata.xml 439 BLAKE2B c7c467cc754472343e7e4473b79e8a70ed5f2f34c94292db772c93ce8018373dd8fa2ffadb26c93febece4c5b5faa1e7eb1338dbd7f516c208f1e2e17bfea82f SHA512 8045798ff0308394ee5cdc172e13776291089d63769007d2b5c13a4d50f27fa1a1fec3eda3642cadd068d91780788d0d504faa6a17e754521d3f7e02934eb41b diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild index abdb5ccaff97..6f0482e3a871 100644 --- a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild +++ b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0/8" -KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86" IUSE="selinux" RDEPEND=" diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild new file mode 100644 index 000000000000..5cda3fe17880 --- /dev/null +++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tools for Flash-Friendly File System (F2FS)" +HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/" +SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/9" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="selinux" + +RDEPEND=" + selinux? ( sys-libs/libselinux ) + elibc_musl? ( sys-libs/queue-standalone )" +DEPEND="${RDEPEND}" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + #This is required to install to /sbin, bug #481110 + econf \ + --bindir="${EPREFIX}"/sbin \ + --disable-static \ + $(use_with selinux) +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest index e648de5ad52c..a84c1c93c617 100644 --- a/sys-fs/fuse-common/Manifest +++ b/sys-fs/fuse-common/Manifest @@ -1,4 +1,4 @@ AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6 -EBUILD fuse-common-3.10.4.ebuild 801 BLAKE2B ac980d00ee89cb0ec2e904d48fcfe09fbb048d51ebf4d9dfe973884f78f6ff910517d5d20f91464a8bda601da21750bf230958b83f14936275118d3ed9a8dd11 SHA512 dd479540f2776b8479afae1965e4141dc1cf83c7db4270fb16dfdb5d5a0e1d74d66a1608087609173e4208619455a64c930acfbf0544d683ec7bb4f3bcda6b3c +EBUILD fuse-common-3.10.4.ebuild 808 BLAKE2B 3cfb1ca5ecc0d9553cee6c63c7aa96cc80767838efe22f0dea90f2b9341b87b82d10a4620efb5a61084a504e5d827a286481b48a1d35916663da55f76350ea0f SHA512 f79420ab6fcfc6c19dfde4453b7e3c94e4b1b102d865b7428b89ada1a749eefbb1875fb7e3a9695ec6b16451ff69f2911cf13882ab541801d435bd861a5b81df MISC metadata.xml 408 BLAKE2B 20ba4a6495cdb7452194262956da7cf6c9dbd33f21fc0f0cfcfc5f9b9301cf18f2082d556a2a31de0190b8dc3455abef0121b55352bc9af41baa8d78800998f3 SHA512 4e97dbaecae61b939a32391fb99d6c37276d1e43dcae2f249bea6f5b3e3dff8cb576ce3360677206ff02d53adc3b44067f4f8676ce0e4c91c39e72aab6dc5671 diff --git a/sys-fs/fuse-common/fuse-common-3.10.4.ebuild b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild index 24670d1b7e68..8fd9d127f571 100644 --- a/sys-fs/fuse-common/fuse-common-3.10.4.ebuild +++ b/sys-fs/fuse-common/fuse-common-3.10.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${ LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND="virtual/pkgconfig" RDEPEND="!<sys-fs/fuse-2.9.7-r1:0" diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 70adab48a734..8a2cd94b9fcb 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -2,8 +2,10 @@ DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f DIST fuse-overlayfs-1.8.1.tar.gz 103753 BLAKE2B 42ac0b75b563cee9457721dfebe03355d930e074f44cda43d071e853df2d2192266f6b2901c4faa333414de45fb1b95e245a42ae15c52714e311a1aad98deeb6 SHA512 7a63f1f129c100615676bccdb0f7fd83c4e9901786064d98fa3776dd64dbb61c38913f8d0eff428a601cb44b1bfd3261ded5ec5e471b889c7cd28f81a859d8ad DIST fuse-overlayfs-1.8.2.tar.gz 103892 BLAKE2B 18473c9703d12befbd68b5c1374fd18233dca3663dc0c6346e0a0c2f6f8928a57e8c04cf151196db3d6404ca8816e5ef2826a989c86d3ec7171344a73cec189f SHA512 637fbde0e9481b31491fa7fbdce9315e3832e9de076668dddfeba407a0dd9ceb2072723348eb2a47586756da8a8242a040bc20dbb5e1ac3be3ffa795daf22b95 DIST fuse-overlayfs-1.8.tar.gz 103726 BLAKE2B 12da116bba60c5833b43d130b24ba6a60fcaabe1248226fa30e8c0b2c2439a438c66b39d28a8d3dd0f65bf353c38811e87f23a2fdbd830982063a7b5df7b4808 SHA512 68a7b6a41fd2c44fbfb194d324cc6869d7f6ce198f7ff3ddf74e91f9679785ffa610634a6e35c2661549e0bb776bf68741be45501d860b1e8dd6814d2b3fb0ab +DIST fuse-overlayfs-1.9.tar.gz 104063 BLAKE2B f18703e32644ccbd1b47e9120b13a8efe1227ca8c142dbe90ff174e33937a2882ba354a837f874b5cd7bf28d1de7bb5039b86b6123288bde1ffc570a68500fb6 SHA512 16f4feb8426c0d6f78082065a2c1c6afb96e4fc665e40e79e2b2692b0b21e77998a2195cf2cd81f505d0167318ed843f55be4eb16956aadaeab56f47ccbddc0b EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58 EBUILD fuse-overlayfs-1.8.1.ebuild 572 BLAKE2B cb0cc0292bec9b522917a51f7a8e5d4a7f5449e71b39d3d5cd79f99de66150b45d7677b4ff410aae9ff4fde6acbb0a3fc94782a1ab26828d7d54e7baf8a130d6 SHA512 f2a4cf0a47d0075e93722f9ed8e270264e90b8df89264a47805269658e3b3a48d803ced6f27a61661d6cf73e30d5418d561900ade05c5da47656846d0fa9ca81 EBUILD fuse-overlayfs-1.8.2.ebuild 579 BLAKE2B aa83941836f4b918bf0612e785c3f68af58ee225e8bcaa0f2ddf8ec8fdc0b2d80e0958e5866b680308ce479dbdce039150b7b0e53b3dfb490c888718c000673b SHA512 f18e3d1e8259bc5343cfdab1445ffeb8ee84e3152bb9fd0cd4c97db66a492294abddd4d8da7fc1498c04793b5a7259dca09a9074004269c8043e88f2ccc90dc7 EBUILD fuse-overlayfs-1.8.ebuild 572 BLAKE2B 914440d5b4371a8a8cd119a9d55cb921b88499d1125b8bb6ceb3828237de51186e57580975d6ab01a2a6deb823a4a552c6f8ed85a50e6f30a648134c9ebea3c1 SHA512 ab3a027788a4fbc926ef42cdfc1e7754ae70129786425646b1109385b888c4f7fc06b334c3f3ba9062cc0efa425670804416d684ec4a397294dd97335f909bc1 +EBUILD fuse-overlayfs-1.9.ebuild 579 BLAKE2B aa83941836f4b918bf0612e785c3f68af58ee225e8bcaa0f2ddf8ec8fdc0b2d80e0958e5866b680308ce479dbdce039150b7b0e53b3dfb490c888718c000673b SHA512 f18e3d1e8259bc5343cfdab1445ffeb8ee84e3152bb9fd0cd4c97db66a492294abddd4d8da7fc1498c04793b5a7259dca09a9074004269c8043e88f2ccc90dc7 MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild new file mode 100644 index 000000000000..ea15a96bde4e --- /dev/null +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.9.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="FUSE implementation for overlayfs" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +EGIT_COMMIT="v${PV}" +SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + +RDEPEND=">=sys-fs/fuse-3:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}" + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest index 98d0faa67939..f9d18034565f 100644 --- a/sys-fs/fuse/Manifest +++ b/sys-fs/fuse/Manifest @@ -5,7 +5,7 @@ DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe88 DIST fuse-3.10.5.tar.xz 2931828 BLAKE2B 72de5e5867dc0934912248e1e626e2753c0f654626ba9d397753a7fbbf21dde877e6c528a44950ae1c828583f36a49c39f44a587544e44f8e749bd4c604b33b4 SHA512 da17788acc3fabef3dc7b736b7319c1638d7de27e163699f7dbc0fe9159aeba35964af6afa77a7654f1f321e2fc03ee167909f21516cbb585ead33cad95620fe DIST fuse-3.11.0.tar.xz 3515332 BLAKE2B 30d2dfee25a34b5f84f0a6b13523a6183fde7989b3ac908b68b8b9e4c327da51678453918c3009712ff1f3aaa79c4b0a29f22bcb712ee550563b23fd9ac64a09 SHA512 033324de7ea4c7e91fb21c453211c01e53771ec5805c2126e13ef2d4334119a51f5c783b6249e888e28888c753aa04b48ed33cefb6d486d8d526546565f6ae50 DIST iconv.m4.bz2 3057 BLAKE2B 9d8f7637d87bfcea1b60f3ea11e162aecf391b3f4579a3b85afb01735f56bfbae363a7e781279f3b2bed0d1dd3336f7d0678d3b1d59004824d7d0ca848dceb6e SHA512 9899368b8acc06e216a7a548b83a894f780e152a02612cd52af02b5c3f2ff38e2c36e77bda300587f81c3d74c90addec8066885216fa0e74f3f3280a383d2b55 -EBUILD fuse-2.9.9-r1.ebuild 2091 BLAKE2B d49c1ce7621768c924b5fcfccee48928256f4f6f8a207c94a4aa87edf4bf83ffd39a91a37346635373609e05a2ecec7dcfa24cac6bc2fa168af5318ed7671002 SHA512 fe5804964ddd9c6c9d2c1db0a666740cb1be726fbcd2e45226de49aba513b7da431bd2c17ff0549c24bdd7c95da569f1bf215ebeeb01ca37e8f7c92883258480 +EBUILD fuse-2.9.9-r1.ebuild 2098 BLAKE2B ed8d6d52dd8179ff9b1c7f1d442448eb4895ca08e187b387e3eb4b5dbb7966576789baee056d64bb4eb32b21ef2acfccc7458e0f95b4078cca8a4acdaf299cb9 SHA512 3ae9cb35858446a23f6e451c93c783bf85ef15370025a33d210ed579d4815a212120b7cacd603bf3b7f9d224e2744cd12f4fe5563d822d8a77cc474c0dbfb021 EBUILD fuse-3.10.5.ebuild 1806 BLAKE2B fc21f9e50c0f3c9de23ff2157c3c12d48e64a1e49ed955f1b28e30a14d855eb12fb16ada86f04f8256bbdbd34b8c7ea3c7ab511720d369cc48e86607b0115748 SHA512 54eec78493c8b365c9b7576cc7bf5f8947e52e359a24e8f044fd7785bf548b648d34437d4e6020509f05b529ba6cdb846576ec0e77f78294ccbbe4cd6588c6dc -EBUILD fuse-3.11.0.ebuild 1814 BLAKE2B 092c4ebb408ab0ecfb2114df904f570d219077724e6dd886f7f8e774fca3dc17bb7bca0a3c3fc96bd1783ac5adf18d5018253a896104b5f6e22028e380ae8b2b SHA512 66bd81b58fd4afc4006d1740c779d2e74d1e54444330ea3a421aa3778d572e81ecae723ea2a175975acb3a1222ee2c4a7028a878b8a87225c0dd8977f5f1ff69 +EBUILD fuse-3.11.0.ebuild 1821 BLAKE2B 00946d041d99da27ab78e5ba0e3d39a839d214ad6e629e3901e159c8205a5228dd740cee3c1362f55a88971ee0116a8f066120669f38a00c6495c4b73221a3e7 SHA512 97326a8fddb7a9b9a21f1f6425480c1f3fc9220814df510a29769418676afa684be06b50e39347d97f179863a647357d60b5f9510462eeb113e46d4cef7a8f92 MISC metadata.xml 357 BLAKE2B 49ff08baa6cc3cb3d58f892f8d1db18f2d8fd184945c4fe7fc75f0db265bf9b6ee8861b421c8ab1070a51e2b03b94eb77133991d71208a51a30d1f286d3a9ea6 SHA512 1c5b658c85cb13904843e1b0746019cca9dba7ec0cc61d4ba0c13378b32b4d3eaf016fbc7805637113c5285909c22f16d8ad3cdc23fec69775b12057f4146a0e diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild index 49a061cc5340..4d6a5352e737 100644 --- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild +++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/iconv.m4.bz2" LICENSE="GPL-2" 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="examples static-libs" BDEPEND="virtual/pkgconfig" diff --git a/sys-fs/fuse/fuse-3.11.0.ebuild b/sys-fs/fuse/fuse-3.11.0.ebuild index 6577e8df01b0..cd8c88e80772 100644 --- a/sys-fs/fuse/fuse-3.11.0.ebuild +++ b/sys-fs/fuse/fuse-3.11.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2 LGPL-2.1" SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="+suid test" RESTRICT="!test? ( test )" diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest index 907230dd4a63..573aed1a70fd 100644 --- a/sys-fs/inotify-tools/Manifest +++ b/sys-fs/inotify-tools/Manifest @@ -1,7 +1,7 @@ DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881 -DIST inotify-tools-3.21.9.6.tar.gz 91668 BLAKE2B cfb279d69e650b275af03052f4f76522670b7a563aa4e81bd5883b3ff825ecb70382cd4a5d48a9eb50b59930685a60b59a17376958d111d129c61fbced47a6bb SHA512 206eeebfd948499d81e6666b153cd7d9b05df618291fd3ada6479251b0773ce629c19f73117442a9093f028e294c5ba2dfa0aa4cf711510284ab7cad657da21c DIST inotify-tools-3.22.1.0.tar.gz 92922 BLAKE2B 42558ca62f79e2bdf5a6071334a05cee826ec00b0666b1c0971af64d769eb7852cbcd8d6e630f88af68f26f5607ca4ef94ec832fbe2e89d42182120aac4896ce SHA512 53317147af4803b69603839c010a2b0b3fa527f0e32b08126f24805600728c0a9570b2a3d94bf987f0b9a4bfbe7207b5faa9337f0d7add91b062e68de4245548 +DIST inotify-tools-3.22.6.0.tar.gz 92918 BLAKE2B 601d3ac6896e445d297a04498c63df4f81c59699ba2d5b2eee2e8c499332913ce2783d13c9906d577ff0b6d7ef91ca826d48b01674adeb3d3569dfc1fbc0df63 SHA512 cda445add4b9d80b70eff9189ed50d05f4b5593a755159d0354431166c6fe6fdb33f7bf37fd50bc09aad3ed0a6e3763b9c74f65e554400f2596b8d492f1d0a21 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57 -EBUILD inotify-tools-3.21.9.6.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5 EBUILD inotify-tools-3.22.1.0.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5 -MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833 +EBUILD inotify-tools-3.22.6.0.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5 +MISC metadata.xml 644 BLAKE2B faa84a2101847409fcc82427dcbcd1ac7ec4073ee044e970b3f4c65bc1c28484ab4266cdfc4dc4e3980ee1c384186e308d210d02304788d63ccc1b4f54dd5ac8 SHA512 ba77f381e79379995ff395e82c65dacfe9bc3c621d38201bea7ebaac76911aa2de5d472a486e22a5ddbf79565e8d88ea14707d8e5f4abbc7dad8bce3b1e0f05d diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild index 2d25f84ae71b..2d25f84ae71b 100644 --- a/sys-fs/inotify-tools/inotify-tools-3.21.9.6.ebuild +++ b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild diff --git a/sys-fs/inotify-tools/metadata.xml b/sys-fs/inotify-tools/metadata.xml index 85936347796a..b5ef777a11d5 100644 --- a/sys-fs/inotify-tools/metadata.xml +++ b/sys-fs/inotify-tools/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> </maintainer> <longdescription> inotify-tools is a set of command-line programs for Linux providing a simple diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest index 01d145993466..fc1fc8052385 100644 --- a/sys-fs/jfsutils/Manifest +++ b/sys-fs/jfsutils/Manifest @@ -4,5 +4,5 @@ AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858 -EBUILD jfsutils-1.1.15-r1.ebuild 1226 BLAKE2B c4df5cb171d86b4b2d17a12c48d81f3eb2c05d198a1c8376ca56af405caae7fc670fd311cac24c0e9f7762892409e0435aee612cac911fdf356889fd5d379f31 SHA512 9dbcf84dc934e5cccbbc65c5f235aa72e4149081d74ad7034fafaa24fd436319c34b69b22227d989f295c1b138828bf052ba35540d1066db4ac5866fb002e66d -MISC metadata.xml 684 BLAKE2B 71d427e0a1162565c4f80686a6aa79773ca773159b457e1301d294f0c6ab0ee45d540df797c0ce98309d21a444f488a0d94353a8a66881801ab108799ab0c42c SHA512 bb82a7efa250c1c2d328b54b8bd0548a6ecad5e3e448dba9bdc3a22ebd10e34578417cb1acf3909feddcc445bb3bf73d14b6af2fec7648aae4f6edf23e485543 +EBUILD jfsutils-1.1.15-r1.ebuild 1233 BLAKE2B 5929edfb3976591f20871c7295abc363d495466929245a58b2593b83ac23d811498e8aabcfa44b11c13368d880aaef7743f208b2f6751815a393eb7bc073b36f SHA512 29ce886188d07399a4d5883045a398b7db91e2641df7cb521574f94b03cb23544e474b3113ed79c5f1f652312244071109f5a376b895610968119cf08e55933e +MISC metadata.xml 600 BLAKE2B c46a9aacd96887980123e08a895435ceed6fee8ee66c77ca5cbe35dc6401c1bab800502c7718de580d6a4ea0f6c4550f961efd66513f84f318d943bc8b706811 SHA512 33e857b758682c2259d51ea1dfd3ba6b27a1fe5191822001070e468f6c6f82eb880ca71e0f2970571c6d60e7fc08f3685f5a0ac3b79c27e8b7b79e00394e5009 diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild index 21dfe50be000..72b8b5417350 100644 --- a/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild +++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="static" LIB_DEPEND="sys-apps/util-linux:=[static-libs]" diff --git a/sys-fs/jfsutils/metadata.xml b/sys-fs/jfsutils/metadata.xml index 0f19441c2846..2e0311236415 100644 --- a/sys-fs/jfsutils/metadata.xml +++ b/sys-fs/jfsutils/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> The jfsutils package contains administration and debugging tools for IBM's journaled file system. diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest index fc776e066ff5..33d8207f1d2a 100644 --- a/sys-fs/libeatmydata/Manifest +++ b/sys-fs/libeatmydata/Manifest @@ -2,5 +2,5 @@ AUX libeatmydata-130-implicit-function-decl-test.patch 611 BLAKE2B cd8fa997d0dd3 DIST libeatmydata-129.tar.gz 358437 BLAKE2B 448cff19629fa1a07443a52ebe16a7bf9a8ac7d0c2688e89555ed6c9c2369695a70ae2abf1b74152b3c305e6bc019e2e9808af6642122cd10a73deb7dfb580f2 SHA512 dbd0ea4df77034ecbb75955394b15aec6f1331205a5c7aa4a6e0595e3e486bbcc81c28a264bf5441c660563f74bfb06630da98373d481a2ebd9e9b1538c109d1 DIST libeatmydata-130.tar.gz 375627 BLAKE2B a1f65050572e8a7fc8345082a12e2831a8fb1e68e1d198ae507752375b2081a79fa6e5e589028104cd9d767d86b4d453c0eac0ad7f366c90d6734f5868f8e0cd SHA512 80edeee1b39e14d10e7d04d7fff63a233119c6e13216e92ec786cc41ecd79eb58937da0e621aaef697490e9fb285f3e1109b786ee6967fa1736bb4879e100f18 EBUILD libeatmydata-129-r1.ebuild 860 BLAKE2B 2af86348726b6c475bc521f76376e87813aca3ed754c6ac88b180a36319c4c4f8914615ff3d04788e865bbaa176dfcf796c971666fbf2529c0df66792e1da3c5 SHA512 7242b38f1639746603464699383bdad70f90661661f213cf3f78582c54619c2bf5de2e32e858948271b87c1f6a37d0b40dcbd480a3e7ebe24c0a8beb926cbf14 -EBUILD libeatmydata-130.ebuild 946 BLAKE2B 2f7722041a5d67a58d1a31b8cfb9004f9984b509a5204c14df66ba8e01acafa0dfb0044d5e6644630ae096dadab6168e21528040f26738f187328fe846360a59 SHA512 a694be4e8b2172c38b3152183c8ec4c1f01745d2edbf5fd7d7242f8efae0bb01a7f28656447261766e9789927c765fd15def146702fbdad7a9d9f37d93637bc2 +EBUILD libeatmydata-130.ebuild 943 BLAKE2B ad8fe9386fe35838aba815f8b24d22e631612750d0f9b14ec0bfbabe9dce4a027b28ae38a817f33810687f731f4bb12e3128a85efbdeced97e2156e4e0634386 SHA512 46f166d40c734e48c09f87f2126ad9d9d4afa74b999785b4e3f6512f2bb494fbff6a8ecbea01db8d29067b88e1546e0505c359e90b9b08300281d2c7b96093a2 MISC metadata.xml 511 BLAKE2B 34fcc6f9c449e64c078f8e77d41afed2d5acc2ef4f7eb298f1dd35241520c28452d610b216a5811de0dc6bdc79efef7d8ee31d680547674b5e8fd9f2eb47bb17 SHA512 c58ddfef161abdf2775d9e2f8f7eb4850088bd1a8ddbc2cc6a43c26154b48bb571695f6c439275e66b84af8bff7922aecfeabd8a55839260633de530c4a9205c diff --git a/sys-fs/libeatmydata/libeatmydata-130.ebuild b/sys-fs/libeatmydata/libeatmydata-130.ebuild index 75db11525a1e..70deafe4c9f4 100644 --- a/sys-fs/libeatmydata/libeatmydata-130.ebuild +++ b/sys-fs/libeatmydata/libeatmydata-130.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/stewartsmith/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest index f54fa2ee166d..ce19a60d4895 100644 --- a/sys-fs/lsscsi/Manifest +++ b/sys-fs/lsscsi/Manifest @@ -1,3 +1,3 @@ DIST lsscsi-0.32.tgz 195376 BLAKE2B 8ca0eecd5e0a0a60b9871d955daa05a92e33a8c0c799a0293c58c7882a5c0d9ba06df070ffac8bbce4183e0e5081087cd4b39a6e3c51ff30faac58d0aae67f94 SHA512 96cb87be53eae9fa3a7defa0065f4dee8ccc23805a9ed1dc93d101c5e0610b78765b61449bf6ce58c13de8aae8400e4ac6a60ad64f840d092b9d7293106c5145 -EBUILD lsscsi-0.32.ebuild 343 BLAKE2B 529dc33ad3e3bc6a4b22262950fe910a9ad9231abba6720fad097c65edc57ca17435ef0b0e8fa546dc75bf685bd7c585dffff7fefce4f90e69f5c256520b1147 SHA512 ad3ff177385b3914a97e7b5078df6c7dc7e0194c7c42d056bc31dca76c177498b448e33ebc0be5d08a694deb68ce77cfa675fb0ef0abf2df8cc43d8904a53fca +EBUILD lsscsi-0.32.ebuild 350 BLAKE2B 317760ff1d123e0aa7b68c0716788956c2cb3d692b24de68068f228e9b60373a14da171c223e1ac60334078c09fbec8f46c9e479e43bd180ad03ed8c4261448e SHA512 4e7917d4f4ac9415a7e45e8b84c0fcf7e8a68eaf93b7be474534cac56820d017e8f7ac242acdd0b785299a73a72f2114b5abd440a92bc66cdccab9037fe0ecc5 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/lsscsi/lsscsi-0.32.ebuild b/sys-fs/lsscsi/lsscsi-0.32.ebuild index 87dc5d893180..9a99652c015a 100644 --- a/sys-fs/lsscsi/lsscsi-0.32.ebuild +++ b/sys-fs/lsscsi/lsscsi-0.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 0f636bf8b5ef..ce2807a8684f 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -27,12 +27,15 @@ AUX lvm2-2.03.12-dynamic-static-ldflags.patch 2591 BLAKE2B b1edda6bd715d805ae129 AUX lvm2-2.03.12-static-libm.patch 1000 BLAKE2B 4bde7eda80a00f7c692341ebc74ab30308f3157162caba4d789dac42318fd5a16d6b1471463bc2a1f02f50313ce274ecc5aeb039c90e0b979d73146cc9497fba SHA512 cc7764fdaadd767e88d68a3a071f72a7ce30e5bc98fb55b49cf8ba00c3c5a1cac288f2aad0fec94eba5dd2100108756f1315b9704e872d7d64100bbeff1b7a17 AUX lvm2-2.03.12-static-pkgconfig-libs-2.patch 1260 BLAKE2B 3ee43306af649c4d23ac9b096f0649b48f40416a6e77098e449429e6b8a881a23e8e1158be72ab4c2b5d9bf11dda4b983da1b03d13ec614250d530b57d6d8ec1 SHA512 94704e273c82272fcb3e77da66894204f96bfa28343d3f3edc3aa90aeba6334872bace17c57c64cf35114113cd6d20d628702d1516b7c1296f6ceafd75c5c3b6 AUX lvm2-2.03.14-dm_lvm_rules_no_systemd.patch 1502 BLAKE2B 26cc1f98dd8d286bf74e60ddf02b0658e83a69017743aeaa56ce8a05f6dc03a2322deecaa136713c683882fa85517c9798ce18a2a8de05cd3bbb101cb2ba1c2b SHA512 46bda571f85650d5382f173ad7cce9a055f39e783961bbe8272e2492f4e5ec60f5af231302596a01a4f3ca3cba48b05383a5b0458ab6b85c6d726253f0f45d23 +AUX lvm2-2.03.14-r1-add-fcntl.patch 578 BLAKE2B 7368a1853bdd6fa5aac526a39911b848fb446f14a44700586d6c87974cf898e4290a16335c61d515ea41f1a67de72ce887a227bf3a5fc0af8baafe3a6e8a2af1 SHA512 97d9d00831df2715ccfebf5342aaefac8ae1441eae263af5c1785ab34563a52bfc1aa0870e16bd677c5451889bee647bedff5417920d7dd816b3269b5ae23c77 +AUX lvm2-2.03.14-r1-fopen-to-freopen.patch 1306 BLAKE2B bba58efc587529f30e187c35be97241519d6d31173605bed72aab876500e4cad057d9de9998834581a3d221f1196c466e45aac5ee86d9a3bbbc0d6a2725401f8 SHA512 29c1bac1f669199d1fcb1ec45e3eed593337ad5e09e238cc871b5878fe2ec2e3c07204f48ad939dad2a12c7e523601bfbd6cec4145fc3e1994b85836c4ed02eb +AUX lvm2-2.03.14-r1-mallinfo.patch 665 BLAKE2B 2fdec28a0f889fe8f64b4c134c0b4a86a55a7d2a0dce90f7ed5e314dc89c4b94ec17764aea9307d5b45b89b700e5a89bf905ebdb4b7480d50610b26504cd7c32 SHA512 09ef2e8b3c6019d87e59dce2dcc00bcf243402c92559b38966e800a38ff24028962fcb96bbb1cb22228deb1a2c95ecfc079b1387523799daf477641f43669fec AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a64d4189b8ec5bc783ddb10e6e38033633b9a7049203264f0cd7b6c4b6c999c9767130f5da3526a805ffdb187c7aff98de592c11b35 SHA512 c2bc3b7b92bdfed028703a5bb57873c976978a6c84a409098828b96258b0fa349715bd2f140d6d41cbbacbfc34fc7c7901428e21716e04bfbf2d58847653c34e AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d -EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B b0e8167b45500bfe2e59b8ebedf1de36a12b897776b64e9945084f77049174a7006414072a14ba69738d9dae11ccd8335ca5ed4c7072127380290d4e58c0f8ec SHA512 b3d8fd243c6f00cb89e3e992fdeee7a614512422e07da9c84d4baeb27186d302678334105fb0ef25501a8c8d47e6f76b7ff1f00c77ff3b417a739ba7d8f920d9 -EBUILD lvm2-2.03.14-r1.ebuild 9927 BLAKE2B c4fbf2a105638effcc0f203f31fdfff23f41d7a6ad6754bfdefefaef13595acc1f2262a18fe5f47a35939e9f538e4b3ffb9c0105e39368e980edc1995a92eaea SHA512 0c2da826d111d0331fb096d785f57886bca0517a23dc66f707279a62ab30ab4cd5bdc852bdb0ae52eda04d6967f1b749e33604be70665276ecc26e22e9e5ba66 +EBUILD lvm2-2.02.188-r3.ebuild 10149 BLAKE2B d7a19efe883eb5a8fc0ec8fa7d41de9ace13cd72f3dcad28148471dff8dddc458b68f65d8d0c1b57af9ef647a3e5102db340521b43a81b8a9fdba1f3388868d7 SHA512 dc0deeb6fafa4f59888b3b4061a2375e2621c5cfe1e8ae061c3b516c8bb6a7260cbe6907739bed161baa7f8db3fd113563be22018618b8d88f92673bd46cd55b +EBUILD lvm2-2.03.14-r2.ebuild 10095 BLAKE2B edaaf7652cbb178abd142f06a04125944a26dc15dd54e929f1ff4b95faff34b6a8393bf5ae4db2ba5ab7ab094db020c0be8b8054cff9dc5c2375f00411d18103 SHA512 ea45bc3f47b5464c2240eeef77590bf8be333382f32a85c702f151c58222a3bf8a9aea8a621658c85596378c3730d2f411abbadd5d47d07cd5c4c4abfdff5e26 MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964 diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch new file mode 100644 index 000000000000..1b5524a61405 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.14-r1-add-fcntl.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/712336 +https://bugs.gentoo.org/549506 + +Adds fcntl.h into daemon-server.c to define fcntl and some constants. + +--- + libdaemon/server/daemon-server.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c +index 88905a7..771b021 100644 +--- a/libdaemon/server/daemon-server.c ++++ b/libdaemon/server/daemon-server.c +@@ -28,6 +28,7 @@ + #include <sys/un.h> + #include <unistd.h> + #include <signal.h> ++#include <fcntl.h> + + #include <syslog.h> /* FIXME. For the global closelog(). */ + +-- +2.35.1 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch new file mode 100644 index 000000000000..56248e10e5d6 --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.14-r1-fopen-to-freopen.patch @@ -0,0 +1,43 @@ +In musl stdout, stdin and stderr are read-only unlike in glibc. +This patch changes std* = fopen(...) to freopen(..., std*). + +See: https://www.gnu.org/software/libc/manual/html_node/Standard-Streams.html and https://wiki.gentoo.org/wiki/User:Sam/Musl_porting_notes + +--- + tools/lvmcmdline.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index 1e12bed..19da1e5 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3384,7 +3384,7 @@ static int _check_standard_fds(void) + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && +- !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++ !freopen(_PATH_DEVNULL, "r", stdin)) { + if (err) + perror("stdin stream open"); + else +@@ -3394,7 +3394,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDOUT_FILENO) && +- !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stdout)) { + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -3402,7 +3402,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDERR_FILENO) && +- !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stderr)) { + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; +-- +2.35.1 + diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch b/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch new file mode 100644 index 000000000000..af4cbc0d5aab --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.14-r1-mallinfo.patch @@ -0,0 +1,18 @@ +https://git.alpinelinux.org/aports/tree/main/lvm2/mallinfo.patch + +Patch from Alpine, disables _allocate_memory since mallinfo isn't defined in musl. +19:17 <@sam_> your caution is well-advised, but it should be safe enough given it's only affecting the non-glibc path + +Should be looked back to! + +--- ./lib/mm/memlock.c.orig 2015-03-09 11:18:41.560028850 -0100 ++++ ./lib/mm/memlock.c 2015-03-09 11:19:54.504373309 -0100 +@@ -137,7 +137,7 @@ + + static void _allocate_memory(void) + { +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + void *stack_mem; + struct rlimit limit; + int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild index a3e76755f1d5..50111c5fabb3 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild @@ -210,7 +210,7 @@ src_install() { local inst local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild index f3bc54eebc36..2da81764efe4 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r2.ebuild @@ -70,6 +70,9 @@ PATCHES=( "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 + "${FILESDIR}"/${PN}-2.03.14-r1-add-fcntl.patch + "${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch + "${FILESDIR}"/${PN}-2.03.14-r1-mallinfo.patch ) pkg_setup() { @@ -209,7 +212,7 @@ src_install() { local inst local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest index 6ea99211ab5f..2bdd7610baf5 100644 --- a/sys-fs/lxcfs/Manifest +++ b/sys-fs/lxcfs/Manifest @@ -3,5 +3,7 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf DIST lxcfs-4.0.12.tar.gz 461251 BLAKE2B c0d1cc699461eed2e29ddb1937e8f4719be78a8f17c20b9dd682a617bc0423b22b4491399b934aa7f4be8f5ca292ab4c9e97e7bf149700c0c3760c8b3804ae11 SHA512 da8415599bb08e4e15a7e4044edbcad217e4034d96366d508e06cceb2a75d459e24aeb7efd5716e2f41449ec653ecd9916f0d934f738e1df8e9576738cc1ac18 DIST lxcfs-4.0.12.tar.gz.asc 833 BLAKE2B af8bf08039e7bc1f405c468de0dd628175cef3ea6087c5fa1c0d95f9153df939a84f9a5d9d895fb471c0262616eb88f03532ac789b0c6198ad1349cff9a6c5de SHA512 20f1919ff216f5459e8e387c78b1430b5122e662adec27bdd9c6fd4565645b73ed5bce5e7e843da05d8cfdc17f1a3e964c20c6ad47d4dbd5df68c3f9359fb362 -EBUILD lxcfs-4.0.12.ebuild 1624 BLAKE2B 715f7d3e6dcddbd187116b6f71e62baeb41b71ac8b0d9bb15b7743ba01e4f33a9b8a30349c23011dd5dc3779a693b05f4983f5887eee19cc5b9e02237ff83d5c SHA512 7885a391127c14e7f88acd984284f01261428e372ccebef8eeaa091264bc3be3b0b6b950e3c79a94604c5befa08530c437152d1b07d0b6ea0e0167e1b0f10cd7 +DIST lxcfs-5.0.0_p20220524.tar.gz 101563 BLAKE2B 2bf282aed5490d160a563ae97fdfbb887366a6ec60ea7f36f5400e4a11330c51ac3096d63c99dd4aa2ebe1a3497102af9df41ebd40e38b3bde6c6dcd4265b336 SHA512 c1183096dd2b74ef859183451b8c909f762e3c56dce0b9384ac163a6b6b3f7a17a63e840742f4cc5ac50b1f25d402583ca6cf31c1617754b35e21c5c991515f4 +EBUILD lxcfs-4.0.12.ebuild 1631 BLAKE2B 95bc1a1f7f7780d70e16e3d7eddefec64dacc2ec56d215b31d3c294ac59b81bed8462756bf104a14620446a440236173f7a4cd3d2558638b7e2b09c0c0537d71 SHA512 04851d0246d34ebac4846dbe5174c4de042213b82bc079ccf4709a61c57756a059ee875d975506d8e4a66e83aed738a4a8b731ef9fdd6ebaab03d9596208cca2 +EBUILD lxcfs-5.0.0_p20220524.ebuild 1728 BLAKE2B 0b357a0906f9f7921d99948ce1721d4f6e3e076f3367ed2eae91078c4c71d20611cb49dad2c446675e200dd1e0060b06fbcadf304911145c1aae78f639b665b1 SHA512 67890b74409da3767b9169b727fc895fd4345abc62190414ee4ca3cb22fee4b24cdbe240b2c73162e99d0c0ce18a3eb340d91a6993c794ac6266f8fa898d4fe6 MISC metadata.xml 710 BLAKE2B ac2111d3b67e2aa7286b98e3069e77e3b852f401b56a921795370febd8836434e13cfec4af92cc83a379037023c3d7af475516bea02545595fe9a58a188dcb2f SHA512 f07ff1acbf28cda31d9d962332ecf473197d2868488e7051185ab5ab792f5bb9405712d68e3f9c3b10f38024d2025784b98ce9513e2978f537c26bc7c4d7caab diff --git a/sys-fs/lxcfs/lxcfs-4.0.12.ebuild b/sys-fs/lxcfs/lxcfs-4.0.12.ebuild index bde4889e46c0..62d6d70ca93a 100644 --- a/sys-fs/lxcfs/lxcfs-4.0.12.ebuild +++ b/sys-fs/lxcfs/lxcfs-4.0.12.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz LICENSE="Apache-2.0 LGPL-2+" SLOT="0" -KEYWORDS="amd64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" RDEPEND="sys-fs/fuse:3" DEPEND="${RDEPEND}" diff --git a/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild new file mode 100644 index 000000000000..c9ff5e704ff7 --- /dev/null +++ b/sys-fs/lxcfs/lxcfs-5.0.0_p20220524.ebuild @@ -0,0 +1,77 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake meson python-any-r1 systemd + +MY_COMMIT="18e78f70fa6764be4e4f6fcc6ae8d314da7f3a91" + +DESCRIPTION="FUSE filesystem for LXC" +HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/" +SRC_URI="https://github.com/lxc/lxcfs/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0 LGPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~riscv ~x86" +IUSE="doc test" + +DEPEND="sys-fs/fuse:3" +RDEPEND="${DEPEND}" +BDEPEND="${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/jinja[${PYTHON_USEDEP}] + ') + doc? ( sys-apps/help2man )" + +# Needs some black magic to work inside container/chroot. +RESTRICT="test" + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +python_check_deps() { + python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # Fix python shebangs for python-exec[-native-symlinks], #851480 + local shebangs=($(grep -rl "#!/usr/bin/env python3" || die)) + python_fix_shebang -q ${shebangs[*]} +} + +src_configure() { + local emesonargs=( + $(meson_use doc docs) + $(meson_use test tests) + + -Dfuse-version=3 + -Dinit-script="" + -Dwith-init-script="" + ) + + meson_src_configure +} + +src_test() { + cd "${BUILD_DIR}"/tests || die "failed to change into tests/ directory." + ./main.sh || die +} + +src_install() { + meson_src_install + + newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs + newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs + + # Provide our own service file (copy of upstream) due to paths being different from upstream, + # #728470 + systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service +} diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest index bc3b3b93e7ea..7f6ad9460155 100644 --- a/sys-fs/mac-fdisk/Manifest +++ b/sys-fs/mac-fdisk/Manifest @@ -3,9 +3,12 @@ AUX largerthan2gb.patch 272 BLAKE2B 7bbd9b0fd817430d956d96d89c12b996d8ceec8f0665 AUX mac-fdisk-0.1-headers.patch 2050 BLAKE2B d375f6e4eb9ec940957771047413de4e8b3a99340630804926a24fc0104acde175c6332d06eab6f709d96974c81a3e834408fe8e42be4a1d917e136caca87a00 SHA512 7d16300c02b293de87101e3ef83a8b7778d15123c261d562f0129704b74d0c3d7ca18730c52d37b599ff57c0b70dacd41aeefe99cf235aea4abd4b569e3d601e AUX mac-fdisk-0.1_p16-ppc-inline.patch 863 BLAKE2B 3af665308ee82c2854047a5a80749122e02a3ab75370ff03e1f0322f54977ac9722f81a1a53cf918e0400bf9bc9bd03e9f31732574a22533e9f956eecbe54420 SHA512 40e213b1f0234195eb14450fe9fb326de2401552747af15eb743c0fbedd5f94aebe41245ad6f892a0aa34b6041cad2728530b7c6290731375b4dfe06c0e0102c AUX mac-fdisk-0.1_p16-ppc64.patch 12912 BLAKE2B 39b808d7e69e1ce705e6b8e231a1f0db559863fb2f80cd15bf9a3971c87e4a6c0a06e85dc3726489a4f82493aa7e85da1597c101ea1eed174bd58d3615167d9d SHA512 e521009d628934fe3925085c941d2bb3fba9c3322ccaaa6dd650ecbc6b990056f9bf186adb3a645dc8593efdb44611b69a7b6bf4e87d262870bbb515581e0ef3 +AUX mac-fdisk-0.1_p18-2tb.patch 4865 BLAKE2B 30c4b074c5069cca5e2d9bca1206b728d309b47aec17f5a0b35c7aca8fddbc4417bcce26de2a6e5b3d0baebee0d13ac024ed310eec849a502abe951de51b61b9 SHA512 fd81420d5cd1a6f0ee66735917ce379c256d411b4abd7653815324f581fe5b87ea3426816382fb1f0527c2f954202ccbed906d0f7cf4bacae99123f9e5170781 AUX mac-fdisk-0.1_p18-lseek64.patch 754 BLAKE2B b78d43edba6cf7c1f08eae6e55749c5abe0aedd35dfe8a445e3400235801d0e7d383e954dd3596b3eacfc5672227e7e76e6c1d527019b0c9b1b5a052a7b0e040 SHA512 15eccaa1fe60e7478c6636cdac8bc9f064847b52536c9bb38a9417ef1f1bdedd617f6f9f67bbb9377429c24797595f610da7128ae7dade216936786374e098ec +AUX mac-fdisk-0.1_p18-musl.patch 1473 BLAKE2B 8864b23821de7f270e4d04d0fa256d9a155b104382fa6122c856932b459b957fc367d01ef83a91fe73d053ee3b8162f82be4879d28d8c4d84dca03701e99f036 SHA512 cd68c8759e33077e6688198b0a93d0b265b1cec7fc506bab0e578b932519314e91a981e4c31b7d634984c4bd9d7ae27eb4aa0431359961cc320cdb32a49ee7c8 AUX mac-fdisk-amd64.patch 5154 BLAKE2B c8bbc117df448bc4c1181d9c172bc78dd5b1fd021184be73ecdc41568fcaf73e1daec8183d43f355b4bba876a0399f3dfd2c05173d7c9fee6d8d95068f141633 SHA512 241576f64dd334f98e8c9cb9e0b17b6366e208f2d0af47ddb4659cf2d8e25ca8f44a84d1f7fa2e5f6215f4be42668f43f034074ac981a0d87ca8483505a3623c DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e65207d705f024bb4ba1e181881913fc79cc2bf94c536e0bd2f88f9169d25f2a64c0d1464844a2ebb8e24f1554a61 SHA512 5774e86e1770873cbccb80a79941c6bf917ac1df62f722805b1c4eae0a76b318b3df36ed39ac16d8b051e771603cc42a13feeaadd451343f6a21703e07e58c11 DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120 +EBUILD mac-fdisk-0.1_p18-r1.ebuild 1466 BLAKE2B 1cafcda86243a27c53354da03cb6c7555ec187d7f3796f5bc02645d24f1598ffbc005c0e537cc5411e5cf2c385a43cbbaa5a7fd008437bf4bcee68b968e86d3e SHA512 43cb42079e940fb8e34afc1c65770568da27640e662a2a6509237528d2d8000c335bd9dc68ae52d715ff8ef4a8bdaa23641d4d50a6fac1e98bef8eb1c7bf6e70 EBUILD mac-fdisk-0.1_p18.ebuild 1340 BLAKE2B cec0a9246a4d687a6efe2f1c2b0a631f408ca6cc36ad4efd478e6eb823f81c8fb693dc05c0d47c344aef350f95661929d80009e2725e90ce97cc9a9358fa44ce SHA512 a202db684bda096c32fec303e65b0055dd04921f462c4f55e77b6ee04e343b606a2769fb717f40ef615a369e929077f918ab1b9864c44f7288e13c25dfdf2e5a MISC metadata.xml 249 BLAKE2B 7e06a350422c31f33f36aaf66be928966e03869a64dd89e2cc5ce5eb2ab0700e1a66ab439005ad6a15411db138deb0fdab2dbcbce326cebb4a11bee5e2f78fba SHA512 1f490b62c59b89a97c79ca55dc8fb9af4449788b759ca070099d147f66821f1ecd8956f125800122f5be3ada277e4fd9eb6fdcb30acc41f0f16289ed6df19c49 diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-2tb.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-2tb.patch new file mode 100644 index 000000000000..bb7c4222a4df --- /dev/null +++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-2tb.patch @@ -0,0 +1,164 @@ +grobian@gentoo.org + +not sure what big_pt.patch was tested on, but partitioning a 2TB disk +(Blocks=3907029168) won't work, with a daft warning, and no joy + +upgrade size storage to unsigned long long, so we can store these sizes +tested on a PowerMac G5 with a 2TB SATA drive + + +--- mac-fdisk-0.1.orig/io.c 2022-06-01 19:37:08.000000000 +0200 ++++ mac-fdisk-0.1.orig/io.c 2022-06-01 20:32:12.000000000 +0200 +@@ -85,7 +85,7 @@ + // + // Forward declarations + // +-long get_number(int first_char); ++long long get_number(int first_char); + char* get_string(int eos); + #ifndef __linux__ + int DoTestUnitReady(UInt8 targetID); +@@ -201,9 +205,8 @@ + return 0; + } + +- + int +-get_number_argument(char *prompt, long *number, long default_value) ++get_number_argument_long(char *prompt, long long *number, long long default_value) + { + int c; + int result = 0; +@@ -237,14 +241,22 @@ + return result; + } + ++int ++get_number_argument(char *prompt, long *number, long default_value) ++{ ++ long long retval = (long long)default_value; ++ int ret = get_number_argument_long(prompt, &retval, retval); ++ *number = (long)retval; ++ return ret; ++} + +-long ++long long + get_number(int first_char) + { + register int c; + int base; + int digit; +- int ret_value; ++ long long ret_value; + + if (first_char != '0') { + c = first_char; +--- mac-fdisk-0.1.orig/io.h 1997-01-09 23:31:31.000000000 +0100 ++++ mac-fdisk-0.1.orig/io.h 2022-06-01 20:10:20.000000000 +0200 +@@ -57,6 +57,7 @@ + int get_command(char *prompt, int promptBeforeGet, int *command); + long get_multiplier(long divisor); + int get_number_argument(char *prompt, long *number, long default_value); ++int get_number_argument_long(char *prompt, long long *number, long long default_value); + int get_okay(char *prompt, int default_value); + int get_string_argument(char *prompt, char **string, int reprompt); + int getch(); +--- mac-fdisk-0.1.orig/partition_map.c 2022-06-01 19:37:08.000000000 +0200 ++++ mac-fdisk-0.1.orig/partition_map.c 2022-06-01 20:16:26.000000000 +0200 +@@ -90,7 +90,7 @@ + void coerce_block0(partition_map_header *map); + int contains_driver(partition_map *entry); + void combine_entry(partition_map *entry); +-long compute_device_size(int fd); ++unsigned long long compute_device_size(int fd); + DPME* create_data(const char *name, const char *dptype, u32 base, u32 length); + partition_map_header* create_partition_map(char *name); + void delete_entry(partition_map *entry); +@@ -407,7 +407,7 @@ + int fd; + partition_map_header * map; + DPME *data; +- unsigned long number; ++ unsigned long long number; + #ifdef __linux__ + struct stat info; + #endif +@@ -435,13 +435,14 @@ + map->maximum_in_map = -1; + + number = compute_device_size(fd); +- printf("size of 'device' is %u blocks: ", (unsigned int)number); ++ printf("size of 'device' is %llu blocks: ", number); ++ fflush(NULL); + flush_to_newline(0); +- get_number_argument("what should be the size? ", (long *)&number, number); ++ get_number_argument_long("what should be the size? ", (long long *)&number, (long long)number); + if (number < 4) { + number = 4; + } +- printf("new size of 'device' is %u blocks\n", (unsigned int)number); ++ printf("new size of 'device' is %llu blocks\n", number); + map->media_size = number; + + #ifdef __linux__ +@@ -468,7 +469,7 @@ + data->dpme_signature = DPME_SIGNATURE; + data->dpme_map_entries = 1; + data->dpme_pblock_start = 1; +- data->dpme_pblocks = map->media_size - 1; ++ data->dpme_pblocks = (u32)(map->media_size - 1); + strncpy(data->dpme_name, kFreeName, DPISTRLEN); + strncpy(data->dpme_type, kFreeType, DPISTRLEN); + data->dpme_lblock_start = 0; +@@ -506,7 +507,7 @@ + if (p->sbSig != BLOCK0_SIGNATURE) { + p->sbSig = BLOCK0_SIGNATURE; + p->sbBlkSize = 512; +- p->sbBlkCount = map->media_size; ++ p->sbBlkCount = (u32)map->media_size; + p->sbDevType = 0; + p->sbDevId = 0; + p->sbData = 0; +@@ -573,7 +574,7 @@ + } + // if the map will overflow then punt + if (map->maximum_in_map < 0) { +- limit = map->media_size; ++ limit = (int)map->media_size; + } else { + limit = map->maximum_in_map; + } +@@ -661,7 +662,7 @@ + } + + +-long ++unsigned long long + compute_device_size(int fd) + { + #ifdef TEST_COMPUTE +@@ -753,11 +754,7 @@ + free(data); + } + +- // Add a warning just in case... +- if(x > 0x80000000) +- printf("Warning: Large disks may not work with this tool!\n"); +- +- return (unsigned long) x; ++ return x; + } + + +--- mac-fdisk-0.1.orig/partition_map.h 2022-06-01 19:37:08.000000000 +0200 ++++ mac-fdisk-0.1.orig/partition_map.h 2022-06-01 19:37:49.000000000 +0200 +@@ -47,7 +47,7 @@ + int regular_file; + int blocks_in_map; + int maximum_in_map; +- unsigned long media_size; ++ unsigned long long media_size; + }; + typedef struct partition_map_header partition_map_header; + diff --git a/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-musl.patch b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-musl.patch new file mode 100644 index 000000000000..e99d6f5941d6 --- /dev/null +++ b/sys-fs/mac-fdisk/files/mac-fdisk-0.1_p18-musl.patch @@ -0,0 +1,68 @@ +grobian@gentoo.org + +auto-flush on stdio is really a glibc feature AFAICT, so in order for +musl to get prompts (and make the tool more bearable) just flush right +after writing half a line + +--- mac-fdisk-0.1.orig/io.c 2022-06-01 19:37:08.000000000 +0200 ++++ mac-fdisk-0.1.orig/io.c 2022-06-01 20:32:12.000000000 +0200 +@@ -151,7 +151,8 @@ + int c; + + flush_to_newline(0); +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + + for (;;) { + c = getch(); +@@ -169,7 +170,8 @@ + return 0; + } else { + flush_to_newline(0); +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + } + } + return -1; +@@ -182,7 +184,8 @@ + int c; + + if (promptBeforeGet) { +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + } + for (;;) { + c = getch(); +@@ -192,7 +195,8 @@ + } else if (c == ' ' || c == '\t') { + // skip blanks and tabs + } else if (c == '\n') { +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + } else { + *command = c; + return 1; +@@ -217,7 +220,8 @@ + // skip blanks and tabs + } else if (c == '\n') { + if (default_value < 0) { +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + } else { + ungetch(c); + *number = default_value; +@@ -295,7 +307,8 @@ + // skip blanks and tabs + } else if (c == '\n') { + if (reprompt) { +- printf(prompt); ++ printf("%s", prompt); ++ fflush(NULL); + } else { + ungetch(c); + *string = NULL; diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild new file mode 100644 index 000000000000..dad62e50d2ac --- /dev/null +++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="Mac/PowerMac disk partitioning utility" +HOMEPAGE="ftp://ftp.mklinux.apple.com/pub/Other_Tools/" +SRC_URI=" + mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}.orig.tar.gz + mirror://debian/pool/main/m/mac-fdisk/${PN}_${PV/_p*}-${PV/*_p}.diff.gz +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 -riscv ~x86" + +S=${WORKDIR}/${P/_p*}.orig +PATCHES=( + "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff + "${FILESDIR}"/largerthan2gb.patch + "${FILESDIR}"/${PN}-0.1-headers.patch + # Patch for bug #142737 + "${FILESDIR}"/${PN}-0.1_p16-ppc64.patch + ### Patch for building on amd64 + "${FILESDIR}"/${PN}-amd64.patch + # Patch for large (>550GB disks) + # Note that >=2TB disks may not work due to limitations of the Mac + # Partition Table structure, this needs to be investigated + "${FILESDIR}"/big_pt.patch + "${FILESDIR}"/${PN}-0.1_p16-ppc-inline.patch + "${FILESDIR}"/${PN}-0.1_p18-lseek64.patch + # add support for partitioning 2TB drives + "${FILESDIR}"/${PN}-0.1_p18-2tb.patch + "${FILESDIR}"/${PN}-0.1_p18-musl.patch +) + +src_compile() { + use elibc_musl && append-cppflags -Dloff_t=off_t + emake CC="$(tc-getCC)" +} + +src_install() { + into / + newsbin pdisk mac-fdisk + newsbin fdisk pmac-fdisk + + into /usr + newman mac-fdisk.8.in mac-fdisk.8 + newman pmac-fdisk.8.in pmac-fdisk.8 + + dodoc debian/changelog README HISTORY +} diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 963aea71aa5e..9a47382d636a 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -11,5 +11,5 @@ DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a423 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 EBUILD mdadm-4.1.ebuild 2390 BLAKE2B f087e92607145b9e9235a4da6571d2a691a5f69072cfd40b183422411f4b1c8a41049b8350ff0761c79527afef6ca759e7dcdde42cd7c7bb6620795aef69da7d SHA512 b80d6eec601955155730be28e81fe8b260eeedb3eedc20edd677d5c56fd416ac5b8fac93ecad7047e3e28441437bd3f3b0359de0735933dc9454c31e961d56ea -EBUILD mdadm-4.2-r1.ebuild 2890 BLAKE2B 047a149bf142139bd87c9d1d4a8814c16e1c924424a24964e895784d2bde0ae5f7a2090f0d936900c485e0bce000bd142df6256ba01ce52b0c58754a49b4d847 SHA512 e39329c3358b3c861d91b46eeebccf3af16f4614557bc2fd48abbd53889c1939deee79506176a8498376e57728f24d421580e6d833d980760e0713a27914c449 +EBUILD mdadm-4.2-r1.ebuild 2897 BLAKE2B c284f182a16a728ebe82f3202ed5d3e6347be71707369c4f03efb0e3438135e2914c159cbbef7445e34d573b85e61ea934d64c61e846ef28a55e8764a3b56d61 SHA512 ca5ccaec0cb01afd5ea114b226bf8a19ea0629a9e7ec199fadf723bf8a38cf4e57f4741ce0017148adf1e068d87e3a7fcf6b7c664d8496cb42b8ea1b2cb8a391 MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild index aff2ca081cb7..e6c763fff666 100644 --- a/sys-fs/mdadm/mdadm-4.2-r1.ebuild +++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz LICENSE="GPL-2" SLOT="0" [[ "${PV}" = *_rc* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="static systemd +udev" # Only sys-fs/eudev provides static-libs right now, so if you have systemd, diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest index 9f51fb51668c..71108e572e8f 100644 --- a/sys-fs/mergerfs-tools/Manifest +++ b/sys-fs/mergerfs-tools/Manifest @@ -1,3 +1,3 @@ DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d SHA512 8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50 -EBUILD mergerfs-tools-0_p20210502-r3.ebuild 575 BLAKE2B 1963c4a23051fd02334fb962e06e7a2b6ea074a6ee07d760f9863e33dbdae57ff2e3f958f7dcf34086737fbaac118b64ef20e28fe9f90f409a94a751cd2a711a SHA512 faee9ad3a7e5b8c807f9c610fa762b27a45d9acde7b2e29976849e21e155b8cb438fb9b61e35bcf5e214ce93366ac7d2765c8276754a69816e4e13e625f302d6 +EBUILD mergerfs-tools-0_p20210502-r3.ebuild 613 BLAKE2B c3e9901f71c702b9c8603cd22042d8b832f274a38df6828a1cf432702dfb2be1333cc24e9b4a85198c68f91620503da50ce6f219886acacf2399cde5483a972a SHA512 ccc4cd640a35acf397f5b05238086d2bdba5c7d4e544538b66f486b37bfdaaac8e04aeca315035b56ea5349871c59a05266d0ddd47b8eae5d0dd3fa157e76fb6 MISC metadata.xml 341 BLAKE2B d231499cdadc6ccbb88b9bb76a04a7694ee2798954f7b3329d82b719ddcebb4612029f0a9b720a22226ab359ba15bbd243799755e28ac67a48a20e68e8cc2bf3 SHA512 045a57ae6c3a893a4ad7e007b5165ca864a89dae776b67e17c76dad6f3d8ebfe72d616ea990ef1c0ab64555c2e49d5ecfaf393d7d88a353ce3a1e73448b1ddb9 diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild index b7a3da26a2f9..2827a367ac7d 100644 --- a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild +++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r3.ebuild @@ -16,6 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS}" RDEPEND="${DEPEND}" diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index 1fe1c5cd9ac8..2bcb94a2fc37 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -2,8 +2,10 @@ DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f15 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300 DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7 SHA512 aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0 DIST mergerfs-2.33.4.tar.gz 382872 BLAKE2B fe369f377f731a6323566cf4d5076e9ba7dca302aae1125635433ab93927d3aad5ca57a95e0791742cdf80c7fa69cacdd16a6519593bad9e933e529974bd5d2a SHA512 e8bd0a502c045d6f93d34bce833108deaf1071a3e5c56eb61a59416067230d6e8f19f9b0f8c8aa9fe84060a886afae7509231c97fc6d9537d3ad3390ce342239 +DIST mergerfs-2.33.5.tar.gz 382895 BLAKE2B e45d6d5890046cce495f788924323052effe63ea570061ed1d031595f166c0e680fdbbcf01dd992263550d6c33a04d91a6fabd5c9f97381c5c3e6858c3e1c122 SHA512 9032142285d85e22d2a880a42ae379209d44d12d71adec6388afd43a9fb77675149ec8558bdb1f01de1b511b3d0bf910dd2ccb6f47c918df377d4d5e41368408 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd EBUILD mergerfs-2.33.1.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815 EBUILD mergerfs-2.33.3.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c -EBUILD mergerfs-2.33.4.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c +EBUILD mergerfs-2.33.4.ebuild 1070 BLAKE2B 37bff1091558136fb4cf57cb044ce091563e084d9aed9e7d996bf2854fb088afcba556f52264c7fb96f6cd917085063361636aee4c02277fe77a9d9940afc3ce SHA512 182888f30b44591fe17e9fa8ad57d9f41b508d901ca571b59482a878be2b5a568af6a69fe41f770137e1ec91bd3acb6ac2a7b658f0eeecd181895891b5c85815 +EBUILD mergerfs-2.33.5.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e diff --git a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild index fb2d3b62a41b..a21ae969d856 100644 --- a/sys-fs/mergerfs/mergerfs-2.33.4.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.33.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem" HOMEPAGE="https://github.com/trapexit/mergerfs" SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" # Vendorized libfuse that's bundled is under LGPL-2.1. LICENSE="ISC LGPL-2.1" diff --git a/sys-fs/mergerfs/mergerfs-2.33.5.ebuild b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild new file mode 100644 index 000000000000..fb2d3b62a41b --- /dev/null +++ b/sys-fs/mergerfs/mergerfs-2.33.5.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A featureful union filesystem" +HOMEPAGE="https://github.com/trapexit/mergerfs" + +SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" + +# Vendorized libfuse that's bundled is under LGPL-2.1. +LICENSE="ISC LGPL-2.1" +SLOT="0" +IUSE="+xattr" + +DEPEND=" + xattr? ( sys-apps/attr ) +" + +RDEPEND="${DEPEND}" + +BDEPEND="sys-devel/gettext" + +src_prepare() { + default + + # Hand made build system at it's finest. + echo -e "#!/bin/sh\ntrue" >tools/update-version || die + echo "#pragma once" >src/version.hpp || die + echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die + + if ! use xattr; then + sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die + fi +} + +src_compile() { + # https://bugs.gentoo.org/725978 + tc-export AR CC CXX + + default +} + +src_install() { + dobin build/mergerfs + dosym mergerfs /usr/bin/mount.mergerfs + dodoc README.md + doman man/mergerfs.1 +} diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 6503a8deefd7..a2f60cafec75 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,5 +1,5 @@ -DIST mtools-4.0.37.tar.bz2 441076 BLAKE2B a84ff9e532a1896706589dfe7e62b1e400baf0ab9b86cc3d4a09bd4a0a24d1e86f504b9005c98765f62d735d227d0a1d5ab78354c587c88e2d42a4146d127dc1 SHA512 5ff4da9050dd5d5c0929dd9977866086085bd8fef577f3c6ce2ed6fb958eec2304db612c0766e6be1a048819e29f62023cb0f0a9464a84ed7cc21de9561fadce DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4 -EBUILD mtools-4.0.37.ebuild 1060 BLAKE2B caeed9304847d8a1d33982f3a406a9e089885df0b726ec0b87059e691548126f2aceabf518d6819c7c7ed56fe654f7b8ebd39b4962bcfadcc900afda233a9b3f SHA512 06ad2c7dd3ad0de7758a96e20fca19987f96e1d1dab02bcda2654d0a429c4f48614eaa911167fa3ee2c8fbcac8d66f0f822a0bc18b9177c1704573c64a299558 -EBUILD mtools-4.0.39.ebuild 1074 BLAKE2B e64c1d524462048edc6b11988a04c937620758ae4210492c4f709670dc0ce198d18937e7e129b4c4fb1dd3e980d6e5ca0dda62cf4f5fa2899029782691051f89 SHA512 8e60f098760b665d884f091b91a7cee31f774cfe86b0288d2a1f454f9f1fc34b65c79d7c14ecb0370ff9f3c6c5c3f7f640a7621fa5af8d04efe67e7e793401ec +DIST mtools-4.0.40.tar.bz2 447038 BLAKE2B 6ae2dbd2129d48528f6a36f81f44979b2dd977729e3f3f0ab5ff4aa8d29b0841cd770e2ed12f0f772676f6bcfeb3949d4fb79e240cf1d88524bbaa6cdfb4d26e SHA512 c3acf8723ae207d9eccdca3c2b55aed262175328417031397c14c7120a1e02f0c52c7fefc0145dfb09fb91f1d3e63254e7a45bc7edf50b1ecc87b7cc95d2f390 +EBUILD mtools-4.0.39.ebuild 1067 BLAKE2B 2201d21726df7847dd3f9d8d531109c58a47d0282da4c63bdd11870f333bf220895aa3fb63a5f1c8d66624e22dc96c7e7819b240fc99cd0abf912ca38d47169e SHA512 708e4ed394adcc07965530f736cd5b80033f28563a596a1ccdb798af5fb1eaa41ca4e9f72ffe06a88654400a869358dfdbaf76985403d0edc99b9c5ffa4e64e1 +EBUILD mtools-4.0.40.ebuild 1075 BLAKE2B 5e90fbbc3f74ff90370fa0ceed911b7dee1b1d75b28ffa7001de830010e79bee56ea5818ec5d4e23ddeedbd681139015b703c166739b24fcf90ee5f3a54f2bfa SHA512 248a71d078587f2404a02cc71940a7ed9aaa90f2779fdd6eedc885fff7b117cac821c9b794ff1ffb83dd7511c2e9bfcdf2b9b79e81ecd477a69596ca3330e022 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/mtools-4.0.39.ebuild b/sys-fs/mtools/mtools-4.0.39.ebuild index dc740ca0249c..96ceda73398b 100644 --- a/sys-fs/mtools/mtools-4.0.39.ebuild +++ b/sys-fs/mtools/mtools-4.0.39.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 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos ~x64-solaris" IUSE="X" RDEPEND="!elibc_glibc? ( virtual/libiconv ) diff --git a/sys-fs/mtools/mtools-4.0.37.ebuild b/sys-fs/mtools/mtools-4.0.40.ebuild index 1b4c09b1ccb3..baaf64974625 100644 --- a/sys-fs/mtools/mtools-4.0.37.ebuild +++ b/sys-fs/mtools/mtools-4.0.40.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 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris" IUSE="X" RDEPEND="!elibc_glibc? ( virtual/libiconv ) @@ -40,6 +40,7 @@ src_configure() { src_install() { local -a DOCS=( README* Release.notes ) + default insinto /etc/mtools diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 6cc08c447838..1862aea46bec 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -1,15 +1,6 @@ -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-tools-0.8.7-respect-flags.patch 693 BLAKE2B 298948ad60635be15ae8b83eb0e43e46a8055b22ac351b317c435ff20728e37dd6d371eb0898c5d764490affa7b8dc878faacb2d3084ff3aa49cc102341774d5 SHA512 03573d907ef34e610e9b4e993640ab2b44be52f0b335390435cdc3d33351c5e378c421eeae0706e62000e9f1d95b118afd5a17292e0a1051c680c717b1b9b0bd 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 -DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd -DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483 SHA512 662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6 -DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f SHA512 f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530ef9999d21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969 DIST multipath-tools-0.8.9.tar.gz 534866 BLAKE2B b5ebf3c393f6b60e85678ac07378ae07056b6777409fc1bc4f4133cdd3f8c75a3d76f6e9342208df7fed8fe7812b089eba8f6b769e47e1dd6c8b7fd321bdbd30 SHA512 25f2a5d436af6a343804988cef45ca1574d4a981655a2b91563ddb89138619158befdf5af92d836a17c95d6dcf901072b614473c2129274e5dcdb1a1d64edb4d -EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805 -EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904 -EBUILD multipath-tools-0.8.8.ebuild 2255 BLAKE2B 37fede21aa5acc7ccb2bb0a30b1643b5961a50d729cdaee83a3c335d4f25c4f67cd9c5d7f2953eac2b58e529aee1e5f35276570e33f33c9b9fc99838bd8787eb SHA512 7f0c5d91cd0a7826d34292d5015fa9dc6423062a4bdf7e90667cbe33ad6ece7c47c6bd543a96bc511466adf3ab10906268b4d5a0f78925f02764a03b6dea2188 -EBUILD multipath-tools-0.8.9.ebuild 2084 BLAKE2B aa64be707501daeab5f89a41aa807ea948ca7ddf1b3d5d4a11d164f3566059552085815cc1485c7d42e90bd12a80754f91763839bb820944f92a7348da12f2b0 SHA512 929dad1d29765a0971ae69dd528fb6f042447231a2e421638d229869cd081f42b1b5b907c3e5c958df7a0711e6f402839e63d3279a14204f73b2937b0ad3e459 +EBUILD multipath-tools-0.8.9.ebuild 2091 BLAKE2B e6fa02e23e152cb1eb730ecf3f8714d75aa391daf48f8a55350780d711ef7239a6dd2aeda1dd4ede09024cdbe4f12d61b22be3d00094482a24318ecc2f1147de SHA512 9aa9722d0fd8927c09b4f1a631f5bdbc2a14d8bdf72fdbfe53da3a74cd7f6a7623d098534fb093e236d694c1a5594d611ffbc94879a4ecd6e046d823bb7830eb MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch deleted file mode 100644 index 20d9fef6f3f1..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- multipath-tools-0.8.5-eecfcba/Makefile.inc -+++ multipath-tools-0.8.5-eecfcba/Makefile.inc -@@ -98,7 +98,8 @@ - -Werror=implicit-function-declaration -Werror=format-security \ - $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) - CPPFLAGS := -Wp,-D_FORTIFY_SOURCE=2 --CFLAGS := --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \ -+CFLAGS ?= $(OPTFLAGS) $(WARNFLAGS) -pipe -+CFLAGS += --std=gnu99 \ - -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \ - -MMD -MP - BIN_CFLAGS = -fPIE -DPIE 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 deleted file mode 100644 index d8521436d955..000000000000 --- a/sys-fs/multipath-tools/files/multipath-tools-0.8.6-no-compress-man-pages.patch +++ /dev/null @@ -1,226 +0,0 @@ -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/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild deleted file mode 100644 index e8862ae67790..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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/multipath-tools/multipath-tools-0.8.7.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild deleted file mode 100644 index 35caf3b69f5b..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.8.7.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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.7-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() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - 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/multipath-tools/multipath-tools-0.8.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild deleted file mode 100644 index f0a18e273bed..000000000000 --- a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 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" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-no-compress-man-pages.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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.7-respect-flags.patch - "${WORKDIR}"/${PN}-0.8.8-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() { - tc-export CC - - # LIBDM_API_FLUSH involves grepping files in /usr/include, - # so force the test to go the way we want #411337. - emake \ - 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/multipath-tools/multipath-tools-0.8.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild index 55bb66af418a..4d67993c2e86 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.8.9.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86" IUSE="systemd rbd test" RESTRICT="!test? ( test )" diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest index c0ac41a190ff..0feeef23387f 100644 --- a/sys-fs/ncdu/Manifest +++ b/sys-fs/ncdu/Manifest @@ -1,5 +1,7 @@ -DIST ncdu-1.15.1.tar.gz 148242 BLAKE2B c49fc706c852f081256437bcb566d0dd4cc34682693186dd84321f4c6831ac982206d59b15f3afa7a2cb25d4affcce7ff84fcc0bf922558241df1ac13212ec7a SHA512 572379264b9bd0d782151bd2f79add0e7a6d092029a041ff8f9288e928a4b6a6733467bca7c1702cbb44c3861279da1bc3d4278df6fba1814fe1dc909f2d8087 DIST ncdu-1.16.tar.gz 149705 BLAKE2B 61d004581bdcf1885bec24d0a1de4fc890fe91bba511abbdbc507a48f31946caf5c7324979e8410e53cfca8ada1b20342b737dc4e8b1f034f2fca5aea84e4369 SHA512 ac8b7e573332e4e006bf743224096b697517b6899744f189ea5a31665c1ef5e50c7fdaaa0a50a8d7bc3d471656f1f1c6681c21368bdaf983257d8cc311a0dfd0 -EBUILD ncdu-1.15.1-r1.ebuild 434 BLAKE2B f25cfd209692d138a2c192f68b459c51c8c8b670888d6778a6291bea02530f62ae744b5317d5da9f28387c3f0af993302b6e2cc7f1374a349ed812c803f78c9f SHA512 ea403df7b180959ad2dc8494b48caa8f521b30f8976bf6e00b5b2f6eb6fa89c6df53e65f332be1c4eb59512eaed14587b22597f96fc071d1823929fff4c27ef7 -EBUILD ncdu-1.16-r1.ebuild 444 BLAKE2B 3023c33a6618e88beaa816a1b89c27350412b8b0ee8095267d1778af069b45df1f60d13054b28bcb549b934e673c86313f84d904903997e0c658ebd75fceee85 SHA512 8c830b4e8a6b1b07efdeaadf766cf9b5bf369d1dab3311be8102b101ddab503e8f9a36883087a973612d514174b570fdb591ca2cabed55e2bcf3ff9e959367f2 -MISC metadata.xml 590 BLAKE2B 48e8d13bb3cf7b8b48ee9375ff52dba38332bf53f021cd6c0250695065b8ac88e1477b7e04c2dd910d36c7b0b806dd755c40e12cbbaaca38c60bfdb67fbffa5f SHA512 f61228bf93131934f06760c02dab258b11b6b160c666c869e928856c1e170e6efb0381fd591cfec9cb3dc8cf89f604cc9fb5ae7309bde2fa08be16c8d9d59a32 +DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775 +DIST ncdu-2.1.2.tar.gz 52702 BLAKE2B fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b SHA512 ff48f2b9625e1aba29e5598051d16c4b5dc1a634fab897709226dd69d3b48031e6e62527c8514ec4753874d2d96800e538d6ad90b4a5f9851410d10579ccc67c +EBUILD ncdu-1.16-r1.ebuild 445 BLAKE2B 53d7e94ca856f02bb8ff43337af1d1cadb2305ac51ae951e87874e3690a3ae879f1c108d4f4eb0f7457f9efd563fbb306b9f0712e0af34434d685322fceaa91a SHA512 86af935194544b68c66afbebfdb65acdd63ffd0c951bd072c016409922cb8bc007618603c3ba6832f4ee1b45cf7d95f801a6d17f4a7a1f848183ac5a1f75da0a +EBUILD ncdu-1.17.ebuild 449 BLAKE2B 1b4b5e5d012dd10ddd3748fa5e8a90e9e4ab71284fa937b98ceec87261b0d8ecdbb4bed489e62b277b9157f289b1eb61702bfd27e6c3280fc9a6e65b4c82fd72 SHA512 12847d2a0a0f4d5a54e1af059261ddbca9cf8439c30d728190cfafdfbbbb34df3936a002224d956fecb50c1106d0f2ba07a933010210d915f1a0c3047114a034 +EBUILD ncdu-2.1.2.ebuild 662 BLAKE2B 91b366a8d7209bae4f2dec2692f64e633e5e8b2cbb384ac6c7a13fbced47a32b6141521a8d7845ba521b0ba2aebc9c9b568ec8b0659d46528296793c22d36340 SHA512 374743c4dd8c775d4e59730df850d03c5a57d09e007c2e64465be4bf5fb57dc8d0e426e82aa008ef9b67289e4472a234af6b88f7f1c99a5dee02ad10af1b4370 +MISC metadata.xml 586 BLAKE2B 37590076001edf71b7f6eabdecd8b53fe9bf40401db2dcd6b2710f448dd2f7f0ef4ff7f8af8e15a6cce1c9f13e1861338baf219d477810ef0a85d3cce4fb08e2 SHA512 5d0f342d74634927f240a079e33beabac800db525859a65fda2328e821d1e58ee50a634783d3b1507c3748449ed15a966109373d44f8fc98af6929e75ffa2a67 diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml index ece644aaab86..c3151420b3a4 100644 --- a/sys-fs/ncdu/metadata.xml +++ b/sys-fs/ncdu/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>whissi@gentoo.org</email> - <name>Thomas Deutschmann</name> + <email>jsmolic@gentoo.org</email> + <name>Jakov Smolić</name> </maintainer> <longdescription> As the name already suggests, ncdu is an NCurses version of the famous old 'du' diff --git a/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild b/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild deleted file mode 100644 index 748704d358b5..000000000000 --- a/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu/" -SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos" - -RDEPEND=" - sys-libs/ncurses:=[unicode(+)] -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" diff --git a/sys-fs/ncdu/ncdu-1.16-r1.ebuild b/sys-fs/ncdu/ncdu-1.16-r1.ebuild index 22076a152350..ec9c548bfd36 100644 --- a/sys-fs/ncdu/ncdu-1.16-r1.ebuild +++ b/sys-fs/ncdu/ncdu-1.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" @@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos" BDEPEND="virtual/pkgconfig" diff --git a/sys-fs/ncdu/ncdu-1.17.ebuild b/sys-fs/ncdu/ncdu-1.17.ebuild new file mode 100644 index 000000000000..4c3e4b6681eb --- /dev/null +++ b/sys-fs/ncdu/ncdu-1.17.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="NCurses Disk Usage" +HOMEPAGE="https://dev.yorhel.nl/ncdu/" +SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND="sys-libs/ncurses:=[unicode(+)]" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" diff --git a/sys-fs/ncdu/ncdu-2.1.2.ebuild b/sys-fs/ncdu/ncdu-2.1.2.ebuild new file mode 100644 index 000000000000..e755f1d265d0 --- /dev/null +++ b/sys-fs/ncdu/ncdu-2.1.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="NCurses Disk Usage" +HOMEPAGE="https://dev.yorhel.nl/ncdu/" +SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="sys-libs/ncurses:=[unicode(+)]" +RDEPEND="${DEPEND}" +BDEPEND=" + ~dev-lang/zig-0.9.1 + virtual/pkgconfig +" + +# see https://github.com/ziglang/zig/issues/3382 +# For now, Zig doesn't support CFLAGS/LDFLAGS/etc. +QA_FLAGS_IGNORED="/usr/bin/ncdu" + +src_test() { + zig build test || die "Tests failed" +} + +src_install() { + emake PREFIX="${ED}"/usr install + + dodoc README.md ChangeLog +} diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest index 5aae06ad9cd1..7070ea8be0cd 100644 --- a/sys-fs/ntfs3g/Manifest +++ b/sys-fs/ntfs3g/Manifest @@ -1,3 +1,3 @@ -DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d -EBUILD ntfs3g-2021.8.22-r4.ebuild 1999 BLAKE2B 32a26db6f373104aef8efe5a33e03bc997ef4b99143c2f1d8a196765b598454387c116aa8c63dd62597e2cc47f50a837f64c3e3f57044eb0b61906250bf80714 SHA512 194ea31463922cd64a96cd6f424f39d19859452c31a4ae0557fadf0a301a021e279dc68113f7a10cee547ec3c9b91e2778188201bbdba26827296110f9d69ff7 +DIST ntfs-3g_ntfsprogs-2022.5.17.tgz 1318476 BLAKE2B 0f3d5b3ca6186886b1a4f1fc59242a1f4ccdc842cbe53b0869f707c1dbebdd58058d40b265dae663b71a2a611f7ce5392c63afa3053dc075155759c10499d529 SHA512 25e6d3412958576b0cd614f5d93201c0d7e8bbee78fbaf956718a3825c1435b3f0c3631ea1cc60b5b1be6e9ae7d58c0c03b0bebb69edee3bf181a966734336df +EBUILD ntfs3g-2022.5.17.ebuild 2006 BLAKE2B 44312725439784318f5f4bee38f610668068633b0675146c7d7a34922dc9e6f51ec9c1fa1ce898d874eb4affb7577a3cc540505a9b498dfa401ed10e9842181f SHA512 d65b6c6adb5894c52945ff3bd4f177247d09e54172b1f8fb7d35e317b8a6ea33fd2c12a9d6cb9da1077d60df76315f7a2232868fd6f8cf7120859e165171a471 MISC metadata.xml 1164 BLAKE2B 276dcf2d0cccad4b91a84390949ff8a81b76e54c22d7bfbe4b778c97917224f3d0603079fb74e4b3ff0e058580f4ac6540aef3bae4fdc6ae9b2fb54b831e22ea SHA512 63391014c4dc8ba722c8f90d6fe1952b5f4386d44b1bb2af195e907e5027ede0f4063e4390679b6b521b892fcc12194914b4f40a09c6bc08a300a90bdd250390 diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild b/sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild index 3ee5db1efeb5..63ccf4800e83 100644 --- a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild @@ -1,7 +1,7 @@ # Copyright 2006-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" LICENSE="GPL-2" # The subslot matches the SONAME major #. SLOT="0/89" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr" RDEPEND=" diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index bdcf0ad463f0..bf658c32885a 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -5,6 +5,6 @@ DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6d DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164 EBUILD udev-249.6-r2.ebuild 7917 BLAKE2B 8b48f9aa00ca2eddd0aa921d4adda3e8e506d0a895753ca9e6c64037f3cefb7b0a65c62e370a9064e3f2668524e21ac89bec18907b7e575cdab16791ca997726 SHA512 238b0daa2283b89b0b6c970e53c677073b851c1672fea1734393cd00e7a30af6ac0084583f41af733cf848101a3c091b1d0cfaff375d9a4910896177100fab0f EBUILD udev-249.9.ebuild 7967 BLAKE2B a614c5ca69ad160379683911434291bb6ffa8e1ff57d965e33564a1d8f8ee3093af5ea59c5fc393faa0c352d275b3025f14a6ff557d55aa22d377f4e2642ebb4 SHA512 e78178c206def095cd392c5952b74cc3f4d869cc8683dc8ee6fb09a188d8c3cda370a968113a3ea9a89591ff729e622acabefd78574703caf0ff29cc568a05ee -EBUILD udev-250.ebuild 418 BLAKE2B 2eaf0219c33be1eed4c4e9117130a9e1058c503f7c25f610e29461128a6bc39790910339c0a265dc4476a59e2a4aa2a7601ff9badbacf7f0e52b2e147d0a945b SHA512 017a8bd1f702ec6df58b1ed16121a0120b10bd0f636e62cc3bbf7a2376e3912545f31e815a7c6b0da9acbb487430237a6ca669bed58de15dfed58aab63af87e6 +EBUILD udev-250.ebuild 410 BLAKE2B e1d24e35d35e1fd5ae49e13841fa483bfea9b94a6af51882ed5997953fde903dbcba1fca481c3cb1afab7082edf53293a8ceed1b7600ede0235a7770a2a60f7d SHA512 6bbd60f947936b0cd154b2aa686773919ab46e1cc7724f01694f0f98e7731767616c6a11f92a1e447bd2f1ea59266d4e846ff81a52cedf9a153bff169901ba45 EBUILD udev-9999.ebuild 7921 BLAKE2B 6005fae7b9012a23f0a6c398d0381f725bf9afdb7469397ba887b37b290f3686c0f6dd5f9925b221d3d3fc333efd37fe5fa7d069c0635c1eb630ce78903b9ccc SHA512 8d55530628495ff6566575d0942380db6512cf307d74141c3af8a1738b30d8f34a20fc1d56161779a5654045929984d76b233aa499ac5e583ef93bc5c69ccdfc MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e diff --git a/sys-fs/udev/udev-250.ebuild b/sys-fs/udev/udev-250.ebuild index 0a984b4284a1..66b7f56ddb04 100644 --- a/sys-fs/udev/udev-250.ebuild +++ b/sys-fs/udev/udev-250.ebuild @@ -10,6 +10,6 @@ HOMEPAGE="https://systemd.io/" LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND="sys-apps/systemd-utils[udev,${MULTILIB_USEDEP}]" diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest index ace68ee5038a..8e1c7ee50d54 100644 --- a/sys-fs/udisks/Manifest +++ b/sys-fs/udisks/Manifest @@ -1,6 +1,4 @@ -AUX udisks-2.9.4-undefined.patch 1330 BLAKE2B b8ac0d5b7944f9ef6312472009720fa096209bcd912ddf8d43b6fc8ba9b0c6ae5e93701fd320fd008d73ae0f4cd348ffbded76d9c63c356230a440792191e60b SHA512 c4ab8c083d95fa1f3d6dfa8f1dddb7dd1ce04c42d40314d1ef32148aaf3f8454c9a09b9c3bfd000a07af9a692d4a95ede43e9c650d7b28134debe62570e772f6 -DIST udisks-2.9.3.tar.bz2 1778637 BLAKE2B 77352e2beb081486586587e3d7bdc5047662b27a246424bb995188c9da784e464681d9307dd0c4ca22a21da66d04dbdc9c945cc926b219a80682acfa60de04fe SHA512 1ee6e982e599c6872183068dd64f9259a522dea7a91ddc3119f9bc436c9c6bf2911e61f7ae339d67d4851cb6f55ec05b6d9a4cc8c1a9f7c5d35c66b80d5ada42 +AUX udisks-2.9.4-undefined.patch 6251 BLAKE2B 1c2eb5b5448686dcd343fd582e5e79ecb38bbfae4108a56c5b27de9c446a49b7ec1e22f7f55778f7ace7f309b4d2bb7bae99932411917abbefbc58b62fd7dae0 SHA512 103cf151084dd239baa40554cfc2396281e478d8ca9e73c848cd4af42716d7677a50a7dd1b18d8a84a3f97210c695f392ea3556104ed03b50640d0cca96303cd DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5 -EBUILD udisks-2.9.3.ebuild 3645 BLAKE2B 580c9a49011e943f5a43f192fc40e6198149b90e19d2afe332163d6f932e90b25e4f8753fed3bbbc1dcacef956cf51eb35ffab376ad03e40476fc60ffba0af1c SHA512 e017cf2556064678567cf4556baeb56bbfbc5b3d9d3ce070c6f3ecf3ff6672029053f6ae48e6bd8193e9557901327b428a00b1b1ed9f6449e3ca337e9602638a -EBUILD udisks-2.9.4.ebuild 3753 BLAKE2B 361c1d5a03298570a4abf9c324ac667c1a890d514482cb8271cfb5e21ad7b9b8b4eb6d6a625dd77569e47ffc10bc3c64da4efd0759a578761a0fe8f102cca7b2 SHA512 dd93ba3c032fd1a527535c8329b221bfa4870f7fb8f1dbf299b58bbb97e9ba1ba84fa0f68829e1cd481d8502ddeb44f860695b5ed6edab633b67db6fb9f29d0c +EBUILD udisks-2.9.4.ebuild 3774 BLAKE2B 6fdbaaa4ad15b14f39b294419de2268d2cfc0d90a5502c6370085a6cb2190b99bd480d9edf949af2f0f5a37912dfce7f623f8b596ad47aaa2a752d35ccac26de SHA512 452f37db3b4760210c4128904160e375b62b0afe5dce878395b09227035116b5cb3199a8ec9d1b94bdfb0cd39b4705dd16fa0e9e1b80a6d98ea0cef4b5a239d4 MISC metadata.xml 729 BLAKE2B 21d1e33721c8a7abd2975d78821962dbc8c94f5f51458e02d405a44951ca76571bc37122ca996c52dbeada744cb660920a5d8205b1d3085dbc2d7c3966afb22e SHA512 020c530139c38d3d984a49a3aae799fb417e84523b3d927792844bcc11471e7d23a694db6cc75b6b6f6682a36c996cb3b011da5228c54cc0cf8b62e65c1f6671 diff --git a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch index f87e145e82aa..271a5271e3c9 100644 --- a/sys-fs/udisks/files/udisks-2.9.4-undefined.patch +++ b/sys-fs/udisks/files/udisks-2.9.4-undefined.patch @@ -1,8 +1,12 @@ Upstream-PR: https://github.com/storaged-project/udisks/pull/978 +Upstream-PR: https://github.com/storaged-project/udisks/pull/979 +Upstream-Commit: 362cc8f1613193f8e68d13a416421bb36fd7f713 +Upstream-Commit: 6cbce6602ce447127cb4f77706870b6706bf1c5f +Upstream-Commit: 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97 From 362cc8f1613193f8e68d13a416421bb36fd7f713 Mon Sep 17 00:00:00 2001 From: orbea <orbea@riseup.net> Date: Tue, 10 May 2022 09:29:10 -0700 -Subject: [PATCH] modules/btrfs: Add missing dependency +Subject: [PATCH 1/3] modules/btrfs: Add missing dependency When building udisks with --enable-btrfs using slibtool instead of GNU libtool the build will fail with undefined references. @@ -28,3 +32,112 @@ index ac8c941849..f96cd16186 100644 $(GLIB_LIBS) \ $(GIO_LIBS) \ $(GUDEV_LIBS) \ + +From 6cbce6602ce447127cb4f77706870b6706bf1c5f Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 11 May 2022 07:55:13 -0700 +Subject: [PATCH 2/3] modules/bcache: Add missing dependency + +--- + modules/bcache/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/bcache/Makefile.am b/modules/bcache/Makefile.am +index 571541a6d4..7509205ba2 100644 +--- a/modules/bcache/Makefile.am ++++ b/modules/bcache/Makefile.am +@@ -71,6 +71,7 @@ libudisks2_bcache_la_LDFLAGS = \ + $(NULL) + + libudisks2_bcache_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ + +From 97bb17425e52ee6b2f11b13b3764d0dd6e8cfc97 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 11 May 2022 07:55:25 -0700 +Subject: [PATCH 3/3] modules/lvm2: Add missing dependency + +--- + modules/lvm2/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 3342ad8e9b..67b8aa6b3f 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -76,6 +76,7 @@ libudisks2_lvm2_la_LDFLAGS = \ + $(NULL) + + libudisks2_lvm2_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ +From 663f8194eeac75ec26fbfbd8855c5873315c495c Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Fri, 13 May 2022 17:04:52 +0200 +Subject: [PATCH 1/3] modules/iscsi: Add missing linker dependency + +--- + modules/iscsi/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/iscsi/Makefile.am b/modules/iscsi/Makefile.am +index 05af5ece29..2cecc300e9 100644 +--- a/modules/iscsi/Makefile.am ++++ b/modules/iscsi/Makefile.am +@@ -77,6 +77,7 @@ libudisks2_iscsi_la_LDFLAGS = \ + $(NULL) + + libudisks2_iscsi_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ + +From 8ff2214d740f9819d6ede02534d7d0f23d6a3818 Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Fri, 13 May 2022 17:05:26 +0200 +Subject: [PATCH 2/3] modules/lsm: Add missing linker dependency + +--- + modules/lsm/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/lsm/Makefile.am b/modules/lsm/Makefile.am +index 2193115417..b77a9013fa 100644 +--- a/modules/lsm/Makefile.am ++++ b/modules/lsm/Makefile.am +@@ -71,6 +71,7 @@ libudisks2_lsm_la_LDFLAGS = \ + $(NULL) + + libudisks2_lsm_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ + +From 4f59e7fd5b9ad94091230713c28f6a818269d48c Mon Sep 17 00:00:00 2001 +From: Tomas Bzatek <tbzatek@redhat.com> +Date: Fri, 13 May 2022 17:05:43 +0200 +Subject: [PATCH 3/3] modules/zram: Add missing linker dependency + +--- + modules/zram/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/modules/zram/Makefile.am b/modules/zram/Makefile.am +index 9e5e9a6315..40f929583d 100644 +--- a/modules/zram/Makefile.am ++++ b/modules/zram/Makefile.am +@@ -78,6 +78,7 @@ libudisks2_zram_la_LDFLAGS = \ + $(NULL) + + libudisks2_zram_la_LIBADD = \ ++ $(top_builddir)/src/libudisks-daemon.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GUDEV_LIBS) \ diff --git a/sys-fs/udisks/udisks-2.9.3.ebuild b/sys-fs/udisks/udisks-2.9.3.ebuild deleted file mode 100644 index 3112d930e977..000000000000 --- a/sys-fs/udisks/udisks-2.9.3.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils - -DESCRIPTION="Daemon providing interfaces to work with storage devices" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" -SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-2+ GPL-2+" -SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86" -IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" - -REQUIRED_USE=" - ?? ( elogind systemd ) - elogind? ( daemon ) - systemd? ( daemon ) - zram? ( systemd ) -" - -# See configure.ac file for the required min version -BLOCKDEV_MIN_VER="2.25" - -COMMON_DEPEND=" - >=sys-auth/polkit-0.114 - >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[cryptsetup,lvm?,vdo?] - virtual/udev - acl? ( virtual/acl ) - daemon? ( - >=dev-libs/glib-2.50:2 - >=dev-libs/libatasmart-0.19 - >=dev-libs/libgudev-165:= - ) - elogind? ( >=sys-auth/elogind-219 ) - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - lvm? ( sys-fs/lvm2 ) - systemd? ( >=sys-apps/systemd-209 ) - zram? ( >=sys-libs/libblockdev-${BLOCKDEV_MIN_VER}[kbd] ) -" -# util-linux -> mount, umount, swapon, swapoff (see also #403073) -RDEPEND="${COMMON_DEPEND} - >=sys-block/parted-3 - >=sys-apps/util-linux-2.30 - selinux? ( sec-policy/selinux-devicekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.1 -" -BDEPEND=" - app-text/docbook-xsl-stylesheets - >=dev-util/gdbus-codegen-2.32 - >=dev-util/gtk-doc-am-1.3 - virtual/pkgconfig - nls? ( >=sys-devel/gettext-0.19.8 ) -" -# If adding a eautoreconf, then these might be needed at buildtime: -# dev-libs/gobject-introspection-common -# sys-devel/autoconf-archive - -DOCS=( AUTHORS HACKING NEWS README.md ) - -pkg_setup() { - # Listing only major arch's here to avoid tracking kernel's defconfig - if use amd64 || use arm || use ppc || use ppc64 || use x86; then - CONFIG_CHECK="~!IDE" #319829 - CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377 - CONFIG_CHECK+=" ~NLS_UTF8" #425562 - kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278 - linux-info_pkg_setup - fi -} - -src_prepare() { - xdg_environment_reset - default - - if ! use systemd ; then - sed -i -e 's:libsystemd-login:&disable:' configure || die - fi -} - -src_configure() { - local myeconfargs=( - --enable-btrfs - --disable-gtk-doc - --disable-static - --localstatedir="${EPREFIX}"/var - --with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html - --with-modprobedir="${EPREFIX}"/lib/modprobe.d - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - --with-tmpfilesdir="/usr/lib/tmpfiles.d" - --with-udevdir="$(get_udevdir)" - $(use_enable acl) - $(use_enable daemon) - $(use_enable debug) - $(use_enable introspection) - $(use_enable lvm lvm2) - $(use_enable lvm lvmcache) - $(use_enable nls) - $(use_enable vdo) - $(use_enable zram) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -type f -name "*.la" -delete || die - keepdir /var/lib/udisks2 #383091 - - rm -rf "${ED}"/usr/share/bash-completion - dobashcomp data/completions/udisksctl -} - -pkg_preinst() { - # Remove gtk-doc symlink, #597628 - if [[ -L "${EROOT}"/usr/share/gtk-doc/html/udisks2 ]]; then - rm "${EROOT}"/usr/share/gtk-doc/html/udisks2 || die - fi -} - -pkg_postinst() { - # TODO: obsolete with tmpfiles_process? - # mkdir -p "${EROOT}"/run #415987 - - tmpfiles_process udisks2.conf - - # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync? - if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then - echo - ewarn "You should reboot the system now to get /run mounted with tmpfs!" - fi -} diff --git a/sys-fs/udisks/udisks-2.9.4.ebuild b/sys-fs/udisks/udisks-2.9.4.ebuild index 1de00194813c..7b7bb5bc11ba 100644 --- a/sys-fs/udisks/udisks-2.9.4.ebuild +++ b/sys-fs/udisks/udisks-2.9.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="LGPL-2+ GPL-2+" SLOT="2" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram" REQUIRED_USE=" @@ -129,6 +129,8 @@ pkg_preinst() { } pkg_postinst() { + udev_reload + # TODO: obsolete with tmpfiles_process? # mkdir -p "${EROOT}"/run #415987 diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest index 7a625a629802..4d070b681f00 100644 --- a/sys-fs/unionfs-fuse/Manifest +++ b/sys-fs/unionfs-fuse/Manifest @@ -1,6 +1,7 @@ DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0 DIST unionfs-fuse-2.2.tar.gz 47955 BLAKE2B 44ce19b5b857a571da4722af7d19f4c59a5ca222a9d5d544529ef6c4be5125518ffc62cbbd7b5ac7b88fadd22b8777daf18b23124602f35de1a8a041b27d3cbb SHA512 eaecc203f8fad094221cf16b962e7d32a3aa9b0c945a663ce027aba3b7c4152a4dba8d5e96cb63d147f5ecd216cae29b53de946d74a939cde486dcea95d947df EBUILD unionfs-fuse-2.1.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 +EBUILD unionfs-fuse-2.2-r1.ebuild 1007 BLAKE2B d60ccf4f848e26550bf8bdfccfebfaabc2e676a4f9b811bc9fcc1e002f9f47e46fdea79625c9cb0c501a6fce40fec09673c49aa954e965865a74a884bbdfd6f0 SHA512 e49622fa2d426095591e4c10bd5f4e6c34005dec3c9b33be326dc3cef19dc07637df8488a43db20a42e5c57fe9cb39279c9200011c5b206d8c82a6c311fedd5e EBUILD unionfs-fuse-2.2.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 -EBUILD unionfs-fuse-9999.ebuild 971 BLAKE2B b52eb0ee84cf11c90138eeeb11ff6aab9498b5b83d6c748e9a294ca87b2027e3bc676d0de97b346ccd3154c8f37c57637302dc7392ec93dd6fb07f1f8e82a2f0 SHA512 35900df2c72a3b225835589f9e096b450ccdb29346931924c78bcd9c8a4aa2ba54166dd1a9b3097a9e313d6e5f7a5fa99d8cd0560265a49422d9cfac1194d959 +EBUILD unionfs-fuse-9999.ebuild 972 BLAKE2B 1fce7d8489ba8858bce604d6ceb248a3b00bf03be269e76973bbb8d19bdb87327b0bae5fdc2362ba3de4678f9ef8039ceecbcd7e4d930567a487259e3e622db4 SHA512 4fbcd86316619577ab30565598290e64d1ee00d2e3fa937a2710fb0cc3201005348a7ed9ee54e7e1b72cffbf69b8f5d0c9fe1b91a312fce232676e7ed24b3ea7 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7 diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.2-r1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.2-r1.ebuild new file mode 100644 index 000000000000..2312fa71e7c0 --- /dev/null +++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.2-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{8..10} ) +inherit python-any-r1 toolchain-funcs + +DESCRIPTION="Self-syncing tree-merging file system based on FUSE" +HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse" +SRC_URI="https://github.com/rpodgorny/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-fs/fuse:0" +DEPEND="${RDEPEND} + test? ( + $(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]') + ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +python_check_deps() { + use test || return 0 + has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} + +src_test() { + [[ -e /dev/fuse ]] || return 0 + addwrite /dev/fuse + pytest -vv || die "Tests fail with ${EPYTHON}" +} diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild index 5897a40f2915..eab277c33f84 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit git-r3 python-any-r1 toolchain-funcs DESCRIPTION="Self-syncing tree-merging file system based on FUSE" diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest index 4db31b14a980..606a79c7f76d 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -4,7 +4,5 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d DIST xfsdump-3.1.10.tar.xz 609424 BLAKE2B 742d392c4ca4532e64ab8fd89a27b0d7c669e3f977fb9362f3f41e1db09c250951aff3906a5f598892cf58b00a7aab636864af9461afb724feec2708f52cdbd9 SHA512 8a1b671b22fffb5d2eac45d5fd7a2948c137b3ca21fde06779cff13fc6eaa27286876f56715f2eeb82ce107278d763028474260a54a8fec722e5a5d7c5875c9a -DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351 -EBUILD xfsdump-3.1.10.ebuild 1620 BLAKE2B 1e832a79810f6bddf605e8f11b4064736360403479060c88d2568f0200421945f1341975dddb50cd27ad56c608a6b5065344390599feaa01879545c3b51e6cc7 SHA512 743668303895e950a51e3895b40a1d5d0445f56694ab39bee83e1e36036996d331945e82bbd7111170b2f75c3e6c6bce352b241f2819c9bb1a51de4cdbf49543 -EBUILD xfsdump-3.1.9-r1.ebuild 1581 BLAKE2B 0613d92c205bf68359bad98cd4ad56bb0e1c1b6e1996189d85e68b41aebcb73d8643dd9f63ee9c97d6fc7f316a791b44bb74a77a28c7b99875e68ec75dca6a2b SHA512 5ea03e7f5f112ae94578db745372394559a37a7847baeafbd24b687c03568649c1e3c5eb21d03362e17ab161eaa8f068a8c42f5ca9d6539532b649f88a7ab0ec +EBUILD xfsdump-3.1.10.ebuild 1616 BLAKE2B 44ccf45aec6af77e80cc4208b3ff1229025a919acb0b6bde29e9ec54e3682e981572f5fd8526c8e8b329568b5b2a1482fb3cfaac1385b159b8a3caf504456917 SHA512 1f5d694aa1168252f9b0a3fcd6a506416414f9711126dec5c475551a2247a3cf22b9604a02d14cf8887de20dcedae7ec1ac936f73cb6e418b09106880b007ae8 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/xfsdump/xfsdump-3.1.10.ebuild b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild index 0ef28b237d54..29816a7fd3f6 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.10.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.10.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86" IUSE="ncurses nls" RDEPEND=">=sys-apps/attr-2.4.19 diff --git a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild deleted file mode 100644 index 500e295dd5f7..000000000000 --- a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="xfs dump/restore utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86" -IUSE="ncurses nls" - -RDEPEND=" - >=sys-apps/attr-2.4.19 - sys-apps/util-linux - sys-fs/e2fsprogs - >=sys-fs/xfsprogs-3.2.0 - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND="${RDEPEND} - nls? ( - sys-devel/gettext - ) -" -BDEPEND="ncurses? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.9-prompt-overflow.patch #335115 - "${FILESDIR}"/${PN}-3.1.9-no-symlink.patch #311881 - "${FILESDIR}"/${PN}-3.1.6-linguas.patch #561664 - "${FILESDIR}"/${PN}-3.1.9-fix-docs.patch - "${FILESDIR}"/${PN}-3.1.9-skip-inventory-debian-subfolder.patch -) - -src_prepare() { - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in \ - || die - - sed -i \ - -e "s:enable_curses=[a-z]*:enable_curses=$(usex ncurses):" \ - -e "s:libcurses=\"[^\"]*\":libcurses='$(use ncurses && $(tc-getPKG_CONFIG) --libs ncurses)':" \ - configure || die #605852 - - default -} - -src_configure() { - unset PLATFORM #184564 - export OPTIMIZER=${CFLAGS} - export DEBUG=-DNDEBUG - - local myeconfargs=( - $(use_enable nls gettext) - --libdir="${EPREFIX}/$(get_libdir)" - --libexecdir="${EPREFIX}/usr/$(get_libdir)" - --sbindir="${EPREFIX}/sbin" - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - # enable verbose build - emake V=1 -} diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 70c36201f59f..9dc007c159b8 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,11 +1,8 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e +AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa -DIST xfsprogs-5.10.0.tar.xz 1273332 BLAKE2B 8caaa0ca8a94480f131d36b383afcf732b3a5a7a3c7927b4b4da4855fc5a0fb97a56fcebb98391a4dd0f02465868a4bd857e57eeba053a419df47d42f74bc958 SHA512 da09e687c87c4b133888dba7b4458017ec028020637ea5066be0232bf5c7da18239cc33eadd02d9b99d1c835aab38cab1ec9d45ae8b83897f9157cfcb0271fbd DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e -DIST xfsprogs-5.15.0.tar.xz 1303080 BLAKE2B e2d60eb554d206b2d2910d07e20051fb0abd71723186bcdfa07f1ebd2c10c0a7ae387ea5f41e1be008d8e8cede97371581da06505e1675aa210fc3ac242d0782 SHA512 be7ee319fd13c103d88c7fc939277594a386d88d65349594a33eea2899ec4f28115b4ea53b64176cacbd52f3c801e103a085388e3539fc445a4ecd2775766438 -DIST xfsprogs-5.16.0.tar.xz 1306100 BLAKE2B da328fe0c146a7b8ba866c5872f26ce95010939e05da51c73ed6374f00474605a81f4a822d65b60a132a4de47fff286e9f5f1ac809c1aa29420633f573b61aef SHA512 949ddb42d37523d6494aa33d1f73757a6379ee661147b9bb84372bdc3ccf60cdf07580f5337b2f0aebdc5d9c2b7de37cc05d010a2b094d1119d900225fc5b711 -EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 +DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739 EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e -EBUILD xfsprogs-5.15.0.ebuild 2281 BLAKE2B fa5bd52e32c96195aec3473ab64ff4a022d2b6641a10ede9dec23d54e0b22b13bf469c7dff66537ee3a93507e7290159aa082eb0e358a9a7c5aa401604be1aa4 SHA512 50bdefc559d2b59bac64ef7b7fc4c2af0c803685bbdac1563144c4ef21eeed6196505f6ba2a89868fceb6683df36e0d74a6427cd1df30d2ff1dfa7745108cdc5 -EBUILD xfsprogs-5.16.0.ebuild 2286 BLAKE2B 5bb87182052869e0864178e98f1f3ba491671cd81e7975b31271e7629e91892ce96a821247251f82aaccb7955b8797d69fc385de2ec7cebcbde1cd0398ef828e SHA512 69e9d33e72610c476699815d2b684fd2a10fb9ad05bd23dfe0f2456b971c24bc27d822ef3276583ef64e469c4f6cc487e726b3d702dc3e867098483973b901fb +EBUILD xfsprogs-5.18.0.ebuild 2293 BLAKE2B 4705752c2043a67f57e023c49ce03ad6584c1fdfe36d4e2a2361e8ad20f852ac54b47472088440d734ff0041e4bbd3ac19c59694dc81fb5644b029ec29af8d14 SHA512 8d032ddc14d79ccd762f23e7c1aecae87e81860ce8cd0caa687373fe3da38d40be720b019e6211a54c6194d4c0dc20931654b204e4d48b8eec81e2634a86bd86 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch new file mode 100644 index 000000000000..480f44cf6079 --- /dev/null +++ b/sys-fs/xfsprogs/files/xfsprogs-5.18.0-docdir.patch @@ -0,0 +1,11 @@ +--- a/scrub/Makefile ++++ b/scrub/Makefile +@@ -25,7 +25,7 @@ + CRONTABS = xfs_scrub_all.cron + OPTIONAL_TARGETS += $(CRONTABS) + # Don't enable the crontab by default for now +-CROND_DIR = $(PKG_LIB_SCRIPT_DIR)/$(PKG_NAME) ++CROND_DIR = $(PKG_DOC_DIR) + endif + + endif # scrub_prereqs diff --git a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild deleted file mode 100644 index 09adcd120083..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.10.0-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs systemd usr-ldscript - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" -IUSE="icu libedit nls selinux" - -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih - icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) -" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.patch -) - -src_prepare() { - default - - # Fix doc dir - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - - # Don't install compressed docs - sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die -} - -src_configure() { - # include/builddefs.in will add FCFLAGS to CFLAGS which will - # unnecessarily clutter CFLAGS (and fortran isn't used) - unset FCFLAGS - - export DEBUG=-DNDEBUG - - # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. - # However, we have to provide an empty value to avoid default - # flags. - export OPTIMIZER=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #709694 - export ac_cv_search_dm_task_create=no - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - - # Upstream does NOT support --disable-static anymore, - # https://www.spinics.net/lists/linux-xfs/msg30185.html - # https://www.spinics.net/lists/linux-xfs/msg30272.html - local myconf=( - --enable-blkid - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable libedit editline) - ) - - if is-flagq -flto ; then - myconf+=( --enable-lto ) - else - myconf+=( --disable-lto ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev - - gen_usr_ldscript -a handle -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild deleted file mode 100644 index 202d1ea4a5fa..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-5.15.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic systemd usr-ldscript - -DESCRIPTION="xfs filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/" -SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu libedit nls selinux" - -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih - dev-libs/userspace-rcu:= - icu? ( dev-libs/icu:= ) - libedit? ( dev-libs/libedit ) -" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch - "${FILESDIR}"/${PN}-5.3.0-libdir.patch -) - -src_prepare() { - default - - # Fix doc dir - sed -i \ - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ - include/builddefs.in || die - - # Don't install compressed docs - sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die -} - -src_configure() { - # include/builddefs.in will add FCFLAGS to CFLAGS which will - # unnecessarily clutter CFLAGS (and fortran isn't used) - unset FCFLAGS - - export DEBUG=-DNDEBUG - - # Package is honoring CFLAGS; No need to use OPTIMIZER anymore. - # However, we have to provide an empty value to avoid default - # flags. - export OPTIMIZER=" " - - unset PLATFORM # if set in user env, this breaks configure - - # Avoid automagic on libdevmapper, #709694 - export ac_cv_search_dm_task_create=no - - # Build fails with -O3 (bug #712698) - replace-flags -O3 -O2 - - # Upstream does NOT support --disable-static anymore, - # https://www.spinics.net/lists/linux-xfs/msg30185.html - # https://www.spinics.net/lists/linux-xfs/msg30272.html - local myconf=( - --enable-blkid - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable libedit editline) - ) - - if is-flagq -flto ; then - myconf+=( --enable-lto ) - else - myconf+=( --disable-lto ) - fi - - econf "${myconf[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev - - gen_usr_ldscript -a handle -} diff --git a/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild index 0253d8cfb586..b9facc52f475 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.16.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.18.0.ebuild @@ -5,18 +5,18 @@ EAPI=7 inherit flag-o-matic systemd usr-ldscript -DESCRIPTION="xfs filesystem utilities" +DESCRIPTION="XFS filesystem utilities" HOMEPAGE="https://xfs.wiki.kernel.org/" SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="icu libedit nls selinux" -RDEPEND=">=sys-apps/util-linux-2.17.2 - dev-libs/inih +RDEPEND="dev-libs/inih dev-libs/userspace-rcu:= + >=sys-apps/util-linux-2.17.2 icu? ( dev-libs/icu:= ) libedit? ( dev-libs/libedit )" DEPEND="${RDEPEND}" @@ -24,8 +24,8 @@ BDEPEND="nls? ( sys-devel/gettext )" RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" PATCHES=( - "${FILESDIR}"/${PN}-4.15.0-docdir.patch "${FILESDIR}"/${PN}-5.3.0-libdir.patch + "${FILESDIR}"/${PN}-5.18.0-docdir.patch ) src_prepare() { diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest index 22bac06e1fc9..8b53ec7edc63 100644 --- a/sys-fs/zerofree/Manifest +++ b/sys-fs/zerofree/Manifest @@ -1,4 +1,4 @@ AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c -EBUILD zerofree-1.1.1-r1.ebuild 929 BLAKE2B 51c05338c98cecb1f08b1018ca83966beac76afee211ea9714c27375028e99f6357cb5432667cc37c0971064b44e0937bfeab1671f92a61edd9e676bdf447e3c SHA512 4fa6336c47ea65615ba222df2f295baeb491e5361f392432dd4581a19d2c3a64e761da6e308c95eb8fcc50108a17a8802d5f2c33afaf9400653353e0c3e2493b +EBUILD zerofree-1.1.1-r1.ebuild 936 BLAKE2B 9977349943fd8cc397d2e39684473222fc8cb4f2935cc11860af65b08c33b6d721b29b2627c065aeba2e95ef5dd864daa954826cb501c751187d34a0fd341579 SHA512 d70b0e68353590c1100b093b0d13231c38ae8dec2969f615e946796f581ae9868a3f0a498abf535b9e75314680b3b26dad5a0559d5eec1e178636d4014635058 MISC metadata.xml 434 BLAKE2B cd0b61ff2ac3043c8db1b2c68866a4e310a8c49518b4989da6bf4bc2d572861597a8081e02d700f7ac2e127a0e23d9d6657aae7044aa58003cd59de728238950 SHA512 0012ef4dace0b49fcb2a51ad31a8cf687e4c8b9af8ef7f00a9df06416e8f85347c1e8376af1fcf348626d50fd079f5dd69d6cc2e483257752073fcd9ef8c1efd diff --git a/sys-fs/zerofree/zerofree-1.1.1-r1.ebuild b/sys-fs/zerofree/zerofree-1.1.1-r1.ebuild index 79566f7af0e4..d062b46de0b7 100644 --- a/sys-fs/zerofree/zerofree-1.1.1-r1.ebuild +++ b/sys-fs/zerofree/zerofree-1.1.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://frippery.org/uml/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~mips x86" +KEYWORDS="amd64 arm arm64 ~mips ~riscv x86" DEPEND="sys-fs/e2fsprogs" RDEPEND="${DEPEND}" diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest index 94dfdbc58c33..6e970047cc92 100644 --- a/sys-fs/zfs-auto-snapshot/Manifest +++ b/sys-fs/zfs-auto-snapshot/Manifest @@ -1,4 +1,5 @@ AUX README.gentoo 684 BLAKE2B 84caaa11b98449d4e07e95cbec241257bd184a9b391c2d3292fc05310bb6e3a355de228a65a3e32e7f3b3d1661bd02b5386f75155f4714f4181651dc6422eeb3 SHA512 15af67ea619225e205577f6b8340f2fbc32ff9988031092cff371817bdbfa0683f23e53976027c5ee5a4444259138969da75323ceecfa027654fae4e44c59ac4 +AUX zfs-auto-snapshot-1.2.4-drop-which.patch 1734 BLAKE2B b6c87107db148fb79784a240e9dd03a10ba38825b3932bfb91639f478a3d736a4c7080a5104fb38e3d61081d809688ee07528a9fd7bfaabf6684dd092052c4b0 SHA512 114bc45fdb5e7c48665c948495141a9562e014eeee3bd8b11df6caf2f3ee11350182abbbc0fe74f40ea3c3e07f33bca938a39939766c694534f38a77e9ff17da AUX zfs-auto-snapshot-daily.service 216 BLAKE2B 7c07eb29b2923cdce50af71f356edcb688a803f36711edd4cef61d89324425f255ba17139f0eb7c9fb75bc5316051b76504e8fe476ea84592a0fa318c2f84711 SHA512 0cd391b026d3f2d2af312bd2c572cff7ee136f1575fb69b9a2fc044105d8fa463b4fb511fd5f17cf773a53894b9fe20691aac11d95f7884cfcf6ef76e0c615bf AUX zfs-auto-snapshot-daily.timer 148 BLAKE2B 2392e77048af08c24cf18b5428706251a292701343d967f61f8fb1aa0cc0b3f0f0fa7ce70556fd46951608b2ebeb16b7ac76e29eda9c19a75b7db98a76768320 SHA512 38b4a48132afe5634934a6064eccb9089f9b32514c1614bc5a28798b67dac5f378f65e7f437d2f2b7f35063460be26df7c663733d719c2e2de7fd4d63fe70c60 AUX zfs-auto-snapshot-frequent.service 221 BLAKE2B 8d7268fbb74fb4193d5e136c86065ad3432e7d25d6875296ea0175ce809d7d8663ff3c8f769643e9d8131a45c3c1912a942308f93680e91b910e47da5a887d5e SHA512 60bb1f59c187388db631da02340102802a22957ed314ab92042e144df38276d741ab5d02b10b200182686b5b4a0f2af54db29e57eaeed5dece3ffca3d1d258f0 @@ -11,6 +12,7 @@ AUX zfs-auto-snapshot-weekly.service 217 BLAKE2B 715f8f8da6272b9ea782dbe77dbafa6 AUX zfs-auto-snapshot-weekly.timer 150 BLAKE2B 655187add790017f8328edae33e88eb0a4b88774999e67a5fb9c990f5bae9a13ac1e64c290c7e0a218cdcf05dd7bbe320369d1741da036c54994371eecfc50d7 SHA512 49357f15660900b344eba04f8d4bab7e153b728b4665e285b2f9320a287c15b62c426d568d2ba9a43daf69c6f1a6fbccff8b68417f8991dd5f8c3368d562b73c AUX zfs-auto-snapshot.target 360 BLAKE2B 17be6ab113a8849d5244fd36140d1165c4e919df2a04f4b16aa591c1c92b29243b1be4f2243bcc6a8ef015b0cc1fb53b183da1c83668e4e7e0b609f7301a3372 SHA512 f607dada27e4be409184152b93e2079eecf12f5eba76f2dbe42bdbf4793603063c23813e752bfd829a081eeb6d09c86bc18ab75d65bff87b2c1d4f998abac516 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9 -EBUILD zfs-auto-snapshot-1.2.4-r1.ebuild 2573 BLAKE2B d71efca9270300aed57faf477e02013f5f0a171436417fc60e8d05de3f2945e728a797f9f52db10b5c7504989b61177030d5858d390801b7f92514807ef1f449 SHA512 9d20533e843bbe41117c7ce801bb602069a9e369c5bea042348b1f194624865086c3d1392161f076f212cb84eb480c7778f589c27546b98f3e2a7641f082a45c -EBUILD zfs-auto-snapshot-9999.ebuild 2576 BLAKE2B b229742f8c7b9e09be3c2891887d49b5abc3d24f20b75cdb4fa951d383f74e97855bf7b9e68de0291284c018bc8f4239bf62054f1050dbf42a91106a5e141c83 SHA512 3f5dca47d29357e4e12492f3cfad66a5f674599cdb86b6a4817c8622471f4abc8a4be43eb70143c3b7f30f5907759cfc59757d724635d5ae492947f31207d7ef +EBUILD zfs-auto-snapshot-1.2.4-r2.ebuild 2589 BLAKE2B ae75763d83d7919ee78a695be66425cfd97c04036be844fc9582cc7ed49a3dd60ddcf7ce733c8464597f217370c6650cc78afcebafdf1da0bd9f4c4dcbd7a1dc SHA512 be518c8387dc7b4e5142bf094f9556aa05c39bec2c884bf9a3a5edd7f61f6533c743f75ed6cee0fd38a7037622c22f2c2196dd91419aff7ac61cb020cf6d669a +EBUILD zfs-auto-snapshot-1.2.4-r3.ebuild 2633 BLAKE2B 8d6c345b21d2599896ac70a58abd438b3c32869186896a1157cd4b19241c97c3dc0a8b7f3cd08d892eee0e84dae53eb13d0e09b08c4b3507ec3cb964cdbd5342 SHA512 242b6be67f4ae39b811d6758ba81e1ca82147bb85e48879d0c19c1eadff1bae2d3bd1773f0fbe239ac339eb89cc65b5c5788775fd0c8d0cd2ac41cc04c2dde7f +EBUILD zfs-auto-snapshot-9999.ebuild 2592 BLAKE2B 4e1fe442bca545372a3c2c4a7ca7456fa134f3d994975bda29c504cf826063b54f0cdd14d49270a7272e0cd37e1785e59d33a0c5b7b916204797395c8a3f2848 SHA512 c5d895bfa2e784771952e0cbdb233db8baef0bebe6db37afc82e3bdd5f847da92780a0f5a788b275287594e7937c76a3683b228c1c93a5ff260806461e67a6b3 MISC metadata.xml 965 BLAKE2B 4f9cc98f893bcaab842d31a7fe9d3db7d24e34a5cb612137830298bce8450a82636970ba20d69ad31bd36d121cf253deaea7ce3e9435df656a768b9922d2b2ff SHA512 0a816ae56452f48cfc286ae8f0c0ff17ba8e174ec6312ba97c09614568fbad07b4024722e3466406f590579bc614ab85731f6dcd3f873a7256d64f8c7054658e diff --git a/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-1.2.4-drop-which.patch b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-1.2.4-drop-which.patch new file mode 100644 index 000000000000..125cb3d1fc04 --- /dev/null +++ b/sys-fs/zfs-auto-snapshot/files/zfs-auto-snapshot-1.2.4-drop-which.patch @@ -0,0 +1,47 @@ +--- a/etc/zfs-auto-snapshot.cron.daily ++++ b/etc/zfs-auto-snapshot.cron.daily +@@ -1,6 +1,6 @@ + #!/bin/sh + + # Only call zfs-auto-snapshot if it's available +-which zfs-auto-snapshot > /dev/null || exit 0 ++command -v zfs-auto-snapshot > /dev/null || exit 0 + + exec zfs-auto-snapshot --quiet --syslog --label=daily --keep=31 // +--- a/etc/zfs-auto-snapshot.cron.frequent ++++ b/etc/zfs-auto-snapshot.cron.frequent +@@ -1,3 +1,3 @@ + PATH="/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" + +-*/15 * * * * root which zfs-auto-snapshot > /dev/null || exit 0 ; zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4 // ++*/15 * * * * root command -v zfs-auto-snapshot > /dev/null || exit 0 ; zfs-auto-snapshot --quiet --syslog --label=frequent --keep=4 // +--- a/etc/zfs-auto-snapshot.cron.hourly ++++ b/etc/zfs-auto-snapshot.cron.hourly +@@ -1,6 +1,6 @@ + #!/bin/sh + + # Only call zfs-auto-snapshot if it's available +-which zfs-auto-snapshot > /dev/null || exit 0 ++command -v zfs-auto-snapshot > /dev/null || exit 0 + + exec zfs-auto-snapshot --quiet --syslog --label=hourly --keep=24 // +--- a/etc/zfs-auto-snapshot.cron.monthly ++++ b/etc/zfs-auto-snapshot.cron.monthly +@@ -1,6 +1,6 @@ + #!/bin/sh + + # Only call zfs-auto-snapshot if it's available +-which zfs-auto-snapshot > /dev/null || exit 0 ++command -v zfs-auto-snapshot > /dev/null || exit 0 + + exec zfs-auto-snapshot --quiet --syslog --label=monthly --keep=12 // +--- a/etc/zfs-auto-snapshot.cron.weekly ++++ b/etc/zfs-auto-snapshot.cron.weekly +@@ -1,6 +1,6 @@ + #!/bin/sh + + # Only call zfs-auto-snapshot if it's available +-which zfs-auto-snapshot > /dev/null || exit 0 ++command -v zfs-auto-snapshot > /dev/null || exit 0 + + exec zfs-auto-snapshot --quiet --syslog --label=weekly --keep=8 // diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r2.ebuild index 30221867b133..2af66eac6680 100644 --- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r1.ebuild +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r2.ebuild @@ -23,6 +23,7 @@ SLOT="0" IUSE="+cron +default-exclude systemd" RDEPEND=" + sys-apps/which sys-fs/zfs !systemd? ( virtual/cron ) " diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild new file mode 100644 index 000000000000..e503554be28a --- /dev/null +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4-r3.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit prefix readme.gentoo-r1 systemd + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" +else + MY_P="${PN}-upstream-${PV}" + SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="ZFS Automatic Snapshot Service for Linux" +HOMEPAGE="https://github.com/zfsonlinux/zfs-auto-snapshot" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="+cron +default-exclude systemd" + +RDEPEND=" + sys-fs/zfs + !systemd? ( virtual/cron ) +" + +REQUIRED_USE="!systemd? ( cron )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.4-drop-which.patch +) + +src_install() { + if use default-exclude; then + for cronfile in etc/"${PN}".cron.{daily,hourly,monthly,weekly}; do + sed -i "s/\(^exec ${PN}\)/\1 --default-exclude/" "${cronfile}" || die + done + sed -i "s/\(; ${PN}\)/\1 --default-exclude/" etc/"${PN}".cron.frequent || die + fi + readme.gentoo_create_doc + emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install + + local exclude unit + exclude="$(usev default-exclude)" + for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.service; do + cp "${FILESDIR}/${unit}" "${T}/${unit}" || die + eprefixify "${T}/${unit}" + sed -i "s/@DEFAULT_EXCLUDE@/${exclude:+--default-exclude}/g" "${T}/${unit}" || die + systemd_dounit "${T}/${unit}" + done + for unit in "${PN}"{-daily,-frequent,-hourly,-monthly,-weekly}.timer; do + systemd_dounit "${FILESDIR}/${unit}" + done + systemd_dounit "${FILESDIR}/${PN}.target" + + if ! use cron; then + ebegin "removing cron files from installation image" + rm -rfv "${ED}/etc" || die + eend "$?" + fi +} + +pkg_postinst() { + readme.gentoo_print_elog + + if ! use default-exclude; then + ewarn "snapshots are enabled by default for ALL zfs datasets" + ewarn "set com.sun:auto-snapshot=false or enable 'default-exclude' flag" + elog + fi + + if use cron && has_version sys-process/fcron; then + ewarn "frequent snapshot may not work if you are using fcron" + ewarn "you should add frequent job to crontab manually" + fi + + if use cron; then + if systemd_is_booted || has_version sys-apps/systemd; then + echo + ewarn "Both 'cron' and 'systemd' flags are enabled." + ewarn "So both ${PN}.target and cron files were installed." + ewarn "Please don't use 2 implementations at the same time." + ewarn "Cronjobs are usually enabled by default via /etc/cron.* jobs" + ewarn "If you want to use systemd ${PN}.target timers" + ewarn "disable 'cron' flag and reinstall ${PN}" + echo + fi + fi +} diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild index 18a922257dbc..221028bc21a1 100644 --- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild +++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild @@ -23,6 +23,7 @@ SLOT="0" IUSE="+cron +default-exclude systemd" RDEPEND=" + sys-apps/which sys-fs/zfs !systemd? ( virtual/cron ) " diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 47c92b43933c..b216ab711d34 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,15 +1,12 @@ -AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 AUX 2.1.4-ZERO_RANGE.patch 9454 BLAKE2B 5baaef961eb75ee0b46ccb89a514612795b829fe410da1587330f81c2d9550c3fc049f32952e3d67d06a80a3fcc69fe9121fc9f44c1f467570f2d81f1f3a5386 SHA512 95558f6de1b901cdcd7aaa0cc704bf75375a39a5d89da02a0665494a84646f9974e0bc8ff869b622a3a7031db279ff76029ebc33ec1f5f8a129b560ffa565349 -DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 -DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 -DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee -EBUILD zfs-kmod-0.8.6.ebuild 5746 BLAKE2B b8d5cfa1c83f6ae0b565a0469f0c69def97fd536dc2645b623fe31cd2ca6d802976b3aacd05023ede636abb45c5a968256270809e4c080ace95993d640646f4b SHA512 758cbe8be086ade139b4559684e4cfd6b8b1c61273c88f15b7bb612ae49b89b59f05b8f843a8a4993833406769ca017c582e7dadeef41fc70732bac7d1aa944c -EBUILD zfs-kmod-2.0.7.ebuild 5624 BLAKE2B ec04bc269acb6ea08e202b2a52e9883bd7b16d436c9c0fea54247e73c163664a449997bf06058c24602aba7718c49a224f4e1adc74228a5837290b02bacabf37 SHA512 31b39f7a831e034fe6aeecb169dc46e1641c6844f74c4d74127b30cb691bb4fe4a52a998008c2a16b860398192508727cc3b87f9325d30b6e45f2d0d48ea2ee8 -EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 4b518043257f793b8f3ec0e4aee6f758ae6cd7ab9ea587507e4517c9431c305fd82da279eceee860869677f52e93ac589507d4fedb200687d20d6cb6508c08d1 SHA512 ae320718801a32eec16f37d9937e6f0aebf31a362b04bc830642d510992a4810147980bf9826e747930e7b6c0ed885169436251aaffcabc796e535f0bfb3ebba -EBUILD zfs-kmod-2.1.4-r1.ebuild 5293 BLAKE2B 5ad5104f06e5ab2d64451ed47cd2ad49670faa68a69ad2837605bbe08cd68d7dcbf74fd3b0f0c78b758e8f003fc7d47dd8cf25867fedf75b24f5926a7c392e8d SHA512 a487c35ac982ab4b1a735e0d47b263eb89a8541732d21f7e3ad96816427e7193f52eec62ffab26fdd452e732c01140eb2a1baa569d7533df62be103538cfa814 -EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 8614756dc32cca2fd5cf61048385b94b646f2d2b35fe5f20029afc5c3faf1e8fc1b1b2ec3e5abe4f9b120dd8c25af689911f130e9771626e2fae7b9fe14191e2 SHA512 96d80fa36f7c55aa6e8fd1ddd62be1ac5b4f5db16446729d82ccc15d6c18c803ccecc49355558bc779b0916d4832e7d24e367a6295a289268911863cce7bfa3f +DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 SHA512 d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03 +DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786 SHA512 224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94 +EBUILD zfs-kmod-2.0.7.ebuild 5623 BLAKE2B fdd099d7a5c1c62b0976883d4294eb5175681cc422724cbe8fecfa15fa220741098f919666e8ccaba21751689f380ae6869fd63c2d9098b117f8c0c465963dd9 SHA512 54908f2ec0c95dd4705837d7c36797fab15764ff3895337ad9f22f963024f5d4feb41962705bd81e34173b0e5901b56cac1197c734308d23f682953a11c931df +EBUILD zfs-kmod-2.1.4-r1.ebuild 5292 BLAKE2B b773adbd308aeffac068e0dc4e8055e2ca601efe6440091a8ae82606a3bb7806df171c067dcfec4fef54e77882a7c07bbb8cac9b10fa15107d6ca24643279169 SHA512 7426f4adb9312930bfb07828d512148279dd2b935f7ed796c792b52564afef938efe830df1141cc3a94b5949551f1ca74567ef65beca41ae9cc0cf73fe1ff3df +EBUILD zfs-kmod-2.1.5.ebuild 5244 BLAKE2B 72cc9bf7af52f3172d06354d6faf2c9e76482421ae56a395dab6445b71a3bfc19da994f57d853c2b2a626384a544b07a398b642c7f27f3fa6e9d3c3c7ffc43fc SHA512 d09b9c8c101d2e8260b38376e2ba94e2e86900fe60fdb56bbefc4ff1292c2aa9250f7d7de37eb2b9a49fbd51500f33306d3083a429eb7c0ca90d593e82e3e147 +EBUILD zfs-kmod-9999.ebuild 5244 BLAKE2B 72cc9bf7af52f3172d06354d6faf2c9e76482421ae56a395dab6445b71a3bfc19da994f57d853c2b2a626384a544b07a398b642c7f27f3fa6e9d3c3c7ffc43fc SHA512 d09b9c8c101d2e8260b38376e2ba94e2e86900fe60fdb56bbefc4ff1292c2aa9250f7d7de37eb2b9a49fbd51500f33306d3083a429eb7c0ca90d593e82e3e147 MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724 diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch deleted file mode 100644 index 2b1ef8582546..000000000000 --- a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Fri, 18 Dec 2020 11:35:07 -0800 -Subject: [PATCH] copy-builtin: handle missing .gitignore - -acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in -release tarballs, because those do not contain .gitignore file. -Adding -f to rm call will make it return 0 even if file does not exist. - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - copy-builtin | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/copy-builtin b/copy-builtin -index 84f469fef02..6a6eb1f3695 100755 ---- a/copy-builtin -+++ b/copy-builtin -@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" - cp --recursive include "$KERNEL_DIR/include/zfs" - cp --recursive module "$KERNEL_DIR/fs/zfs" - cp zfs_config.h "$KERNEL_DIR/include/zfs/" --rm "$KERNEL_DIR/include/zfs/.gitignore" -+rm -f "$KERNEL_DIR/include/zfs/.gitignore" - - for MODULE in "${MODULES[@]}" - do diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild deleted file mode 100644 index f3bf1e8c644e..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" - S="${WORKDIR}/zfs-${PV}" - ZFS_KERNEL_COMPAT="5.9" - - # increments minor eg 5.14 -> 5.15, and still supports override. - ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" -fi - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0/${PVR}" -IUSE="custom-cflags debug +rootfs" - -DEPEND="" - -RDEPEND="${DEPEND} - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk - dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= ) -" - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set -PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -# https://github.com/openzfs/zfs/pull/11371 -PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" ) - -pkg_setup() { - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - EFI_PARTITION - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - if use arm64; then - kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT" - fi - - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" - - if [[ ${PV} != "9999" ]]; then - local kv_major_max kv_minor_max zcompat - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - kv_major_max="${zcompat%%.*}" - zcompat="${zcompat#*.}" - kv_minor_max="${zcompat%%.*}" - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - - # 0.8.x requires at least 2.6.32 - kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" - else - # git master requires at least 3.10 - kernel_is -ge 3 10 || die "Linux 3.10 or newer required" - fi - - linux-mod_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set module revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - # Set CROSS_COMPILE in the environment. - # This allows the user to override it via make.conf or via a local Makefile. - # https://bugs.gentoo.org/811600 - export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-} - - local myconf=( - HOSTCC="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" -} - -src_compile() { - set_arch_to_kernel - - myemakeargs=( - HOSTCC="$(tc-getBUILD_CC)" - V=1 - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD=: - DESTDIR="${D}" - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" - fi - - if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use x86 || use arm; then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of OpenZFS includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of OpenZFS. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild index 154ef6022aef..a928c1eac6f9 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -180,7 +180,7 @@ pkg_postinst() { linux-mod_pkg_postinst if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage + set_arch_to_pkgmgr dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild index 79e017a77935..05b9754f0ef2 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.4-r1.ebuild @@ -184,7 +184,7 @@ pkg_postinst() { linux-mod_pkg_postinst if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage + set_arch_to_pkgmgr dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild index f2a4878100af..65567e49fef7 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.5.ebuild @@ -19,14 +19,14 @@ else SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.15" + ZFS_KERNEL_COMPAT="5.18" # increments minor eg 5.14 -> 5.15, and still supports override. ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ppc64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi fi @@ -167,8 +167,8 @@ src_install() { myemakeargs+=( DEPMOD=: + # INSTALL_MOD_PATH ?= $(DESTDIR) in module/Makefile DESTDIR="${D}" - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD ) emake "${myemakeargs[@]}" install @@ -180,7 +180,7 @@ pkg_postinst() { linux-mod_pkg_postinst if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage + set_arch_to_pkgmgr dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" fi diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 415a0f781f18..65567e49fef7 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.17" + ZFS_KERNEL_COMPAT="5.18" # increments minor eg 5.14 -> 5.15, and still supports override. ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" @@ -180,7 +180,7 @@ pkg_postinst() { linux-mod_pkg_postinst if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage + set_arch_to_pkgmgr dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" fi diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index be1ded722866..04ea52a86227 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,18 +1,15 @@ AUX 2.0.7-scrub-timers.patch 3128 BLAKE2B f7f55905df7e804bef3818c4b5ce9c34595bcfd77c8d0fa3fb94156d878e077f878a3acd76cc92a57a056d9e8643c9d769cce0b1f067ab228f75d3242178b588 SHA512 a2a649e5b59af8dc26312cf8adf5716671da9e897788af3b6598eec653a5cd73ef25f703ac1b549c9927036738c016acc629c9bfc6dca0335b1d1327f85c6af4 AUX 2.1.2-musl-tests.patch 1923 BLAKE2B 0029cba42b7914166cec894e30730f205f2c1508dd7f0c46b2567c365b5c6daa1d65cfc9ede9180f4831c924760b6a9a9ac81972e991c439148ad21bfcb3dfda SHA512 be96efa5b0b407388fe4f0066c5516a1b882bb158376d072373d6c73f2dc1414a61eda925fa12a0708d15e5c791c590f4b83809262d21e2160a0d931e608ab80 AUX 2.1.2-openrc-vendor.patch 1469 BLAKE2B d8c20bbeee95db8eb4c26e6d5b1798e89c3b152c03ddc852dea6810fb170f70e77a200bdbda00953a792d05467f268260ccfcc1d1b20576bfb21c65fde6e93df SHA512 ae5709acef0531146f7ac020fd4038dc76f99dd43c8322b3934522c2e74f90d60106c30de679cb9aaaa3f6ece00ed93e490c0787e573fc0871c30d73842ea04e -AUX 2.1.2-scrub-timers.patch 4260 BLAKE2B 1921e617aa97cb45a60b9f9649adb9ce2ea01a834e452c2af43360b04174ca92a8d2bf1b6e6ad7ebdeff97b82499cadcd996ecde2986d2f05102358f63d2a2d9 SHA512 f12865ebb649c7bba90e5f4ba2f901bb49c9d9d7d71d80bfa7402316773132a8a12ddd77de4bb60007aa5c5c050472d9bded410893a9ae5d9a9e87e0d2f03a40 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 -DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 -DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 -DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb DIST zfs-2.1.4.tar.gz 34896310 BLAKE2B be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200 SHA512 c7b57c43fc287b22905067ab022df4133d32e1a5dc335f7baf743b4ef88f64c2bf9d41318c2083230d077dd49e68f7d9e6172266e13d4b1eee29d359860f969e DIST zfs-2.1.4.tar.gz.asc 836 BLAKE2B b311730f72d534c87a782515f35a354bfbefba0513dc0cee5b0b497cf742590f13be6a49ff8a70d7d6503d0ba06b0266e7d290d718337add614812c3d1b0731a SHA512 53880cd5369f468551bab685eb83739ed76aa286886fdd2cbad4270755fe809da730082a91bba61011f59594fac297ce05645ae32c2c73b4a9aa835f2991a1ee -EBUILD zfs-0.8.6-r2.ebuild 6527 BLAKE2B ac889061cc532d89d87705f610fa3220d1f0d8ef08a8e948a61c1eeab616ebb4815c1a5abf9bcc2a662a89a2a43cc1d659183b06fc170bf1f7bb716a2fa1dc4e SHA512 b21b4e0ca160a17f7fb3729cebdfc4efcd83898265445ef5cc4dfc1a6fcaf692552a8300f8465bad3b07fda73e78a212a5c868bae702d1896448945f22d4588d -EBUILD zfs-2.0.7.ebuild 8435 BLAKE2B ecb10942cd6d51d0c5cb9c0e8ad5beef3afb580507514478b10dc3d59355262e87b2714c5f641e497bb2b351355400acb31b3aee81b98912c9a4753d7bcf55da SHA512 caeba0a22fefd58d0f7675c50d11d9a71f006e802960bdd810ff1799219526ab73e4d6993e8428af9823629a99d95932494911fcba8e0e6578c0cf697b0ad4e6 -EBUILD zfs-2.1.2-r1.ebuild 8611 BLAKE2B 65f5e13bdf9ed34e248b9d0e6245fb76ee5b829398e0ee40a790b2f049042ea851ef4b35244264ddc899f31b5511e14c8bf9bc6ad77e2e11c811ccd4d8e2290f SHA512 03274ba778d38678cbf818f79b7ed124cd25af8071a00233d9d01fb86d8d8907a3a53a032dd464558fec196245a75dec95f6117a99371900fa4a6fb6fec2bd90 -EBUILD zfs-2.1.4.ebuild 8645 BLAKE2B 480e950c3daaeeb4bc12f2df38f8ca828d9e0e67ef5244e8d36783444ba1390e13be8a68cd67fe85470c5d7a76fd0edbeba6c92f1ef3fdb09bb8c36882008f17 SHA512 cbf6e54dd05f63b84a3a4560131a7ad75fe423ef61b607ce0c1274b3a4b0129cc8bf952e0ff32a6fbee17c20e6cdd37b3f0a9dfadc684f2f23a65c8fc7b3dca6 -EBUILD zfs-9999.ebuild 8602 BLAKE2B c3154af855d5e81642f6dd39a846e19c96a9bb7879217a00c675d5b689fd2574ae486bec0682be921374ff20456f4dadc1f88129c185eb0fb095a0d7eeecc5dd SHA512 172c44e8c88613e0713d3647a8ed2e8b0d552a57c5d16c4e34cf0ccaaa7bf438b8cb54953519d1885b46000ba21448973881e3730c6fa1d7e4a0a3634c461f39 +DIST zfs-2.1.5.tar.gz 34951632 BLAKE2B c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 SHA512 d9ccf1049cefa9167d25f71fbdca70092cd02368b60f09341e6489fb68dc5f89e87b026b0191f4d81181a8851449124d824a1d959d0e2fb29c8a3d624edc4f03 +DIST zfs-2.1.5.tar.gz.asc 836 BLAKE2B 4a81c266967540850a2cc824e79555ca9d05b2e17e45fa2723893cbd85b55e3d7d791986d6667b7ee1530e7692c03818f15e8b6798393b54989f90801b775786 SHA512 224b0dcf4982c63a8eff0a39d054537e7d023f7c35e154e4d20490b8daf184c076bc8e4de7d2c5af4059f8a802b747e637aad4479cd8d1330cf5b26da2f19c94 +EBUILD zfs-2.0.7.ebuild 8463 BLAKE2B 652e7b21478954257ed02ef341264da7d5ded2ac7f7361e760ede9638e589c61c95b5862878343935ee4271850f943562358546c9c521c1eb1e4959e6bf74b5e SHA512 f8d8ef189af7597c67ec8769ac8e615ab366eca16f797f77e596d7a2791eaa628c1e66557f751ad3de66f971c41845ae505d7a397b873ff91de391a57e1e0a37 +EBUILD zfs-2.1.4.ebuild 8673 BLAKE2B d8c05a44f18adfc4a0e95b12576947ca3aa90333e2d1cf06ea1975f49e56446b8e5cbeba19250c82722f558432406f27ed9a798daafda147023f31e6aa699c86 SHA512 d054c058b248b88158ba165fa33c5f7772bde2efc6eadb2c6792243e353ae025b5bf7cab8101689ffc57960e8827018b34165dce7f14c17e855016c6f64006ed +EBUILD zfs-2.1.5.ebuild 8629 BLAKE2B 1a41e5f11c63238de677cd39af866b5670801c3e289b6e5bbf34a145219d89995ff07f9f2ce49ec57b3ddab73546213f549be396d58d2e6adfcf265a5cb5687b SHA512 9cbfa779f28e399de1695b199939fa46bf248eb88b2ec0b5e924698312360c25673381b426a120850374f17c8a23ee29337ed6e857d8389160a490f7da891f35 +EBUILD zfs-9999.ebuild 8629 BLAKE2B 1a41e5f11c63238de677cd39af866b5670801c3e289b6e5bbf34a145219d89995ff07f9f2ce49ec57b3ddab73546213f549be396d58d2e6adfcf265a5cb5687b SHA512 9cbfa779f28e399de1695b199939fa46bf248eb88b2ec0b5e924698312360c25673381b426a120850374f17c8a23ee29337ed6e857d8389160a490f7da891f35 MISC metadata.xml 2194 BLAKE2B 57b0d1bcbcd78039d0cfd20f087bdfc339eefebbec3150af3c06d2e1a6dee882c4f8f97a9e470f63d4d628441a10650bda8b1843e33240dcc8d3e2ad55d104ec SHA512 fac8750d64d844b397fbbdcca9b7aea671f7642c64da92b89480439919ced80b9b6292ee3a2cc55e412e3c55dd02c418ef7c056f2973b7eb0f53ee763e099098 diff --git a/sys-fs/zfs/files/2.1.2-scrub-timers.patch b/sys-fs/zfs/files/2.1.2-scrub-timers.patch deleted file mode 100644 index f1c5b5699f62..000000000000 --- a/sys-fs/zfs/files/2.1.2-scrub-timers.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 2c9844d159024d4c742d24639a218213fb53d537 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Sat, 22 May 2021 22:27:39 -0700 -Subject: [PATCH 1/2] systemd: add weekly and monthly scrub timers - -timers can be enabled as follows: - -systemctl enable zfs-scrub-weekly@rpool.timer --now -systemctl enable zfs-scrub-monthly@datapool.timer --now - -Each timer will pull in zfs-scrub@${poolname}.service, which is not -schedule-specific. - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - etc/systemd/system/.gitignore | 1 + - etc/systemd/system/Makefile.am | 5 ++++- - etc/systemd/system/zfs-scrub-monthly@.timer.in | 12 ++++++++++++ - etc/systemd/system/zfs-scrub-weekly@.timer.in | 12 ++++++++++++ - etc/systemd/system/zfs-scrub@.service.in | 14 ++++++++++++++ - 5 files changed, 43 insertions(+), 1 deletion(-) - create mode 100644 etc/systemd/system/zfs-scrub-monthly@.timer.in - create mode 100644 etc/systemd/system/zfs-scrub-weekly@.timer.in - create mode 100644 etc/systemd/system/zfs-scrub@.service.in - -diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am -index c374a52ac..5e65e1db4 100644 ---- a/etc/systemd/system/Makefile.am -+++ b/etc/systemd/system/Makefile.am -@@ -12,7 +12,10 @@ systemdunit_DATA = \ - zfs-volume-wait.service \ - zfs-import.target \ - zfs-volumes.target \ -- zfs.target -+ zfs.target \ -+ zfs-scrub-monthly@.timer \ -+ zfs-scrub-weekly@.timer \ -+ zfs-scrub@.service - - SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA) - -diff --git a/etc/systemd/system/zfs-scrub-monthly@.timer.in b/etc/systemd/system/zfs-scrub-monthly@.timer.in -new file mode 100644 -index 000000000..903068468 ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub-monthly@.timer.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Monthly zpool scrub timer for %i -+Documentation=man:zpool-scrub(8) -+ -+[Timer] -+OnCalendar=monthly -+Persistent=true -+RandomizedDelaySec=1h -+Unit=zfs-scrub@%i.service -+ -+[Install] -+WantedBy=timers.target -diff --git a/etc/systemd/system/zfs-scrub-weekly@.timer.in b/etc/systemd/system/zfs-scrub-weekly@.timer.in -new file mode 100644 -index 000000000..ede699500 ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub-weekly@.timer.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Weekly zpool scrub timer for %i -+Documentation=man:zpool-scrub(8) -+ -+[Timer] -+OnCalendar=weekly -+Persistent=true -+RandomizedDelaySec=1h -+Unit=zfs-scrub@%i.service -+ -+[Install] -+WantedBy=timers.target -diff --git a/etc/systemd/system/zfs-scrub@.service.in b/etc/systemd/system/zfs-scrub@.service.in -new file mode 100644 -index 000000000..c04ac292a ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub@.service.in -@@ -0,0 +1,14 @@ -+[Unit] -+Description=zpool scrub on %i -+Documentation=man:zpool-scrub(8) -+Requires=zfs.target -+After=zfs.target -+ConditionACPower=true -+ConditionPathIsDirectory=/sys/module/zfs -+ -+[Service] -+ExecStart=/bin/sh -c '\ -+if @sbindir@/zpool status %i | grep "scrub in progress"; then\ -+exec @sbindir@/zpool wait -t scrub %i;\ -+else exec @sbindir@/zpool scrub -w %i; fi' -+ExecStop=-/bin/sh -c '@sbindir@/zpool scrub -p %i 2>/dev/null || true' --- -2.34.1 - -From 4bac4eae0345fb322337b66a9b4923e9f3f52b0f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Fri, 29 Oct 2021 21:40:50 -0700 -Subject: [PATCH 2/2] zpool-scrub.8: add PERIODIC SCRUB section - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - man/man8/zpool-scrub.8 | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/man/man8/zpool-scrub.8 b/man/man8/zpool-scrub.8 -index 768f71539..69ae825b6 100644 ---- a/man/man8/zpool-scrub.8 -+++ b/man/man8/zpool-scrub.8 -@@ -116,8 +116,29 @@ scanned at 100M/s, and 68.4M of that file data has been - scrubbed sequentially at 10.0M/s. - .El - .El -+.Sh PERIODIC SCRUB -+On machines using systemd, scrub timers can be enabled on per-pool basis. -+.Nm weekly -+and -+.Nm monthly -+timer units are provided. -+.Bl -tag -width Ds -+.It Xo -+.Xc -+.Nm systemctl -+.Cm enable -+.Cm zfs-scrub-\fIweekly\fB@\fIrpool\fB.timer -+.Cm --now -+.It Xo -+.Xc -+.Nm systemctl -+.Cm enable -+.Cm zfs-scrub-\fImonthly\fB@\fIotherpool\fB.timer -+.Cm --now -+.El - . - .Sh SEE ALSO -+.Xr systemd.timer 5 , - .Xr zpool-iostat 8 , - .Xr zpool-resilver 8 , - .Xr zpool-status 8 --- -2.34.1 - diff --git a/sys-fs/zfs/zfs-0.8.6-r2.ebuild b/sys-fs/zfs/zfs-0.8.6-r2.ebuild deleted file mode 100644 index 46403d3bc9b8..000000000000 --- a/sys-fs/zfs/zfs-0.8.6-r2.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info systemd udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 linux-mod - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="amd64 arm64 ppc64" -fi - -LICENSE="BSD-2 CDDL MIT" -SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/awk - virtual/libudev:= - dev-libs/openssl:0= - !minimal? ( ${PYTHON_DEPS} ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - virtual/awk - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-kernel/genkernel-3.5.1.1 - ) - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set, without suggesting to disable -PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" - -REQUIRED_USE=" - !minimal? ( ${PYTHON_REQUIRED_USE} ) - python? ( !minimal ) - test-suite? ( !minimal ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/bash-completion-sudo.patch" -) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-info_pkg_setup - - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --enable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="$(systemd_get_systempresetdir)" - $(use_enable debug) - $(use_enable nls) - $(use_enable python pyzfs) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - CONFIG_SHELL="${EPREFIX}/bin/bash" econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - - use test-suite || rm -rf "${ED}/usr/share/zfs" - - find "${ED}/" -name '*.la' -delete || die - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - # we always need userspace utils in sync with zfs-kmod - # so force initrd update for userspace as well, to avoid - # situation when zfs-kmod trigger initrd rebuild before - # userspace component is rebuilt - # KV_* variables are provided by linux-info.eclass - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "root on zfs requires initramfs to boot" - elog "the following packages known to provide one and tested on regular basis:" - elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" - elog " sys-kernel/genkernel" - fi - fi - - if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-2.0.7.ebuild b/sys-fs/zfs/zfs-2.0.7.ebuild index e4ff7efbdefa..2a638aee9616 100644 --- a/sys-fs/zfs/zfs-2.0.7.ebuild +++ b/sys-fs/zfs/zfs-2.0.7.ebuild @@ -256,6 +256,8 @@ src_install() { } pkg_postinst() { + udev_reload + # we always need userspace utils in sync with zfs-kmod # so force initrd update for userspace as well, to avoid # situation when zfs-kmod trigger initrd rebuild before @@ -296,6 +298,8 @@ pkg_postinst() { } pkg_postrm() { + udev_reload + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then remove_moduledb fi diff --git a/sys-fs/zfs/zfs-2.1.4.ebuild b/sys-fs/zfs/zfs-2.1.4.ebuild index 7d1292a10c0a..465412d2cee6 100644 --- a/sys-fs/zfs/zfs-2.1.4.ebuild +++ b/sys-fs/zfs/zfs-2.1.4.ebuild @@ -252,6 +252,8 @@ src_install() { } pkg_postinst() { + udev_reload + # we always need userspace utils in sync with zfs-kmod # so force initrd update for userspace as well, to avoid # situation when zfs-kmod trigger initrd rebuild before @@ -294,6 +296,8 @@ pkg_postinst() { } pkg_postrm() { + udev_reload + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then remove_moduledb fi diff --git a/sys-fs/zfs/zfs-2.1.2-r1.ebuild b/sys-fs/zfs/zfs-2.1.5.ebuild index d119026f5c74..6e0b78a9c125 100644 --- a/sys-fs/zfs/zfs-2.1.2-r1.ebuild +++ b/sys-fs/zfs/zfs-2.1.5.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript @@ -24,7 +24,7 @@ else S="${WORKDIR}/${P%_rc?}" if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ppc64 ~riscv" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi fi @@ -100,12 +100,6 @@ REQUIRED_USE=" RESTRICT="test" -PATCHES=( - "${FILESDIR}/2.1.2-scrub-timers.patch" - "${FILESDIR}/2.1.2-openrc-vendor.patch" - "${FILESDIR}/2.1.2-musl-tests.patch" -) - pkg_pretend() { use rootfs || return 0 @@ -257,6 +251,8 @@ src_install() { } pkg_postinst() { + udev_reload + # we always need userspace utils in sync with zfs-kmod # so force initrd update for userspace as well, to avoid # situation when zfs-kmod trigger initrd rebuild before @@ -287,6 +283,8 @@ pkg_postinst() { else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ einfo "You should add zfs-import to the boot runlevel." + [[ -e "${EROOT}/etc/runlevels/boot/zfs-load-key" ]] || \ + einfo "You should add zfs-load-key to the boot runlevel." [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ einfo "You should add zfs-mount to the boot runlevel." [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ @@ -297,6 +295,8 @@ pkg_postinst() { } pkg_postrm() { + udev_reload + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then remove_moduledb fi diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index cd2bdc26966b..6e0b78a9c125 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript @@ -251,6 +251,8 @@ src_install() { } pkg_postinst() { + udev_reload + # we always need userspace utils in sync with zfs-kmod # so force initrd update for userspace as well, to avoid # situation when zfs-kmod trigger initrd rebuild before @@ -293,6 +295,8 @@ pkg_postinst() { } pkg_postrm() { + udev_reload + if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then remove_moduledb fi |