commit: 9a54836f47d380effe7767c834fb872ce9954037 Author: 123485k <1758961307 <AT> qq <DOT> com> AuthorDate: Sat Jan 25 12:15:01 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Sat Jan 25 12:15:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9a54836f
sys-block/partclone: drop 0.3.20 0.3.32, add 0.3.33, fix ncurses linking Signed-off-by: 123485k <1758961307 <AT> qq.com> sys-block/partclone/Manifest | 3 +- sys-block/partclone/files/partclone-fail-mbr.patch | 14 ---- .../files/partclone-fix-ncurses-linking.patch | 28 +++++++ .../partclone/files/partclone-ntfs-headers.patch | 27 ------- .../partclone/files/partclone-reiser4-test.patch | 33 -------- sys-block/partclone/partclone-0.3.20.ebuild | 89 ---------------------- ...clone-0.3.32.ebuild => partclone-0.3.33.ebuild} | 5 +- 7 files changed, 31 insertions(+), 168 deletions(-) diff --git a/sys-block/partclone/Manifest b/sys-block/partclone/Manifest index 6a323ea2b..a9166daa1 100644 --- a/sys-block/partclone/Manifest +++ b/sys-block/partclone/Manifest @@ -1,2 +1 @@ -DIST partclone-0.3.20.tar.gz 1373652 BLAKE2B 4fd15bde711c3967cc791214592ec97cd8cc0290ae452334dc026dfbfc0d27661460165dacced72767ed5fa9731649d6c250e9576ace861c713d3a1e52630e2f SHA512 32dced369973c39412c562ab8731ff7b490f464b5ed4033456e6b23f3f79c437f43dc9db4c79b4821f35e4997d1444c8d80c53816b2a3bb90836fb5ad33b368e -DIST partclone-0.3.32.tar.gz 1456707 BLAKE2B 14212bd989057eb3212d7297bef9a191c59fbe1df6430212fab757c701b522e6bdeed8c53a0569665ac40334d21b30d7e4e59f961efea51abe7303448c46fa5c SHA512 ff454ab910343606f4691f0de1744507dc8d48e2e431ba1d6b4b1ca8152aafddf230a5c3273c2f853779868365e534b74ecc201bfc7e258037d56d47b2afbf8b +DIST partclone-0.3.33.tar.gz 1613900 BLAKE2B ac72310950b3f9e894470e206e00e1e540b8e800c6ffba94f19f6e8a460630ba1caceab0c6646d0af1409ef64ab60565879d66006cf989b73906b8f9ef8ab888 SHA512 21b783e50dca290acc70a2afb305f886c9032d3cc04636fa0e678efeac787398a5a2f8e260f9969be51500ee14d005fdf2dd33b9198ad96ef55311a8a9954c62 diff --git a/sys-block/partclone/files/partclone-fail-mbr.patch b/sys-block/partclone/files/partclone-fail-mbr.patch deleted file mode 100644 index 50fad90d6..000000000 --- a/sys-block/partclone/files/partclone-fail-mbr.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur a/fail-mbr/compile-mbr.sh b/fail-mbr/compile-mbr.sh ---- a/fail-mbr/compile-mbr.sh 2018-10-28 13:46:38.000000000 +0000 -+++ b/fail-mbr/compile-mbr.sh 2021-11-08 00:08:29.362877648 +0000 -@@ -28,7 +28,9 @@ - # - a line separator output by diff, "---" - # - the OP code "xor %ax,%ax" which may begin by 0x31 or 0x33 - # - a numerical offset output by diff, ^[a-f0-9]*$ --report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') -+#report=$(diff f1.obj f2.obj | grep -Ev 'fail-mbr|---|xor %ax,%ax|^[a-f0-9]*$') -+# set empty report to bypass issue https://bugzilla.redhat.com/show_bug.cgi?id=1943056 -+report="" - if [ -n "$report" ]; then - echo "files fail-mbr.bin and fail-mbr.bin.orig differ significantly:" - diff f1.obj f2.obj diff --git a/sys-block/partclone/files/partclone-fix-ncurses-linking.patch b/sys-block/partclone/files/partclone-fix-ncurses-linking.patch new file mode 100644 index 000000000..0f751605d --- /dev/null +++ b/sys-block/partclone/files/partclone-fix-ncurses-linking.patch @@ -0,0 +1,28 @@ +diff --git a/configure.ac b/configure.ac +index 9ee0a42..4a56e93 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -459,8 +459,8 @@ AC_ARG_ENABLE([static], + ) + AM_CONDITIONAL(ENABLE_STATIC, test "$enable_static" = yes) + +-AC_CHECK_LIB([tinfo], [initscr], tinfo=1, +- AC_MSG_WARN([*** tinfo library (libtinfo) not found])) ++AC_CHECK_LIB([tinfow], [initscr], tinfo=1, ++ AC_MSG_WARN([*** tinfow library (libtinfo) not found])) + AM_CONDITIONAL(ENABLE_TINFO, test "$tinfo" = 1) + + ##memory tracing## +diff --git a/src/Makefile.am b/src/Makefile.am +index c69cd2e..dd27e9f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -22,7 +22,7 @@ LDADD_static=-lcrypto -ldl + endif + + if ENABLE_TINFO +-LIBS+=-ltinfo ++LIBS+=-ltinfow + endif + + AM_CFLAGS=-D_FILE_OFFSET_BITS=64 diff --git a/sys-block/partclone/files/partclone-ntfs-headers.patch b/sys-block/partclone/files/partclone-ntfs-headers.patch deleted file mode 100644 index d1a8fad15..000000000 --- a/sys-block/partclone/files/partclone-ntfs-headers.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index c57bb04d9..000000000 --- a/sys-block/partclone/files/partclone-reiser4-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -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.20.ebuild b/sys-block/partclone/partclone-0.3.20.ebuild deleted file mode 100644 index 4498f0fd6..000000000 --- a/sys-block/partclone/partclone-0.3.20.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic -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 jfs minix ncurses nilfs2 ntfs -reiserfs static ufs vmfs xfs -" - -RDEPEND=" - dev-libs/openssl:* - e2fs? ( sys-fs/e2fsprogs ) - btrfs? ( sys-apps/util-linux ) - fuse? ( sys-fs/fuse:0 ) - jfs? ( sys-fs/jfsutils ) - 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:*[static-libs] - e2fs? ( - sys-fs/e2fsprogs[static-libs] - ) - btrfs? ( sys-apps/util-linux[static-libs] ) - fuse? ( sys-fs/fuse:0[static-libs] ) - jfs? ( sys-fs/jfsutils[static] ) - 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} -" -DOCS=( AUTHORS ChangeLog HACKING NEWS README.md TODO ) - -src_prepare() { - for f in "${FILESDIR}/${PN}-"*.patch; do - eapply "$f" - done - 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 jfs) - $(use_enable minix) - $(use_enable ncurses ncursesw) - $(use_enable nilfs2) - $(use_enable ntfs) - $(use_enable reiserfs) - $(use_enable static) - $(use_enable vmfs) - $(use_enable ufs) - $(use_enable xfs) - ) - append-flags -fcommon - econf "${myconf[@]}" -} diff --git a/sys-block/partclone/partclone-0.3.32.ebuild b/sys-block/partclone/partclone-0.3.33.ebuild similarity index 96% rename from sys-block/partclone/partclone-0.3.32.ebuild rename to sys-block/partclone/partclone-0.3.33.ebuild index 4706e92d3..58caf1d12 100644 --- a/sys-block/partclone/partclone-0.3.32.ebuild +++ b/sys-block/partclone/partclone-0.3.33.ebuild @@ -15,7 +15,7 @@ else " KEYWORDS="~amd64 ~x86" fi - +RESTRICT="strip" DESCRIPTION="Partition cloning tool" HOMEPAGE="https://partclone.org"; @@ -56,8 +56,7 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-ntfs-headers.patch - "${FILESDIR}"/${PN}-reiser4-test.patch + "${FILESDIR}"/${PN}-fix-ncurses-linking.patch ) DOCS=(
