From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13159158088 for ; Thu, 20 Jan 2022 12:08:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FE2B2BC01E; Thu, 20 Jan 2022 12:08:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE2292BC021 for ; Thu, 20 Jan 2022 12:08:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2CF33432EC for ; Thu, 20 Jan 2022 12:08:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A9452AE for ; Thu, 20 Jan 2022 12:08:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642680450.621a8f5570fe4e3c771db4088f199132106c35ed.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/btrfs-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/btrfs-progs/Manifest sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild sys-fs/btrfs-progs/btrfs-progs-9999.ebuild X-VCS-Directories: sys-fs/btrfs-progs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 621a8f5570fe4e3c771db4088f199132106c35ed X-VCS-Branch: master Date: Thu, 20 Jan 2022 12:08:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 613cb2a0-f571-4ac4-b036-fca510c89521 X-Archives-Hash: e375015023cf84d1a0962b870350a797 commit: 621a8f5570fe4e3c771db4088f199132106c35ed Author: Sam James gentoo org> AuthorDate: Thu Jan 20 11:57:54 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 20 12:07:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621a8f55 sys-fs/btrfs-progs: add 5.16 Bug: https://bugs.gentoo.org/830277 Signed-off-by: Sam James gentoo.org> sys-fs/btrfs-progs/Manifest | 1 + .../{btrfs-progs-9999.ebuild => btrfs-progs-5.16.ebuild} | 14 +++++++++----- sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 14 +++++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index a0682cc87be5..a7782b9bf352 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -2,3 +2,4 @@ DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 +DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild similarity index 90% copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild copy to sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild index ffe30a969ded..d2d506005f21 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +RESTRICT="test" # tries to mount repaired filesystems RDEPEND=" dev-libs/lzo:2= @@ -74,7 +74,7 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -91,8 +91,8 @@ src_prepare() { 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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || 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 } @@ -107,6 +107,7 @@ src_configure() { $(use_enable zstd) --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) + econf "${myeconfargs[@]}" } @@ -119,8 +120,11 @@ src_install() { $(usex python install_python '') $(usex static install-static '') ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize # install prebuilt subset of manuals diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index ffe30a969ded..d2d506005f21 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +RESTRICT="test" # tries to mount repaired filesystems RDEPEND=" dev-libs/lzo:2= @@ -74,7 +74,7 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -91,8 +91,8 @@ src_prepare() { 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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || 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 } @@ -107,6 +107,7 @@ src_configure() { $(use_enable zstd) --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) + econf "${myeconfargs[@]}" } @@ -119,8 +120,11 @@ src_install() { $(usex python install_python '') $(usex static install-static '') ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize # install prebuilt subset of manuals