commit: 2ee4f8fec2930f46445043dc4b6bc996353c4e39 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Oct 27 17:14:12 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Oct 27 22:56:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2ee4f8fe
sys-block/partclone: Version bump to 0.3.32 Drop the jfs USE flag because we lack libjfs. I can't find any trace of it anywhere! I gather jfs might be dropped from the kernel soon anyway. I've bumped fuse to version 3, but only for the non-static build because the newer version lacks the static-libs USE flag. partclone supports both. Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> sys-block/partclone/Manifest | 1 + .../partclone/files/partclone-ntfs-headers.patch | 27 ++++++ .../partclone/files/partclone-reiser4-test.patch | 33 +++++++ sys-block/partclone/partclone-0.3.32.ebuild | 100 +++++++++++++++++++++ 4 files changed, 161 insertions(+) diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest index cd13876f1..6a323ea2b 100644 --- a/sys-block/partclone/Manifest +++ b/sys-block/partclone/Manifest @@ -1 +1,2 @@ DIST partclone-0.3.20.tar.gz 1373652 BLAKE2B 4fd15bde711c3967cc791214592ec97cd8cc0290ae452334dc026dfbfc0d27661460165dacced72767ed5fa9731649d6c250e9576ace861c713d3a1e52630e2f SHA512 32dced369973c39412c562ab8731ff7b490f464b5ed4033456e6b23f3f79c437f43dc9db4c79b4821f35e4997d1444c8d80c53816b2a3bb90836fb5ad33b368e +DIST partclone-0.3.32.tar.gz 1456707 BLAKE2B 14212bd989057eb3212d7297bef9a191c59fbe1df6430212fab757c701b522e6bdeed8c53a0569665ac40334d21b30d7e4e59f961efea51abe7303448c46fa5c SHA512 ff454ab910343606f4691f0de1744507dc8d48e2e431ba1d6b4b1ca8152aafddf230a5c3273c2f853779868365e534b74ecc201bfc7e258037d56d47b2afbf8b diff --git a/sys-block/partclone/files/partclone-ntfs-headers.patch b/sys-block/partclone/files/partclone-ntfs-headers.patch new file mode 100644 index 000000000..d1a8fad15 --- /dev/null +++ b/sys-block/partclone/files/partclone-ntfs-headers.patch @@ -0,0 +1,27 @@ +https://github.com/Thomas-Tsai/partclone/pull/254 + +From 1e1b01b67d2a2779f38647fd16bb9b6b5b1d730e Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <[email protected]> +Date: Sun, 27 Oct 2024 17:07:40 +0000 +Subject: [PATCH] ntfstime.h uses the time.h, sys/stat.h, sys/time.h headers + +Not doing this check can result in an implicit declaration error. +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index bb9ed99..00f4688 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -290,6 +290,7 @@ if test "$enable_ntfs" = "yes"; then + #check library of some filesystems + dnl Check for NTFS-3g + AS_MESSAGE([checking for NTFS-3g Library and Header files ... ...]) ++ AC_CHECK_HEADERS([sys/time.h sys/stat.h time.h]) + AC_CHECK_HEADERS([ntfs-3g/misc.h], ntfs_3g_h=1, + AC_MSG_WARN([*** NTFS(libntfs-3g-dev) header not found])) + AC_CHECK_LIB([ntfs-3g], [ntfs_mount], ntfs_3g_l=1, +-- +2.47.0 + diff --git a/sys-block/partclone/files/partclone-reiser4-test.patch b/sys-block/partclone/files/partclone-reiser4-test.patch new file mode 100644 index 000000000..c57bb04d9 --- /dev/null +++ b/sys-block/partclone/files/partclone-reiser4-test.patch @@ -0,0 +1,33 @@ +https://github.com/Thomas-Tsai/partclone/pull/253 + +From 94e8111b9a1b001548f8ffb993c9a31d54f7c3ca Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <[email protected]> +Date: Sun, 27 Oct 2024 16:55:40 +0000 +Subject: [PATCH] Conditionally run the reiser4 test + +The line to add the test was uncommented a while ago, possibly +intentionally, but the surrounding lines to make it conditional were +not. Disclaimer: I have not actually tried to run the test. +--- + tests/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index ee190f1..36d91d2 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -19,9 +19,9 @@ if ENABLE_REISERFS + TESTS += reiserfs.test + endif + +-#if ENABLE_REISER4 ++if ENABLE_REISER4 + TESTS += reiser4.test +-#endif ++endif + + if ENABLE_HFSP + TESTS += hfsplus.test +-- +2.47.0 + diff --git a/sys-block/partclone/partclone-0.3.32.ebuild b/sys-block/partclone/partclone-0.3.32.ebuild new file mode 100644 index 000000000..4706e92d3 --- /dev/null +++ b/sys-block/partclone/partclone-0.3.32.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ -z ${PV%%*9999} ]]; then + EGIT_REPO_URI="https://github.com/Thomas-Tsai/${PN}.git"; + inherit git-r3 +else + [[ -n ${PV%%*_p*} ]] && MY_PV="${PV}" + SRC_URI=" + https://github.com/Thomas-Tsai/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + " + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Partition cloning tool" +HOMEPAGE="https://partclone.org"; + +LICENSE="GPL-2" +SLOT="0" +IUSE=" +apfs btrfs +e2fs exfat f2fs fat fuse hfs minix ncurses nilfs2 ntfs +reiserfs static test ufs vmfs xfs +" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/openssl:0= + e2fs? ( sys-fs/e2fsprogs ) + btrfs? ( sys-apps/util-linux ) + fuse? ( sys-fs/fuse:3 ) + ncurses? ( sys-libs/ncurses:0= ) + nilfs2? ( sys-fs/nilfs-utils ) + ntfs? ( sys-fs/ntfs3g ) + reiserfs? ( sys-fs/progsreiserfs ) + xfs? ( sys-apps/util-linux ) + static? ( + dev-libs/openssl:0[static-libs] + e2fs? ( sys-fs/e2fsprogs[static-libs] ) + btrfs? ( sys-apps/util-linux[static-libs] ) + fuse? ( sys-fs/fuse:0[static-libs] ) + ncurses? ( sys-libs/ncurses:0[static-libs] ) + nilfs2? ( sys-fs/nilfs-utils[static-libs] ) + ntfs? ( sys-fs/ntfs3g[static-libs] ) + reiserfs? ( sys-fs/progsreiserfs[static-libs] ) + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-ntfs-headers.patch + "${FILESDIR}"/${PN}-reiser4-test.patch +) + +DOCS=( + AUTHORS + ChangeLog + HACKING + NEWS + README.md +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + $(use_enable e2fs extfs) + $(use_enable apfs) + $(use_enable btrfs) + $(use_enable exfat) + $(use_enable f2fs) + $(use_enable fat) + $(use_enable fuse) + $(use_enable hfs hfsp) + $(use_enable minix) + $(use_enable ncurses ncursesw) + $(use_enable nilfs2) + $(use_enable ntfs) + $(use_enable reiserfs) + $(use_enable test fs-test) + $(use_enable static) + $(use_enable vmfs) + $(use_enable ufs) + $(use_enable xfs) + --disable-jfs + --disable-reiser4 + ) + econf "${myconf[@]}" +}
