diff options
author | Sam James <sam@gentoo.org> | 2023-11-05 22:35:35 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2023-11-05 22:35:35 +0000 |
commit | 85684e860cf7d9d235d884157e788fe519ab0bb7 (patch) | |
tree | 902bacbae1628d7c39464763db8cde00fd5d156b /sys-fs | |
parent | sys-fs/btrfs-progs: add 6.6.1 (diff) | |
download | gentoo-85684e860cf7d9d235d884157e788fe519ab0bb7.tar.gz gentoo-85684e860cf7d9d235d884157e788fe519ab0bb7.tar.bz2 gentoo-85684e860cf7d9d235d884157e788fe519ab0bb7.zip |
sys-fs/btrfs-progs: drop 6.6-r1, 6.6-r2
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/btrfs-progs/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild | 163 | ||||
-rw-r--r-- | sys-fs/btrfs-progs/btrfs-progs-6.6-r2.ebuild | 167 |
3 files changed, 0 insertions, 331 deletions
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 75f69d881626..6a11a7bb850a 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -3,4 +3,3 @@ DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449 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.1.tar.xz 2548648 BLAKE2B 9584f6e234bfc0fb65d970e6f079ff684064a8a90ac17867279f5694e094247fa53ceacf5f73811a9c559ba4d5c289ac1f44c9be69ec4bea9419387a9057aa45 SHA512 49bef0758526074c1b76b3bb7f12ba7b8b35ac08445ff36a77212449da605f4e47abd8784a3e3631a1431d949d31f8d0aae074b01fac2f617b65c069bf4fcec5 -DIST btrfs-progs-v6.6.respun.tar.xz 2548524 BLAKE2B d8dbbaf82ea1e49409f5003fbcbfe6e768520a0d265cd434f306cedf7adb6194420ba99a247106cb282495ae5041d1e9d128d16886d9038227beb8dc82c153eb SHA512 ce422775b982081b92f7d1823614f62825501a106a7cab450568221c788864c8da090e233f877d3ada87893e10c5b54cb38790e928f7f1db2d9471a1f6463303 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild deleted file mode 100644 index 6c3a264533c1..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.6-r1.ebuild +++ /dev/null @@ -1,163 +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 - -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-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 -} |