commit: ba774f098628bed600557be06ea0e7bbf775aa13
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 04:37:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 04:38:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba774f09
sys-fs/btrfs-progs: add 6.6.3
* Add verify-sig
* Use more standard live template (invert conditions)
* Enable python 3.12
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/btrfs-progs/Manifest | 2 +
...-progs-9999.ebuild => btrfs-progs-6.6.3.ebuild} | 66 ++++++++++++++++------
sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 66 ++++++++++++++++------
3 files changed, 100 insertions(+), 34 deletions(-)
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 2c5000ebbf0a..98b597affbc2 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -4,3 +4,5 @@ DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B
74010ed51e211d28ce161db9f6e005bb1
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.2.tar.xz 2550624 BLAKE2B
c4901b14c1555a62ec5fdc9c744b48678427c52250d368d2f3e9b82e300bd0f2c1bcbae12169ab0376fdf0aff5ccf41139ae83d8851555ce4b2d671e82d116a3
SHA512
23878cdd6f16a7ddba55321169bf7dd565719dd5d16a5a47fb7879aa0e04bd9008dc436cdbb712cee286b3a9b97ac3a4f6ea22213286a5025b5371d7975a2fa8
+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
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
similarity index 69%
copy from sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
copy to sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
index 479ade82c97a..3fada8bdae41 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-6.6.3.ebuild
@@ -3,32 +3,36 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit bash-completion-r1 python-single-r1 udev
-libbtrfs_soname=0
+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
-if [[ ${PV} != 9999 ]]; then
MY_PV="v${PV/_/-}"
-
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz";
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI="
+
https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+ verify-sig? (
https://www.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
-
- 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}"
+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.
@@ -75,17 +79,41 @@ DEPEND="
"
BDEPEND="
virtual/pkgconfig
- man? ( dev-python/sphinx )
+ 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 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
@@ -116,12 +144,16 @@ src_configure() {
$(use_enable udev libudev)
$(use_enable zstd)
- # Could support libgcrypt, libsodium, libkcapi
+ # Could support libgcrypt, libsodium, libkcapi, openssl, botan
--with-crypto=builtin
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ --with-convert=ext2$(usev reiserfs ',reiserfs')
)
- econf "${myeconfargs[@]}"
+ 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() {
@@ -129,7 +161,7 @@ src_compile() {
}
src_test() {
- emake -j1 -C tests V=1 test
+ emake V=1 -j1 -C tests test
if use python ; then
cd libbtrfsutil/python || die
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 479ade82c97a..3fada8bdae41 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,32 +3,36 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit bash-completion-r1 python-single-r1 udev
-libbtrfs_soname=0
+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
-if [[ ${PV} != 9999 ]]; then
MY_PV="v${PV/_/-}"
-
SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz";
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI="
+
https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${MY_P}.tar.xz
+ verify-sig? (
https://www.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
-
- 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}"
+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.
@@ -75,17 +79,41 @@ DEPEND="
"
BDEPEND="
virtual/pkgconfig
- man? ( dev-python/sphinx )
+ 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 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
@@ -116,12 +144,16 @@ src_configure() {
$(use_enable udev libudev)
$(use_enable zstd)
- # Could support libgcrypt, libsodium, libkcapi
+ # Could support libgcrypt, libsodium, libkcapi, openssl, botan
--with-crypto=builtin
- --with-convert=ext2$(usex reiserfs ',reiserfs' '')
+ --with-convert=ext2$(usev reiserfs ',reiserfs')
)
- econf "${myeconfargs[@]}"
+ 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() {
@@ -129,7 +161,7 @@ src_compile() {
}
src_test() {
- emake -j1 -C tests V=1 test
+ emake V=1 -j1 -C tests test
if use python ; then
cd libbtrfsutil/python || die
