diff options
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/Manifest.gz | bin | 22398 -> 22404 bytes | |||
-rw-r--r-- | sys-fs/btrfs-progs/Manifest | 5 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild | 167 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild (renamed from sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild) | 4 | ||||
-rw-r--r-- | sys-fs/unionfs-fuse/Manifest | 3 | ||||
-rw-r--r-- | sys-fs/unionfs-fuse/unionfs-fuse-3.4-r1.ebuild | 48 | ||||
-rw-r--r-- | sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild | 3 |
7 files changed, 54 insertions, 176 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 872223281d38..4dd9fa9318d4 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 c31adbc465dc..344a0ac5c04a 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -3,12 +3,11 @@ DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672 DIST btrfs-progs-v6.5.3.tar.xz 2542416 BLAKE2B 83a39e1a991ad253a8733235c01fed32c23bde033b7ddc647347dba54a9ba5755d8508e6df817a627d59cefbed6a5696ec485093509ab007374d27c739dabfb1 SHA512 6bec6c0da0b61eb4dce6dc3128fe34fdc68b18cbbb7917c3cd13a558cee9464e6b4c1fcda2cab342d1b506767fab4eee5d03d2fb284a5c7249eec5a75407034a -DIST btrfs-progs-v6.6.respun.tar.xz 2548524 BLAKE2B d8dbbaf82ea1e49409f5003fbcbfe6e768520a0d265cd434f306cedf7adb6194420ba99a247106cb282495ae5041d1e9d128d16886d9038227beb8dc82c153eb SHA512 ce422775b982081b92f7d1823614f62825501a106a7cab450568221c788864c8da090e233f877d3ada87893e10c5b54cb38790e928f7f1db2d9471a1f6463303 +DIST btrfs-progs-v6.6.1.tar.xz 2548648 BLAKE2B 9584f6e234bfc0fb65d970e6f079ff684064a8a90ac17867279f5694e094247fa53ceacf5f73811a9c559ba4d5c289ac1f44c9be69ec4bea9419387a9057aa45 SHA512 49bef0758526074c1b76b3bb7f12ba7b8b35ac08445ff36a77212449da605f4e47abd8784a3e3631a1431d949d31f8d0aae074b01fac2f617b65c069bf4fcec5 EBUILD btrfs-progs-6.3.3.ebuild 3526 BLAKE2B 757ed0078acbe35c3d43a426062d01c620a4880ba34303a838469a81ae8dec25b4aef7e1c9230d96b14cc47620d50963a935799391bd8f86604cd9aa694fd47c SHA512 90a9c015ba76b8c7675aa6dc2b3ecdf853a99844e89abed0da7dc74a5622687f64ae6d2a732ac1911ec349e90d4979034dad27820447a25e27d362162053b046 EBUILD btrfs-progs-6.5.1.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02 EBUILD btrfs-progs-6.5.2.ebuild 3526 BLAKE2B 757ed0078acbe35c3d43a426062d01c620a4880ba34303a838469a81ae8dec25b4aef7e1c9230d96b14cc47620d50963a935799391bd8f86604cd9aa694fd47c SHA512 90a9c015ba76b8c7675aa6dc2b3ecdf853a99844e89abed0da7dc74a5622687f64ae6d2a732ac1911ec349e90d4979034dad27820447a25e27d362162053b046 EBUILD btrfs-progs-6.5.3.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02 -EBUILD btrfs-progs-6.6-r1.ebuild 3676 BLAKE2B c6d608aaa0952d7b87e89b00ee1df507abd54265c352a2baaac7acc49c38568d715bd9b0b208b79a3ed4329f865806e1c576c4865de10e6f9b70869d9dc2fef3 SHA512 f732b72fa530a190428c2634d45d5ec55230be2d884e2d70269b21ed9e61747736f14ffc43de3d0b74bd1eaaf43713c5999d351046a9646e60fe1efa787c8759 -EBUILD btrfs-progs-6.6-r2.ebuild 3735 BLAKE2B fbc888f8dc0edc22486f67d9842860069db43177a507838a3b93fafc827f6c71231148f4280f9f2beb090b367c47ca6d5170d3ec5f3567d3faaf92bcfd8185cd SHA512 c2ab9341a3ab6412d6c41f3dad75a76f28468a6274b8f8ffcffc8cc58828bb32747e2e2b8f4d0fd4350c3cec8d23a5897ff2b7e07c2028874caac99c99da91ee +EBUILD btrfs-progs-6.6.1.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02 EBUILD btrfs-progs-9999.ebuild 3532 BLAKE2B 8bc3fb26e7afd8873018303562b98004eccdbc46dec106722ed53a63ecd8b6aa77b031dceab11c6a6a211030c9297a5e640707c17c6561c71ba2cf7a8abe20a8 SHA512 5a22ce15d0873ef360c64ae52417161d34480d383ce15bd6cf5b0dec179b9a3811e22a976d5916c743215cfc7b24e76eb48a858cd3adfd4c42ec1ade8676fd02 MISC metadata.xml 610 BLAKE2B 70361c4d5434a98f73a3d38ed47d7be830783529db6217396f2235cdedd58744fc6e52e4de1994d28184fe9d8aa5d2982c433d47eda1868cfdb79edf0769a620 SHA512 8958c02574adb1395a9d21d9e9ad5db38570b82a1c7211752eb007eecbd0e541e880a060649641f40be877f167e14f278f14d5ef8775766ef9a6fa5d3843dc53 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild deleted file mode 100644 index 4b34fe4eb69e..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 2008-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit bash-completion-r1 python-single-r1 udev - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - # XXX: Drop .respun after 6.6 - # https://lore.kernel.org/linux-btrfs/20231103201408.GN11264@twin.jikos.cz/T/#u - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz -> ${PN}-${MY_PV}.respun.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.readthedocs.io/en/latest/" - -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 ) 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 ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-6.6-fix-ioctl-typo.patch -) - -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_test() { - emake -j1 -C tests V=1 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.6-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild index 6c3a264533c1..479ade82c97a 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-6.6.1.ebuild @@ -10,9 +10,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" - # XXX: Drop .respun after 6.6 - # https://lore.kernel.org/linux-btrfs/20231103201408.GN11264@twin.jikos.cz/T/#u - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz -> ${PN}-${MY_PV}.respun.tar.xz" + 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" diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest index 8c6485114602..59f4ad431e52 100644 --- a/sys-fs/unionfs-fuse/Manifest +++ b/sys-fs/unionfs-fuse/Manifest @@ -5,6 +5,7 @@ DIST unionfs-fuse-3.4.tar.gz 54122 BLAKE2B 8d578a1bd88814acf5e2d437b06a5f400f38e EBUILD unionfs-fuse-2.2-r1.ebuild 1025 BLAKE2B 2e8d689d90bae00dad10bf95f9422cf82c3c07d745ed9d1577bfac5a904ea91b5b086e1f9fd7e16ee1555fddf7b7b3474b071ebd3038082a688dac0796af26db SHA512 66d67ee98410673bf58405f398477351449044937fb9e4c8b23d087c8260d10a5dd9de62058690ee99cbd1a2a9423ba9b62655a9246e9e7f5e23611461f59fb1 EBUILD unionfs-fuse-3.2.ebuild 1025 BLAKE2B 410ed284bc4c2188c8b05e70cd49e9f039f414f6b8a7796591683ef24c1c1bdae77d0415f69f9ed7498cd682abdd2a95dd22d4429c38a313c30a02ff15f5c8ee SHA512 bd1e18474e6733b8e0b3881be25cdfc0b3ae2b5386e3ac9fe8ff51a972097af994d600e574548e168e5d203e4b06e158d81b7096d076d25a0b162fdbf5d7a002 EBUILD unionfs-fuse-3.3.ebuild 1025 BLAKE2B 410ed284bc4c2188c8b05e70cd49e9f039f414f6b8a7796591683ef24c1c1bdae77d0415f69f9ed7498cd682abdd2a95dd22d4429c38a313c30a02ff15f5c8ee SHA512 bd1e18474e6733b8e0b3881be25cdfc0b3ae2b5386e3ac9fe8ff51a972097af994d600e574548e168e5d203e4b06e158d81b7096d076d25a0b162fdbf5d7a002 +EBUILD unionfs-fuse-3.4-r1.ebuild 1025 BLAKE2B 3494e617dea6d62aa927db8c6adf0d8a0cf1714a200e66feb8a0505a23d75e7491c9872cd997247001471ca0f5a6f2642ba494acbf59f70cca7cfba2825376e2 SHA512 8e659c99da89ed545fb05b69cfd4ddd3f9565078ec2356bf4a6a3d5632edd02dc0d8b2253b6ca99cc11d908ef9183a56dd217dd44da614debab28c0344c371a5 EBUILD unionfs-fuse-3.4.ebuild 1025 BLAKE2B 410ed284bc4c2188c8b05e70cd49e9f039f414f6b8a7796591683ef24c1c1bdae77d0415f69f9ed7498cd682abdd2a95dd22d4429c38a313c30a02ff15f5c8ee SHA512 bd1e18474e6733b8e0b3881be25cdfc0b3ae2b5386e3ac9fe8ff51a972097af994d600e574548e168e5d203e4b06e158d81b7096d076d25a0b162fdbf5d7a002 -EBUILD unionfs-fuse-9999.ebuild 990 BLAKE2B 78031d766ac99e765f9228e0de06dedce335cd16561818d60fda1bba7f285e34ed3ac1fa22f5733c3adc0c7e256741f18d7984a39ac4700073c8f8a025fb46a1 SHA512 5bd2d6260698cd5cc6f14d148f264ea2d345e3ebd9405c85d43f886d661252fbc48549f644f9af14558f73b34180db1b326a4060984a37f278f76e4cda6ee1d8 +EBUILD unionfs-fuse-9999.ebuild 978 BLAKE2B 1cf37386909950bdabffbabd242cbd3a13ce22ef3d6957e181578d143f226a496152cc4d62ed8cf2cd9b8100eb44f8a56cdd962827731c0b9e7e612ddc2b742c SHA512 93e70f656eacf2e6b3bae5ac15b434dd1845fd1415d3a05863b7fe7aea6b1ee75f57c6ae4924144ccc59e41e012e9e67fbeb7299f7c95fb952a62c1b9fc98886 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7 diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-3.4-r1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-3.4-r1.ebuild new file mode 100644 index 000000000000..d0d835614d1d --- /dev/null +++ b/sys-fs/unionfs-fuse/unionfs-fuse-3.4-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +PYTHON_COMPAT=( python3_{9..12} ) +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:3" +DEPEND="${RDEPEND}" +BDEPEND=" + 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 + python_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 08cc90ee0955..8a6b2c8190a1 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild @@ -3,7 +3,7 @@ EAPI="8" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit git-r3 python-any-r1 toolchain-funcs DESCRIPTION="Self-syncing tree-merging file system based on FUSE" @@ -12,7 +12,6 @@ EGIT_REPO_URI="https://github.com/rpodgorny/unionfs-fuse.git" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="test" RESTRICT="!test? ( test )" |