diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-09-02 12:28:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-02 12:28:17 +0100 |
commit | 20b6ab983b55b022c6e4af317154089e18ad41cb (patch) | |
tree | 07060dcd7f71fd5f02ecf6463cb8bf3665b65bcc /sys-fs | |
parent | 12a4866975c254ac127821e7562eda5ac119fba3 (diff) |
gentoo auto-resync : 02:09:2024 - 12:28:17
Diffstat (limited to 'sys-fs')
19 files changed, 6 insertions, 2366 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex d3b49d08ae4c..39045afac954 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index e50321c65c36..3870fda1bfe2 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -2,26 +2,10 @@ DIST btrfs-progs-v6.10.1.tar.sign 566 BLAKE2B dc18c0048716e422475c6630c26c74e09b DIST btrfs-progs-v6.10.1.tar.xz 2670604 BLAKE2B 7a2631b8462bb02be0936861a42b868907bd4f4e365293f9c95744b963e769b81248ba0a290fca517d689ff9f93d8709cc37e217264b2dac1469a47349f97e8c SHA512 cd10747d1f5f9377abfdf209b517791d3eb13b417c0be65fd5c0c044b01063125b4176c178345387bb3deda7a3a379953f31d46d7834854455a5dbfbf967aa97 DIST btrfs-progs-v6.10.tar.sign 566 BLAKE2B 493260b4854616eabce943135b4990de4a724ad00f8cba43e9d864e5c67e5896890831d17c742456d422ed15267a753c4eaf18ac30a4c7c3da0b254b01becf8b SHA512 62d9721702eec6eec2c0e51eee4624324c4604d3bc76016cde1ade0572c22b46ede71fcb3d9e4ca14ea0196e84116ce4ef9222b399f8bbdf8e5259c18f3a82e8 DIST btrfs-progs-v6.10.tar.xz 2669760 BLAKE2B 24b66cc6f7118da817e9abca69e8de9a9496de1ec4eb6800fa8f6b13b677e37a553d90562a38618a63b68b71457ab10ff72541dd3e0c169a1fe05509fd62402c SHA512 aa5af67f3816dcd1a128b69bc6f4bd83423c6c2289e3dd3abe2a07bdccb6b7d5e49426a5a0ece643709c23cdcb0908ca52b271f058fee3a3d810cdfcb9c36639 -DIST btrfs-progs-v6.6.3.tar.sign 566 BLAKE2B 9f8a14405f78c8eb5a92d59f9ca776cd15bfd43bc323a0f5a98cc2d9a6f782e999a792ddb266fef4dfe189e1cb8eebbd021a12b615e22bdd4097a74bf3b277a9 SHA512 07f062cf66c0e5f0bd833f0a1c9901ec06ac4eb258acec8e96ffbb0b85007a67bdc992492b25f6039fcf603352131fca8c57162fa61007e8ccf1f4edf71dab97 -DIST btrfs-progs-v6.6.3.tar.xz 2557216 BLAKE2B 274fad52bcab45bd0f6496c1bc10e1736e7b766f53b712790996a8a38f74eedcc570783599bed62cd4f84e5629f2216340a66941d9fbe0c7890f1c56ed66df8a SHA512 93e1defacf0f280fc02e10a20fd2bc3775c52956a0339e30b829cc3bef85629d565cf3f6a9af126e38bbb73e8e9b9a0069abbe0e57957a56ca1a8826f5de624a -DIST btrfs-progs-v6.7.1.tar.sign 566 BLAKE2B e5aba64e199f26cef84a8cbbb034c0a5c24572e43fef2fdce79f0dbd892b1609876f681bf79de53e6473345f3de8b8fee6aac2d33673e0b080ab33fb935bd32d SHA512 8fad1c2c47356a04434e12621c526603bf651bdcb0a08deb4022d83953d8c501b8aaa2da05cbf94e0bde43b48a4135fff78a5746423466036ff4899dd79b9589 -DIST btrfs-progs-v6.7.1.tar.xz 2565576 BLAKE2B 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0 SHA512 8a2e735f036a0778a2482d42c813012269903174232bc2924af41b72bbcfb49783d5f3b7d0af085285a68754748bd76b6534a498a47cdcea94020f4262281ffc -DIST btrfs-progs-v6.8.1.tar.sign 566 BLAKE2B 843eada2b00a2370522edc95d79bcfed88bd24233e647946d4807322550593e4d5f5bb5efa6652c754dd0965dc3e389bc97698a0bd8fc5d0e850bea94de98e72 SHA512 84ebaa6ec27aa5bc87a323f5c6cc82a860fada7311ab8319127de3592294c1076d25959e412f8387d54bad3b8ff838ce39c4db4b04a658b2de2eaa7c976e2b09 -DIST btrfs-progs-v6.8.1.tar.xz 2652968 BLAKE2B 34406dedc6d97bd94a498c3bbb424d34a59b8251b37f9a40a87740f96db77780a4cd76c88055b4d9e4f673b4a3621503a6bedb67ceaf20870fb26c10f49b74e0 SHA512 b5f0694e56eecf1956313b3406610c2e22658ace51a636d79efe996780bb0b03fed95e68a8c9a11dd8649958c0e7dbc7417bb479859365d47b52e478f6830d46 -DIST btrfs-progs-v6.9.1.tar.sign 566 BLAKE2B 4735411485669e37558adda62e168f22a09c11d085dd4adc5db4cfe932745c746b373763cb70b31219908886de52544854a3e9dee0b61bbf32d5d7bf4325d2c9 SHA512 c484845ad47b1ebee666f76e5f0421f640391e205158c14e83ef960506df6b0b6d34244bdcd254e2ac47b3d758e515ffec523a773b7f6081d8b47b856bbbe09b -DIST btrfs-progs-v6.9.1.tar.xz 2662768 BLAKE2B ed26da2c3c07082df7f1a3d2dc43981ac5375e23de44d0068d91075c8f75e03e75eef4ec5175a0c72d57511b4b9474ff3383f07f14db22e97b2b175578f1cd40 SHA512 5a6b6bbcf2d2624ba12f877485c8137d1601ed9b17bd7f05993cccbc46ff0546f8a0aaf4e221e6cb3aaaa0cec53222edc723f787b317aa551b7f4469456d9a3a DIST btrfs-progs-v6.9.2.tar.sign 566 BLAKE2B 4cd95496d355444c7d3e582a7e6c05fbb55683008b1585a26f38aef6cceb1afd5e80c9611518d6bd92dc1167798d4012c4bcab2f9bda752c459d94cfa6f3c477 SHA512 3fb04e1894e231abde388a39d2f0c90f43c1a1494622c2158fab9b94bb340e064404bcf96e24d913c60aaf5e06ade42fbb91a479949109b329682bb089f66bf2 DIST btrfs-progs-v6.9.2.tar.xz 2661684 BLAKE2B 38ab189ac8271ba8d68b74e82569159c671cca1cb946f56ccab28b6b206cb6ee5b330d83afc3536b7e0d7399da3fb01e368809c1ef4a64b843ea88796ebd28bd SHA512 1df9d5456d07a035c38c17795996a4fc621eeaa244ef54383d4387205826d2a6e971910e55031d20bb1baf23193efa7439e110312ffd8471f07aaf8c0baca20a -DIST btrfs-progs-v6.9.tar.sign 566 BLAKE2B a2e26047775bcc407b8f5aa8b08b0708a01c84a8cd649e50a935e15d04e2ee917010fc98df0dfb80320ee25a8dbfbbbabbb1f155489f32391544100956ba9636 SHA512 1e8304b3df013a841e82a8656361946914d35f680b5bc547c1599fdd98a75b66e2b1f869c8b043d7532182318c2183e699a9d6101ab4b1544618d2c8a25362e1 -DIST btrfs-progs-v6.9.tar.xz 2663052 BLAKE2B 9fad691327b6290b3ba0e1a638576b65e4e4d6c8f32549ea0f10188fdb40028315abf5e330976ff7a5efb6a258d0008e7602ae81ba0339888f474dc056791798 SHA512 e97907b377040371f4742a45345ec720e0cb8e0cf9ee5fdc60618ce2bc76f572725ec32e1a178fd57534f73affd3eeb5e6cfebf23734f04583bbbef858d913b2 EBUILD btrfs-progs-6.10.1.ebuild 4305 BLAKE2B 8ea7b2432c04e5514c1b275cf78104f28260fd3f5f6ab2f02d160019aedd2da6788119d2e549675ff097e24122166fac69d9fc610ec24ce0aa657bdea632bfaa SHA512 4258654bd418f8e6a7c5ea802287434b9131aa9a72fe6d725ad91d709cf2b02f6e6e6837dddfda14995f9e2bc4e3563919904b2d312ae845777ba972eeb264b1 EBUILD btrfs-progs-6.10.ebuild 4305 BLAKE2B 8ea7b2432c04e5514c1b275cf78104f28260fd3f5f6ab2f02d160019aedd2da6788119d2e549675ff097e24122166fac69d9fc610ec24ce0aa657bdea632bfaa SHA512 4258654bd418f8e6a7c5ea802287434b9131aa9a72fe6d725ad91d709cf2b02f6e6e6837dddfda14995f9e2bc4e3563919904b2d312ae845777ba972eeb264b1 -EBUILD btrfs-progs-6.6.3.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd -EBUILD btrfs-progs-6.7.1.ebuild 4599 BLAKE2B 79fd7e385b4ebffb59d0b919cfba46039846d009c3db3bb0c62981c20adfc296d6103cbfe69f62df556effca65f5f8c1120ece2161f158f839693f0858420aea SHA512 d73a464ccac5b57582aa2ada28961cf0285c0285b587059051d0af67ca57bb569d66750deb14cac48bafc82215168ad8c4ca61d9393ded4e19363db788e02efd -EBUILD btrfs-progs-6.8.1-r1.ebuild 4403 BLAKE2B dc5b353b713a59e467da06ddb7b0c1e7a67d95d3b4b0f3438e148570d63e82aa87416da77a11264ab8602b9e5278ed4e3e355d0dc8cbde947f3511f5e1a0ce1f SHA512 b68e3aee56f709ef9e529c2b0ac1ec31d11cbed51ce16b9c4cd8470d358acf2f36995a3047fef697e920dbf601335635d4016720289417a70e10f3958b757472 -EBUILD btrfs-progs-6.8.1.ebuild 4599 BLAKE2B 2fdbb02df514a9c78b34e6b7df55d266b222b60515ba463e8cdaa4b2dcb5d06c68752218691ff2182b6468edcecd735c3ec39433633de1fd52bc80ac8610bd22 SHA512 8705968998ae1f454051d1dabe7c392311d61d81fb93217e3cc2f39913bbe56cbcbd7de75d452aadde14e905c371f3d543cb9673de34544776fe685dfa9a65ac -EBUILD btrfs-progs-6.9.1.ebuild 4171 BLAKE2B c74e04d0dbf096e372c2a2b634a16f517f2f035c4301e7c88fac0258a295084774b786638ee3f7a90f24deac91dd1cf789fb245ffc115c1d9fa5469cdf722612 SHA512 7c758a53937991f46988263f182017fe462cdb3ca9e77679dc0fed499bb48c53e5a06292c0c397cb1c779772974e88e04cfc10e022de8770e313b2ec3c37c770 EBUILD btrfs-progs-6.9.2.ebuild 4299 BLAKE2B 773e16ebdd7e86cbda20e75cb3fde2d0084617f94b1b5fc5fb05bd1be36b880b00b64e1264e1f8cb02d5cac607b626e54c124c582e1d2e1b261f9dfda5116a4e SHA512 6548774675c54c3e1c8261d48f6c01e0f5878f0c0da12bf1318aa37cc5d1b137fda0f7cf40672b2da014b63cc99eed18cdbebefe52efefc70db48f49bc901991 -EBUILD btrfs-progs-6.9.ebuild 4170 BLAKE2B 6c2ba7f6bc8ea09f62a8f6b5ada660c8c34fd9e1f861a52049be46dc9961edde57c33b5375fd50a3cfe1f7e314af7efa01ddf144c12686542f788fdd9c6fd660 SHA512 af2cf5d1996c4e3637c313fd0731d8427d3455869758a346742d8781d704290fa2ffd8cc009fb70e0cfdbaf1a266f1eb5e55acb13093ea5d23fdcc55c70ac890 EBUILD btrfs-progs-9999.ebuild 4305 BLAKE2B 8ea7b2432c04e5514c1b275cf78104f28260fd3f5f6ab2f02d160019aedd2da6788119d2e549675ff097e24122166fac69d9fc610ec24ce0aa657bdea632bfaa SHA512 4258654bd418f8e6a7c5ea802287434b9131aa9a72fe6d725ad91d709cf2b02f6e6e6837dddfda14995f9e2bc4e3563919904b2d312ae845777ba972eeb264b1 MISC metadata.xml 744 BLAKE2B 6c23644af7f970c93a3c3bd1fd1bf82e5290832afac427bec1da93bfd2694799f779bdce3f51742a171218d6e29460a4986452426ab2239ad8ab6627dc45b81d SHA512 06df1d728d39b92384bdd026d0339a494ce1fe3966376a413a80f8dd85bedd5e5d843db9cdd60a9ab29857b79d5a24de24de2330aab70916a0e57acfc01a2e5d diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild deleted file mode 100644 index d2a13b5804d9..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -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, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild deleted file mode 100644 index d2a13b5804d9..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.7.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -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, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - # bash as a tepmorary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild deleted file mode 100644 index d73ee523de14..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1-r1.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit bash-completion-r1 python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/0" # libbtrfs soname -IUSE="+convert +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 - ) - ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - 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? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" -} - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - : # Prevent python-any-r1_python_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - local AT_M4DIR=config - eautoreconf - - 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 - --disable-python - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable static-libs static) - $(use_enable udev libudev) - $(use_enable zstd) - - # Could support libgcrypt, libsodium, libkcapi, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - if use man; then - python_setup - fi - - # bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test -} - -src_install() { - local makeargs=( - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild deleted file mode 100644 index d91dc0aada03..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.8.1.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 python-single-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/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 ) python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - dev-python/sphinx-rtd-theme - ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - return - fi - - if in_iuse verify-sig && use verify-sig ; then - mkdir "${T}"/verify-sig || die - pushd "${T}"/verify-sig &>/dev/null || die - - # Upstream sign the decompressed .tar - # Let's do it separately in ${T} then cleanup to avoid external - # effects on normal unpack. - cp "${DISTDIR}"/${MY_P}.tar.xz . || die - xz -d ${MY_P}.tar.xz || die - verify-sig_verify_detached ${MY_P}.tar "${DISTDIR}"/${MY_P}.tar.sign - - popd &>/dev/null || die - rm -r "${T}"/verify-sig || die - fi - - default -} - -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, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - # bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild deleted file mode 100644 index b4d9a3171bef..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit bash-completion-r1 python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/0" # libbtrfs soname -IUSE="+convert +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 - ) - ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - 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? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" -} - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - : # Prevent python-any-r1_python_setup -} - -if [[ ${PV} != 9999 ]]; then - src_unpack() { - # Upstream sign the decompressed .tar - if use verify-sig; then - einfo "Unpacking ${MY_P}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ - < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) - assert "Unpack failed" - else - default - fi - } -fi - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - local AT_M4DIR=config - eautoreconf - - 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 - --disable-python - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable static-libs static) - $(use_enable udev libudev) - $(use_enable zstd) - - # Could support libgcrypt, libsodium, libkcapi, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - if use man; then - python_setup - fi - - # bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test -} - -src_install() { - local makeargs=( - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild deleted file mode 100644 index e9d020c16019..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.9.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 2008-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit bash-completion-r1 python-any-r1 udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -else - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dsterba.asc - inherit verify-sig - - MY_PV="v${PV/_/-}" - MY_P="${PN}-${MY_PV}" - SRC_URI=" - https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz - verify-sig? ( https://mirrors.edge.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.sign ) - " - S="${WORKDIR}"/${PN}-${MY_PV} - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - fi -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/0" # libbtrfs soname -IUSE="+convert +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 - ) - ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - 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? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - python_has_version "dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]" -} - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -else - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-dsterba )" -fi - -pkg_setup() { - : # Prevent python-any-r1_python_setup -} - -if [[ ${PV} != 9999 ]]; then - src_unpack() { - # Upstream sign the decompressed .tar - if use verify-sig; then - einfo "Unpacking ${MY_P}.tar.xz ..." - verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \ - < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) - assert "Unpack failed" - else - default - fi - } -fi - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - local AT_M4DIR=config - eautoreconf - - 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 - --disable-python - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable static-libs static) - $(use_enable udev libudev) - $(use_enable zstd) - - # Could support libgcrypt, libsodium, libkcapi, openssl, botan - --with-crypto=builtin - --with-convert=ext2$(usev reiserfs ',reiserfs') - ) - - export EXTRA_PYTHON_CFLAGS="${CFLAGS}" - export EXTRA_PYTHON_LDFLAGS="${LDFLAGS}" - - if use man; then - python_setup - fi - - # bash as a temporary workaround for https://github.com/kdave/btrfs-progs/pull/721 - CONFIG_SHELL="${BROOT}"/bin/bash econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake V=1 -j1 -C tests test -} - -src_install() { - local makeargs=( - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/nilfs-utils/Manifest b/sys-fs/nilfs-utils/Manifest index d3d03ed83466..fac38febdad2 100644 --- a/sys-fs/nilfs-utils/Manifest +++ b/sys-fs/nilfs-utils/Manifest @@ -1,3 +1,3 @@ DIST nilfs-utils-2.2.9.tar.bz2 439514 BLAKE2B 0908e0180a2af074e97be99fa0a390e926e934fea79a40d792fc0dc1ef820c4a4ecee3696ddaf0d8f8d5c434daed77ea66f37591b05f7a6437e9a3c1a12f5758 SHA512 dd8ab20ee0d6750a6d81f86fe4d1ad94a8a71aa53ee7cd38550ea32fffcc9527db1c75d34f732f0f8f6379a808249f8eec2619e54c595566a3fc434a87d9e66d -EBUILD nilfs-utils-2.2.9.ebuild 1059 BLAKE2B 9cc9c5a2defe05ca67bf993f7259bf723bebd9816c149ceda57805d21c42309ad90ca84d2886d36a3e116a3c2e43565d61e7aa29882df363ce9481dd2f61cfcd SHA512 a2313725f9e41ed5acb238d6b2e920622180a895e28dd2038d57e59734f40d5cc4e5677208aedabbc3a82476f10d9b27c826536a05f4e29235caf0bb1b443730 +EBUILD nilfs-utils-2.2.9.ebuild 1061 BLAKE2B 919f841b744b769eb6aadab800a50c69c6df43ae0902bef2ec25bd6596796982a3748e0360c863cb65a0ac73fbb65e22611ec577b55c96178dc38103f597b71e SHA512 24ffd906fbcdbf952e145469b29aaf997aa7d74de8c4bac9cbdfc736b607d9ab7f4707004d90e160dd15a1eee8c4fd63501a729736a7a908b647d03fbac55960 MISC metadata.xml 1208 BLAKE2B 5164f144bb71bd558a24bb0b7030bc109a4ed6ea2e5ee8ade9b10ed28ea85db5426d9a7b07559f63756274459f3f82c48f011d1887d40c6749c48d29ae0e7eb9 SHA512 e1e742daa9b7fa4c082c6e5b7ce3a42dbf260a11e7ef9103c1f083a9788a0dc2f9667edb0ae758f46cf8100a0bdc06a0111e011a92fc567b39de3a70e3022893 diff --git a/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild index ed1cb42de5ec..619f6eda8978 100644 --- a/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild +++ b/sys-fs/nilfs-utils/nilfs-utils-2.2.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,8 +6,8 @@ EAPI=8 inherit linux-info usr-ldscript DESCRIPTION="A New Implementation of a Log-structured File System for Linux" -HOMEPAGE="http://nilfs.sourceforge.net/" -SRC_URI="http://nilfs.sourceforge.net/download/${P}.tar.bz2" +HOMEPAGE="https://nilfs.sourceforge.net/" +SRC_URI="https://nilfs.sourceforge.net/download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 4a08b9e17c17..a687f9a74c3e 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -1,20 +1,10 @@ -AUX 0001-Remove-use-of-LFS64-interfaces.patch 15619 BLAKE2B 9d2dfa2e81182466b81bdee612649145a20900497ed25886320564ef0798e7e381ceb23d84ff7a958ca68d72a681ed33af89a0cca59daf359c5c9df3039e3310 SHA512 0a4485e85041e276462de91c70708748acc98caf82aea0f4baddb18393b8cedce15c5cc4b04ae09656da32f2219be900ce1c7516705994bc8629685ac5229c97 -AUX 0002-io-Adapt-to-64-bit-time_t.patch 1641 BLAKE2B 51a74717f974b24543e8a9151a0b0dcda59a01acd7620f5d00bf3659899ac6cb1b7bc481b5c32aac9482f72932a2ec377980fd4c71d73689a6e1f4cc7f3cb188 SHA512 66794967658cf6406240cef596c4e64c71eaf9bbe4091a94e236170fe17b4045e95d1627a65a973aa77cce9032fff9a933d19e11669440661dd99c713dc6dad5 -AUX 0003-build-Request-64-bit-time_t-where-possible.patch 1297 BLAKE2B 2e2a379aef0fc803cfb319919f19c51917e2084fe13ad72f9c62f97cd7561a0262fd192cc7625a0ac52c9bbc4611eb31e61984edfb1b52788fa2346f236eb56b SHA512 022267f15c044d595b6a52e91e0802b98ae2f3b4b8b921b64fc79dadec498473f3053ba19c6fb44766fe4ff8bdd85df577c77030523524c8079ed47e4d06bd51 AUX xfsprogs-5.18.0-docdir.patch 278 BLAKE2B 5277fff17f26b4da946535a430878bfe1e91f92f41c44f2eaaac80703d58176f8d15e14f0586fcf23f29ce207f193303dc662ae5cca6877d6eca9f5ae698620f SHA512 0a94f24b292bece9786bceb99100c25b6d697b9ecf1566bb52b8266683e3adaee415bf7d79c81eed7f2adf846f982f3d91122c9a6dcbb7e16231983037fe9cae AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa AUX xfsprogs-6.10.0-c++-void.patch 1651 BLAKE2B dafb054348f0b2362976d74c55821a2440ac98a80197af532facb4b65bb8947fa77ec52795b90a58196b77778078b2bf887b7b9d05d420c26193c8e63b98fe4d SHA512 09df6b846621c0bea65628e38c286935eb1fc2d7d1a3a08877c3121cc012df9345a53dc12e4ec43785500d890767d02e5e9ba144c2bfb67d2bf5812ba2987bcf -AUX xfsprogs-6.7.0-fix-porting-to-6.7.patch 6103 BLAKE2B 4dae3812b6c40892ed7a8605cd46f117997c4dcf0d02c2402670c5294a2e5d6a0cac11743d90b0578d7544906d1d25da7ca6da6baf2cae76a995b8acad734cd1 SHA512 36b576afe505173f71b4848c064e6b9a4031ec831df32cf3b9726544941408a03a8f64cdd3aedfb9a264213705850e72258cef6ab542c4278c087f338d8d5905 DIST xfsprogs-6.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce -DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a48f0b6d4a978f9e5d43960e99b54cab3e0c2cd4147a3d8f4944e50876063fc571441c8239d6deaaa01604843a6b SHA512 831e7747640bc2964b182226d8bb6f637610b123aeec9b3cb97a5de5d5b65bde30c6b40ad2e78de6a5214e823dd75de3a2bdfddd8ab1638f5c7340a760c91b3f -DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da -DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74 DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023 EBUILD xfsprogs-6.10.0-r2.ebuild 2865 BLAKE2B 38543524654aa12b2167610fff0e483dd1a8107b7aeac383012b2ceead4f1f902abc303fa0ed3912cb5fbc7f06c849f10ec3a7818e5b9f21d0f762327edf5064 SHA512 71b632bdd1e017be85b557d02d6f34b395acad754fcedd08c1362ff903e40cff3174142905fa85c14a93d5c79ecede57f1dc3fb09d328c97d124f33a244b5201 -EBUILD xfsprogs-6.4.0.ebuild 2414 BLAKE2B b71c91b69eb958bda96f1eea3feed717576397a214343c7474c8530ee7f60c0ca10260d98adf9ba3bc40d46498d1fd13bd71e216a52af08790e66d6d2498d6e0 SHA512 69a5eec472d87155e9343e7a9de65a65e15de3b5d4c831fd43636aa54a6435b708342d93cc4d93b132710db08446b3aab37ae75d37497a2ee8736e12c050a83e -EBUILD xfsprogs-6.6.0-r1.ebuild 2668 BLAKE2B 4339af42004b2078553e75cdd1861d840100c7b260218a6c422083cd6e3a4a68bd3c4e304fa5792fe8826fc5ea0067830bd22342e6d7870d1e3ffe0367ffe0c0 SHA512 ddd6f21ea3c07e2d7a8ccfd5005ce45cb69b494ad82a03b844b64556f54a72c2192658e0d3a3c814dc8e8857faf432345689cf7b98c4cefd76294894defa416b -EBUILD xfsprogs-6.7.0-r3.ebuild 2655 BLAKE2B 631390af82f532fff724e54110881e7cad750318a2257e4f65200f47316e03a718d9c88ce5b33532dd37ec968df5060d44c4796d4fc909fbbb7eac15226d6f2e SHA512 6c72ab4b71f401805d61d0e1712ba7a59e0704857e92a0757f3a2818e3888dc42174138b1d531cc054fce02304c3c7f4a4f0358ce18d033da05aabf70df7fff9 -EBUILD xfsprogs-6.8.0.ebuild 2596 BLAKE2B 768cc65ca0712dbf15104efdf6b6f8e4be233683fad13bda533e8afa1fe1bc9cbd6b5ddb04506cadc8fffb880827acc2813d64f4fc09fe28c020563959378e9d SHA512 640ae8923f2450465aa9da82d76f48517df38a07c2dac2c31f3c3f48462ee608bbeffc4286eeb0993135a1d83f9dab647cb53b204b6d172c73df5dc322b47f14 +EBUILD xfsprogs-6.8.0.ebuild 2595 BLAKE2B da9123e8ef23bb5988cd10ac161f7bce2ee7545c8e0265de752de0dce5c02aca6e2070a3c391e89b9d744d5e8279a8fcc4000abd44237914c0e3c08fa32fffb6 SHA512 d961b90d06f72b626506901fd3eed50fe73c9d819d09f66532a70b97292bd725ce0a08615b87d49ff59a89acf5fd756430236a784fcffe3a283a29de2b750cf8 EBUILD xfsprogs-6.9.0.ebuild 2603 BLAKE2B 1eea90b91949f344a37ea52e033b18ef626d2aadaf45069e126830061770374b32ebd9c9d4b236b21f092ff65160081a711d750bc54b15fdd1f47fd5e29c654f SHA512 7e79fb75397eb4a0c4c048d70eb52d24271a3f34c7dd80bdd5f8ec689de34eb4888d3bb0c7b9fa190255567d9e5632286e1495056662208b7ce49cafd26bb03b MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch b/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch deleted file mode 100644 index a0b32f714d9c..000000000000 --- a/sys-fs/xfsprogs/files/0001-Remove-use-of-LFS64-interfaces.patch +++ /dev/null @@ -1,652 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From a162f061dc8c2145ae006461d661a03e986c4bf7 Mon Sep 17 00:00:00 2001 -From: Violet Purcell <vimproved@inventati.org> -Date: Sat, 22 Jul 2023 21:12:59 -0400 -Subject: [PATCH 1/3] Remove use of LFS64 interfaces - -LFS64 interfaces are non-standard and are being removed in the upcoming musl -1.2.5. Setting _FILE_OFFSET_BITS=64 (which is currently being done) makes all -interfaces on glibc 64-bit by default, so using the LFS64 interfaces is -redundant. This commit replaces all occurences of off64_t with off_t, -stat64 with stat, and fstat64 with fstat. - -Link: https://bugs.gentoo.org/907039 -Cc: Felix Janda <felix.janda@posteo.de> -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Violet Purcell <vimproved@inventati.org> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/copy/xfs_copy.c -+++ b/copy/xfs_copy.c -@@ -881,7 +881,7 @@ main(int argc, char **argv) - } - } else { - char *lb = memalign(wbuf_align, XFS_MAX_SECTORSIZE); -- off64_t off; -+ off_t off; - ssize_t len; - - /* ensure device files are sufficiently large */ ---- a/fsr/xfs_fsr.c -+++ b/fsr/xfs_fsr.c -@@ -1148,7 +1148,7 @@ packfile(char *fname, char *tname, int fd, - struct dioattr dio; - static xfs_swapext_t sx; - struct xfs_flock64 space; -- off64_t cnt, pos; -+ off_t cnt, pos; - void *fbuf = NULL; - int ct, wc, wc_b4; - char ffname[SMBUFSZ]; ---- a/io/bmap.c -+++ b/io/bmap.c -@@ -257,7 +257,7 @@ bmap_f( - #define FLG_BSW 0000010 /* Not on begin of stripe width */ - #define FLG_ESW 0000001 /* Not on end of stripe width */ - int agno; -- off64_t agoff, bbperag; -+ off_t agoff, bbperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w; - char rbuf[32], bbuf[32], abuf[32]; - int sunit, swidth; -@@ -267,8 +267,8 @@ bmap_f( - if (is_rt) - sunit = swidth = bbperag = 0; - else { -- bbperag = (off64_t)fsgeo.agblocks * -- (off64_t)fsgeo.blocksize / BBSIZE; -+ bbperag = (off_t)fsgeo.agblocks * -+ (off_t)fsgeo.blocksize / BBSIZE; - sunit = (fsgeo.sunit * fsgeo.blocksize) / BBSIZE; - swidth = (fsgeo.swidth * fsgeo.blocksize) / BBSIZE; - } ---- a/io/copy_file_range.c -+++ b/io/copy_file_range.c -@@ -54,7 +54,7 @@ copy_file_range_cmd(int fd, long long *src_off, long long *dst_off, size_t len) - return 0; - } - --static off64_t -+static off_t - copy_src_filesize(int fd) - { - struct stat st; -@@ -154,7 +154,7 @@ copy_range_f(int argc, char **argv) - } - - if (!len_specified) { -- off64_t sz; -+ off_t sz; - - sz = copy_src_filesize(fd); - if (sz < 0 || (unsigned long long)sz > SIZE_MAX) { ---- a/io/cowextsize.c -+++ b/io/cowextsize.c -@@ -50,10 +50,10 @@ static int - set_cowextsize(const char *path, int fd, long extsz) - { - struct fsxattr fsx; -- struct stat64 stat; -+ struct stat stat; - -- if (fstat64(fd, &stat) < 0) { -- perror("fstat64"); -+ if (fstat(fd, &stat) < 0) { -+ perror("fstat"); - exitcode = 1; - return 0; - } ---- a/io/fadvise.c -+++ b/io/fadvise.c -@@ -39,7 +39,7 @@ fadvise_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, range = 0, advise = POSIX_FADV_NORMAL; - - while ((c = getopt(argc, argv, "dnrsw")) != EOF) { ---- a/io/fiemap.c -+++ b/io/fiemap.c -@@ -234,9 +234,9 @@ fiemap_f( - int tot_w = 5; /* 5 since its just one number */ - int flg_w = 5; - __u64 last_logical = 0; /* last extent offset handled */ -- off64_t start_offset = 0; /* mapping start */ -- off64_t length = -1LL; /* mapping length */ -- off64_t range_end = -1LL; /* mapping end*/ -+ off_t start_offset = 0; /* mapping start */ -+ off_t length = -1LL; /* mapping length */ -+ off_t range_end = -1LL; /* mapping end*/ - size_t fsblocksize, fssectsize; - struct stat st; - ---- a/io/fsmap.c -+++ b/io/fsmap.c -@@ -170,7 +170,7 @@ dump_map_verbose( - unsigned long long i; - struct fsmap *p; - int agno; -- off64_t agoff, bperag; -+ off_t agoff, bperag; - int foff_w, boff_w, aoff_w, tot_w, agno_w, own_w; - int nr_w, dev_w; - char rbuf[40], bbuf[40], abuf[40], obuf[40]; -@@ -183,8 +183,8 @@ dump_map_verbose( - dev_w = 3; - nr_w = 4; - tot_w = MINTOT_WIDTH; -- bperag = (off64_t)fsgeo->agblocks * -- (off64_t)fsgeo->blocksize; -+ bperag = (off_t)fsgeo->agblocks * -+ (off_t)fsgeo->blocksize; - sunit = (fsgeo->sunit * fsgeo->blocksize); - swidth = (fsgeo->swidth * fsgeo->blocksize); - ---- a/io/io.h -+++ b/io/io.h -@@ -53,7 +53,7 @@ extern int stat_f(int argc, char **argv); - typedef struct mmap_region { - void *addr; /* address of start of mapping */ - size_t length; /* length of mapping */ -- off64_t offset; /* start offset into backing file */ -+ off_t offset; /* start offset into backing file */ - int prot; /* protection mode of the mapping */ - int flags; /* MAP_* flags passed to mmap() */ - char *name; /* name of backing file */ -@@ -63,13 +63,13 @@ extern mmap_region_t *maptable; /* mmap'd region array */ - extern int mapcount; /* #entries in the mapping table */ - extern mmap_region_t *mapping; /* active mapping table entry */ - extern int maplist_f(void); --extern void *check_mapping_range(mmap_region_t *, off64_t, size_t, int); -+extern void *check_mapping_range(mmap_region_t *, off_t, size_t, int); - - /* - * Various xfs_io helper routines/globals - */ - --extern off64_t filesize(void); -+extern off_t filesize(void); - extern int openfile(char *, struct xfs_fsop_geom *, int, mode_t, - struct fs_path *); - extern int addfile(char *, int , struct xfs_fsop_geom *, int, -@@ -84,9 +84,9 @@ extern size_t io_buffersize; - extern int vectors; - extern struct iovec *iov; - extern int alloc_buffer(size_t, int, unsigned int); --extern int read_buffer(int, off64_t, long long, long long *, -+extern int read_buffer(int, off_t, long long, long long *, - int, int); --extern void dump_buffer(off64_t, ssize_t); -+extern void dump_buffer(off_t, ssize_t); - - extern void attr_init(void); - extern void bmap_init(void); ---- a/io/madvise.c -+++ b/io/madvise.c -@@ -39,7 +39,7 @@ madvise_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - void *start; - int advise = MADV_NORMAL, c; ---- a/io/mincore.c -+++ b/io/mincore.c -@@ -17,7 +17,7 @@ mincore_f( - int argc, - char **argv) - { -- off64_t offset, llength; -+ off_t offset, llength; - size_t length; - size_t blocksize, sectsize; - void *start; ---- a/io/mmap.c -+++ b/io/mmap.c -@@ -63,11 +63,11 @@ print_mapping( - void * - check_mapping_range( - mmap_region_t *map, -- off64_t offset, -+ off_t offset, - size_t length, - int pagealign) - { -- off64_t relative; -+ off_t relative; - - if (offset < mapping->offset) { - printf(_("offset (%lld) is before start of mapping (%lld)\n"), -@@ -155,7 +155,8 @@ mmap_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; -+ - ssize_t length = 0, length2 = 0; - void *address = NULL; - char *filename; -@@ -308,7 +309,7 @@ msync_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - ssize_t length; - void *start; - int c, flags = 0; -@@ -401,7 +402,7 @@ mread_f( - int argc, - char **argv) - { -- off64_t offset, tmp, dumpoffset, printoffset; -+ off_t offset, tmp, dumpoffset, printoffset; - ssize_t length; - size_t dumplen, cnt = 0; - char *bp; -@@ -566,7 +567,7 @@ mwrite_f( - int argc, - char **argv) - { -- off64_t offset, tmp; -+ off_t offset, tmp; - ssize_t length; - void *start; - char *sp; ---- a/io/pread.c -+++ b/io/pread.c -@@ -116,7 +116,7 @@ alloc_buffer( - static void - __dump_buffer( - void *buf, -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, j; -@@ -141,7 +141,7 @@ __dump_buffer( - - void - dump_buffer( -- off64_t offset, -+ off_t offset, - ssize_t len) - { - int i, l; -@@ -164,7 +164,7 @@ dump_buffer( - static ssize_t - do_preadv( - int fd, -- off64_t offset, -+ off_t offset, - long long count) - { - int vecs = 0; -@@ -199,7 +199,7 @@ do_preadv( - static ssize_t - do_pread( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size) - { -@@ -212,13 +212,13 @@ do_pread( - static int - read_random( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - unsigned int seed, - int eof) - { -- off64_t end, off, range; -+ off_t end, off, range; - ssize_t bytes; - int ops = 0; - -@@ -259,12 +259,12 @@ read_random( - static int - read_backward( - int fd, -- off64_t *offset, -+ off_t *offset, - long long *count, - long long *total, - int eof) - { -- off64_t end, off = *offset; -+ off_t end, off = *offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -319,7 +319,7 @@ read_backward( - static int - read_forward( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -353,7 +353,7 @@ read_forward( - int - read_buffer( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int verbose, -@@ -368,7 +368,7 @@ pread_f( - char **argv) - { - size_t bsize; -- off64_t offset; -+ off_t offset; - unsigned int zeed = 0; - long long count, total, tmp; - size_t fsblocksize, fssectsize; ---- a/io/pwrite.c -+++ b/io/pwrite.c -@@ -54,7 +54,7 @@ pwrite_help(void) - static ssize_t - do_pwritev( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - int pwritev2_flags) - { -@@ -97,7 +97,7 @@ do_pwritev( - static ssize_t - do_pwrite( - int fd, -- off64_t offset, -+ off_t offset, - long long count, - size_t buffer_size, - int pwritev2_flags) -@@ -110,13 +110,13 @@ do_pwrite( - - static int - write_random( -- off64_t offset, -+ off_t offset, - long long count, - unsigned int seed, - long long *total, - int pwritev2_flags) - { -- off64_t off, range; -+ off_t off, range; - ssize_t bytes; - int ops = 0; - -@@ -155,12 +155,12 @@ write_random( - - static int - write_backward( -- off64_t offset, -+ off_t offset, - long long *count, - long long *total, - int pwritev2_flags) - { -- off64_t end, off = offset; -+ off_t end, off = offset; - ssize_t bytes = 0, bytes_requested; - long long cnt = *count; - int ops = 0; -@@ -214,11 +214,11 @@ write_backward( - - static int - write_buffer( -- off64_t offset, -+ off_t offset, - long long count, - size_t bs, - int fd, -- off64_t skip, -+ off_t skip, - long long *total, - int pwritev2_flags) - { -@@ -253,7 +253,7 @@ write_buffer( - - static int - write_once( -- off64_t offset, -+ off_t offset, - long long count, - long long *total, - int pwritev2_flags) -@@ -275,7 +275,7 @@ pwrite_f( - char **argv) - { - size_t bsize; -- off64_t offset, skip = 0; -+ off_t offset, skip = 0; - long long count, total, tmp; - unsigned int zeed = 0, seed = 0xcdcdcdcd; - size_t fsblocksize, fssectsize; ---- a/io/reflink.c -+++ b/io/reflink.c -@@ -98,7 +98,7 @@ dedupe_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count, total; - char *infile; - int condensed, quiet_flag; -@@ -226,7 +226,7 @@ reflink_f( - int argc, - char **argv) - { -- off64_t soffset, doffset; -+ off_t soffset, doffset; - long long count = 0, total; - char *infile = NULL; - int condensed, quiet_flag; ---- a/io/seek.c -+++ b/io/seek.c -@@ -63,8 +63,8 @@ static void - seek_output( - int startflag, - char *type, -- off64_t start, -- off64_t offset) -+ off_t start, -+ off_t offset) - { - if (offset == -1) { - if (errno == ENXIO) { -@@ -92,7 +92,7 @@ seek_f( - int argc, - char **argv) - { -- off64_t offset, start; -+ off_t offset, start; - size_t fsblocksize, fssectsize; - int c; - int current; /* specify data or hole */ ---- a/io/sendfile.c -+++ b/io/sendfile.c -@@ -34,12 +34,12 @@ sendfile_help(void) - - static int - send_buffer( -- off64_t offset, -+ off_t offset, - size_t count, - int fd, - long long *total) - { -- off64_t off = offset; -+ off_t off = offset; - ssize_t bytes, bytes_remaining = count; - int ops = 0; - -@@ -66,7 +66,7 @@ sendfile_f( - int argc, - char **argv) - { -- off64_t offset = 0; -+ off_t offset = 0; - long long count, total; - size_t blocksize, sectsize; - struct timeval t1, t2; ---- a/io/stat.c -+++ b/io/stat.c -@@ -21,7 +21,7 @@ static cmdinfo_t stat_cmd; - static cmdinfo_t statfs_cmd; - static cmdinfo_t statx_cmd; - --off64_t -+off_t - filesize(void) - { - struct stat st; ---- a/io/sync_file_range.c -+++ b/io/sync_file_range.c -@@ -30,7 +30,7 @@ sync_range_f( - int argc, - char **argv) - { -- off64_t offset = 0, length = 0; -+ off_t offset = 0, length = 0; - int c, sync_mode = 0; - size_t blocksize, sectsize; - ---- a/io/truncate.c -+++ b/io/truncate.c -@@ -16,7 +16,7 @@ truncate_f( - int argc, - char **argv) - { -- off64_t offset; -+ off_t offset; - size_t blocksize, sectsize; - - init_cvtnum(&blocksize, §size); ---- a/libxfs/rdwr.c -+++ b/libxfs/rdwr.c -@@ -576,7 +576,7 @@ libxfs_balloc( - - - static int --__read_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__read_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -638,7 +638,7 @@ libxfs_readbufr_map(struct xfs_buftarg *btp, struct xfs_buf *bp, int flags) - - buf = bp->b_addr; - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - error = __read_buf(fd, buf, len, offset, flags); -@@ -797,7 +797,7 @@ err: - } - - static int --__write_buf(int fd, void *buf, int len, off64_t offset, int flags) -+__write_buf(int fd, void *buf, int len, off_t offset, int flags) - { - int sts; - -@@ -863,7 +863,7 @@ libxfs_bwrite( - void *buf = bp->b_addr; - - for (i = 0; i < bp->b_nmaps; i++) { -- off64_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); -+ off_t offset = LIBXFS_BBTOOFF64(bp->b_maps[i].bm_bn); - int len = BBTOB(bp->b_maps[i].bm_len); - - bp->b_error = __write_buf(fd, buf, len, offset, ---- a/mdrestore/xfs_mdrestore.c -+++ b/mdrestore/xfs_mdrestore.c -@@ -160,7 +160,7 @@ verify_device_size( - } else { - /* ensure device is sufficiently large enough */ - char lb[XFS_MAX_SECTORSIZE] = { 0 }; -- off64_t off; -+ off_t off; - - off = nr_blocks * blocksize - sizeof(lb); - if (pwrite(dev_fd, lb, sizeof(lb), off) < 0) ---- a/repair/prefetch.c -+++ b/repair/prefetch.c -@@ -475,7 +475,7 @@ pf_batch_read( - { - struct xfs_buf *bplist[MAX_BUFS]; - unsigned int num; -- off64_t first_off, last_off, next_off; -+ off_t first_off, last_off, next_off; - int len, size; - int i; - int inode_bufs; ---- a/scrub/spacemap.c -+++ b/scrub/spacemap.c -@@ -97,11 +97,11 @@ scan_ag_rmaps( - struct scrub_ctx *ctx = (struct scrub_ctx *)wq->wq_ctx; - struct scan_blocks *sbx = arg; - struct fsmap keys[2]; -- off64_t bperag; -+ off_t bperag; - int ret; - -- bperag = (off64_t)ctx->mnt.fsgeom.agblocks * -- (off64_t)ctx->mnt.fsgeom.blocksize; -+ bperag = (off_t)ctx->mnt.fsgeom.agblocks * -+ (off_t)ctx->mnt.fsgeom.blocksize; - - memset(keys, 0, sizeof(struct fsmap) * 2); - keys->fmr_device = ctx->fsinfo.fs_datadev; ---- a/spaceman/freesp.c -+++ b/spaceman/freesp.c -@@ -62,7 +62,7 @@ static void - addtohist( - xfs_agnumber_t agno, - xfs_agblock_t agbno, -- off64_t len) -+ off_t len) - { - long i; - -@@ -152,7 +152,7 @@ scan_ag( - struct fsmap *l, *h; - struct fsmap *p; - struct xfs_fd *xfd = &file->xfd; -- off64_t aglen; -+ off_t aglen; - xfs_agblock_t agbno; - unsigned long long freeblks = 0; - unsigned long long freeexts = 0; ---- a/spaceman/trim.c -+++ b/spaceman/trim.c -@@ -26,7 +26,7 @@ trim_f( - struct xfs_fd *xfd = &file->xfd; - struct xfs_fsop_geom *fsgeom = &xfd->fsgeom; - xfs_agnumber_t agno = 0; -- off64_t offset = 0; -+ off_t offset = 0; - ssize_t length = 0; - ssize_t minlen = 0; - int aflag = 0; --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch b/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch deleted file mode 100644 index 405f2eb8a288..000000000000 --- a/sys-fs/xfsprogs/files/0002-io-Adapt-to-64-bit-time_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From 37495c1600002551badb5eb16ff244b0c5ffd3b0 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Fri, 15 Dec 2023 00:40:26 +0000 -Subject: [PATCH 2/3] io: Adapt to >= 64-bit time_t - -We now require (at least) 64-bit time_t, so we need to adjust some printf -specifiers accordingly. - -Unfortunately, we've stumbled upon a ridiculous C mmoment whereby there's -no neat format specifier (not even one of the inttypes ones) for time_t, so -we cast to intmax_t and use %jd. - -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/io/stat.c -+++ b/io/stat.c -@@ -66,11 +66,11 @@ dump_raw_stat(struct stat *st) - printf("stat.ino = %llu\n", (unsigned long long)st->st_ino); - printf("stat.size = %lld\n", (long long)st->st_size); - printf("stat.blocks = %lld\n", (long long)st->st_blocks); -- printf("stat.atime.tv_sec = %ld\n", st->st_atim.tv_sec); -+ printf("stat.atime.tv_sec = %jd\n", (intmax_t)st->st_atim.tv_sec); - printf("stat.atime.tv_nsec = %ld\n", st->st_atim.tv_nsec); -- printf("stat.ctime.tv_sec = %ld\n", st->st_ctim.tv_sec); -+ printf("stat.ctime.tv_sec = %jd\n", (intmax_t)st->st_ctim.tv_sec); - printf("stat.ctime.tv_nsec = %ld\n", st->st_ctim.tv_nsec); -- printf("stat.mtime.tv_sec = %ld\n", st->st_mtim.tv_sec); -+ printf("stat.mtime.tv_sec = %jd\n", (intmax_t)st->st_mtim.tv_sec); - printf("stat.mtime.tv_nsec = %ld\n", st->st_mtim.tv_nsec); - printf("stat.rdev_major = %u\n", major(st->st_rdev)); - printf("stat.rdev_minor = %u\n", minor(st->st_rdev)); --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch b/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch deleted file mode 100644 index 21c2d07821e8..000000000000 --- a/sys-fs/xfsprogs/files/0003-build-Request-64-bit-time_t-where-possible.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://lore.kernel.org/linux-xfs/20240205232343.2162947-1-sam@gentoo.org/ - -From 98e6a32ebe3b1b0e643c27f1bbee0058c9edc047 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 11 Nov 2023 08:22:22 +0000 -Subject: [PATCH 3/3] build: Request 64-bit time_t where possible - -Suggested by Darrick during LFS review. We take the same approach as in -5c0599b721d1d232d2e400f357abdf2736f24a97 ('Fix building xfsprogs on 32-bit platforms') -to avoid autoconf hell - just take the tried & tested approach which is working -fine for us with LFS already. - -Reviewed-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Signed-off-by: Sam James <sam@gentoo.org> ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -13,8 +13,8 @@ OPTIMIZER = @opt_build@ - MALLOCLIB = @malloc_lib@ - LOADERFLAGS = @LDFLAGS@ - LTLDFLAGS = @LDFLAGS@ --CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -Wno-address-of-packed-member --BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 -+CFLAGS = @CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 -Wno-address-of-packed-member -+BUILD_CFLAGS = @BUILD_CFLAGS@ -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64 - - # make sure we don't pick up whacky LDFLAGS from the make environment and - # only use what we calculate from the configured options above. --- -2.43.0 - diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch b/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch deleted file mode 100644 index fcc30d170a8c..000000000000 --- a/sys-fs/xfsprogs/files/xfsprogs-6.7.0-fix-porting-to-6.7.patch +++ /dev/null @@ -1,157 +0,0 @@ -https://lore.kernel.org/linux-xfs/171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs/ - -From mboxrd@z Thu Jan 1 00:00:00 1970 -Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80EBA128387 - for <linux-xfs@vger.kernel.org>; Tue, 26 Mar 2024 02:59:42 +0000 (UTC) -Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 -ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; - t=1711421982; cv=none; b=BWaXePO42YIrz9dUA7DXc3SL5MWIoC+liDfJkd/1AM/cv7gR6JRGHa5e5W3sXZFsI6S6pH/fKSEijUigTR0kiRGPFWbeCiDWEGQdq6y4AChFbZMTfQSg4Jei7pONholMK08CyBQ/K4UutICyqbos2cdxAGKKjNPTIOtdQdkiHdc= -ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; - s=arc-20240116; t=1711421982; c=relaxed/simple; - bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=; - h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: - MIME-Version:Content-Type; b=O5h4CVWF9TsE/Yho55MGUjmR7zhvoPO0EhXK59BWm/HSUFB3D7vD+ozThDlpENzz0iLrKzdR6aPYBS78cRpOzAszO4ZnMf0HPbFlLmlsIHK/ha5XFPO2qrmLgOGUkKKZepgXIROIA9knDYpxuvlWHnOptPf9birJvyR0gztAEyw= -ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dkgsPgmY; arc=none smtp.client-ip=10.30.226.201 -Authentication-Results: smtp.subspace.kernel.org; - dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dkgsPgmY" -Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A482C433C7; - Tue, 26 Mar 2024 02:59:42 +0000 (UTC) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; - s=k20201202; t=1711421982; - bh=qfMP8tvVLZAoDkRmqI3ZwhMEx6csbe2+Xclngz+n+GI=; - h=Date:Subject:From:To:Cc:In-Reply-To:References:From; - b=dkgsPgmYjqxxC1yEflpaDSaicJ6J1MpL6wH2GNkbwb7jHMXma/nM8+TuJ7ITuHQGY - WXTMKAQFvTq29s+IWJaQZtuCfgH6cDQ3JTkRcjvg/OgSTo0X+aqxadBBnAjO4AP5/P - hX4gszw3hlZ8oDjMvW9Wl6nLyDmR82rshZOTF4hZfQ8mkbU3Vzcsg2QiPQQzzKgfon - 3c/GxXIQ7V2jg37MBrPpNRYPvqBXWn1X/EkR0wuFiUtw9fTJ6Wyt0Vr6/vemAf2U+S - gwHkISopsTOE3k8cCYYf7LXqmtU3PLOOqWBDol6TkWe6OgIOMSljoytIkFq1up/zhz - LHrtnfD5yRlLg== -Date: Mon, 25 Mar 2024 19:59:41 -0700 -Subject: [PATCH 01/13] libxfs: fix incorrect porting to 6.7 -From: "Darrick J. Wong" <djwong@kernel.org> -To: cem@kernel.org, djwong@kernel.org -Cc: Christoph Hellwig <hch@lst.de>, Bill O'Donnell <bodonnel@redhat.com>, - linux-xfs@vger.kernel.org -Message-ID: <171142126323.2211955.1239989461209318080.stgit@frogsfrogsfrogs> -In-Reply-To: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs> -References: <171142126291.2211955.14829143192552278353.stgit@frogsfrogsfrogs> -User-Agent: StGit/0.19 -Precedence: bulk -X-Mailing-List: linux-xfs@vger.kernel.org -List-Id: <linux-xfs.vger.kernel.org> -List-Subscribe: <mailto:linux-xfs+subscribe@vger.kernel.org> -List-Unsubscribe: <mailto:linux-xfs+unsubscribe@vger.kernel.org> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -From: Darrick J. Wong <djwong@kernel.org> - -Userspace libxfs is supposed to match the kernel libxfs except for the -preprocessor include directives. Fix a few discrepancies that came up -for whatever reason. - -To fix the build errors resulting from CONFIG_XFS_RT not being defined, -add it to libxfs.h and alter the Makefile to track xfs_rtbitmap.h. - -Signed-off-by: Darrick J. Wong <djwong@kernel.org> -Reviewed-by: Christoph Hellwig <hch@lst.de> -Reviewed-by: Bill O'Donnell <bodonnel@redhat.com> ---- - db/check.c | 1 - - include/libxfs.h | 4 ++++ - libxfs/Makefile | 1 + - libxfs/xfs_rtbitmap.c | 2 +- - libxfs/xfs_rtbitmap.h | 3 --- - repair/rt.c | 1 - - 6 files changed, 6 insertions(+), 6 deletions(-) - - -diff --git a/db/check.c b/db/check.c -index 9d5576c333b2..a47a5d9cb5b4 100644 ---- a/db/check.c -+++ b/db/check.c -@@ -20,7 +20,6 @@ - #include "init.h" - #include "malloc.h" - #include "dir2.h" --#include "xfs_rtbitmap.h" - - typedef enum { - IS_USER_QUOTA, IS_PROJECT_QUOTA, IS_GROUP_QUOTA, -diff --git a/include/libxfs.h b/include/libxfs.h -index 9cec394ca407..aeec2bc76126 100644 ---- a/include/libxfs.h -+++ b/include/libxfs.h -@@ -7,6 +7,9 @@ - #ifndef __LIBXFS_H__ - #define __LIBXFS_H__ - -+/* For userspace XFS_RT is always defined */ -+#define CONFIG_XFS_RT -+ - #include "libxfs_api_defs.h" - #include "platform_defs.h" - #include "xfs.h" -@@ -80,6 +83,7 @@ struct iomap; - #include "xfs_refcount_btree.h" - #include "xfs_refcount.h" - #include "xfs_btree_staging.h" -+#include "xfs_rtbitmap.h" - - #ifndef ARRAY_SIZE - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 010ee68e2292..6f688c0ad25a 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -50,6 +50,7 @@ HFILES = \ - xfs_refcount_btree.h \ - xfs_rmap.h \ - xfs_rmap_btree.h \ -+ xfs_rtbitmap.h \ - xfs_sb.h \ - xfs_shared.h \ - xfs_trans_resv.h \ -diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c -index 8f313339e97f..fb083499070c 100644 ---- a/libxfs/xfs_rtbitmap.c -+++ b/libxfs/xfs_rtbitmap.c -@@ -931,7 +931,7 @@ xfs_rtcheck_alloc_range( - */ - int - xfs_rtfree_extent( -- xfs_trans_t *tp, /* transaction pointer */ -+ struct xfs_trans *tp, /* transaction pointer */ - xfs_rtxnum_t start, /* starting rtext number to free */ - xfs_rtxlen_t len) /* length of extent freed */ - { -diff --git a/libxfs/xfs_rtbitmap.h b/libxfs/xfs_rtbitmap.h -index db2f8c924b05..c0637057d69c 100644 ---- a/libxfs/xfs_rtbitmap.h -+++ b/libxfs/xfs_rtbitmap.h -@@ -6,9 +6,6 @@ - #ifndef __XFS_RTBITMAP_H__ - #define __XFS_RTBITMAP_H__ - --/* For userspace XFS_RT is always defined */ --#define CONFIG_XFS_RT -- - struct xfs_rtalloc_args { - struct xfs_mount *mp; - struct xfs_trans *tp; -diff --git a/repair/rt.c b/repair/rt.c -index abe58b569c0c..9f3bc8d53ec6 100644 ---- a/repair/rt.c -+++ b/repair/rt.c -@@ -13,7 +13,6 @@ - #include "protos.h" - #include "err_protos.h" - #include "rt.h" --#include "xfs_rtbitmap.h" - - #define xfs_highbit64 libxfs_highbit64 /* for XFS_RTBLOCKLOG macro */ - diff --git a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild deleted file mode 100644 index a82129f2ccf9..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-6.4.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic systemd usr-ldscript - -DESCRIPTION="XFS filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" -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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="icu libedit nls selinux" - -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}" -BDEPEND="nls? ( sys-devel/gettext )" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/${PN}-5.18.0-docdir.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 - - # If set in user env, this breaks configure - unset PLATFORM - - 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=" " - - # Avoid automagic on libdevmapper (bug #709694) - export ac_cv_search_dm_task_create=no - - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # 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-static - --enable-blkid - # Doesn't do anything beyond adding -flto (bug #930947). - --disable-lto - --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) - ) - - 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-6.6.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild deleted file mode 100644 index 71c81d84f6ec..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic systemd udev usr-ldscript - -DESCRIPTION="XFS filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" -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 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="icu libedit nls selinux" - -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}" -BDEPEND="nls? ( sys-devel/gettext )" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/0001-Remove-use-of-LFS64-interfaces.patch - "${FILESDIR}"/0002-io-Adapt-to-64-bit-time_t.patch - "${FILESDIR}"/0003-build-Request-64-bit-time_t-where-possible.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 - - # If set in user env, this breaks configure - unset PLATFORM - - 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=" " - - # Avoid automagic on libdevmapper (bug #709694) - export ac_cv_search_dm_task_create=no - - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # 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-static - --enable-blkid - # Doesn't do anything beyond adding -flto (bug #930947). - --disable-lto - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - --with-udev-rule-dir="$(get_udevdir)/rules.d" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable libedit editline) - ) - - 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 -} - -pkg_postrm() { - udev_reload -} - -pkg_postinst() { - udev_reload -} diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild deleted file mode 100644 index e5ba87bba74e..000000000000 --- a/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic systemd udev - -DESCRIPTION="XFS filesystem utilities" -HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/" -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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="icu libedit nls selinux static-libs" - -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}" -BDEPEND="nls? ( sys-devel/gettext )" -RDEPEND+=" selinux? ( sec-policy/selinux-xfs )" - -PATCHES=( - "${FILESDIR}"/${PN}-5.3.0-libdir.patch - "${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.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 - - # If set in user env, this breaks configure - unset PLATFORM - - 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=" " - - # Avoid automagic on libdevmapper (bug #709694) - export ac_cv_search_dm_task_create=no - - # bug 903611 - use elibc_musl && append-flags -D_LARGEFILE64_SOURCE - - # 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-static - # Doesn't do anything beyond adding -flto (bug #930947). - --disable-lto - --with-crond-dir="${EPREFIX}/etc/cron.d" - --with-systemd-unit-dir="$(systemd_get_systemunitdir)" - --with-udev-rule-dir="$(get_udevdir)/rules.d" - $(use_enable icu libicu) - $(use_enable nls gettext) - $(use_enable libedit editline) - ) - - econf "${myconf[@]}" -} - -src_compile() { - emake V=1 -} - -src_install() { - # XXX: There's a missing dep in the install-dev target, so split it - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install - emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev - - if ! use static-libs; then - rm "${ED}/usr/$(get_libdir)/libhandle.a" || die - fi -} - -pkg_postrm() { - udev_reload -} - -pkg_postinst() { - udev_reload -} diff --git a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild index d082ee12b4f2..79b39e4aa851 100644 --- a/sys-fs/xfsprogs/xfsprogs-6.8.0.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-6.8.0.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 ~loong ~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 static-libs" RDEPEND=" |