gentoo auto-resync : 16:10:2022 - 19:53:15

5 files changed, 173 insertions, 0 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index c0cb78b68f3c..e29f8021ba53 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 70ad56562b84..0c47803b5e02 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,7 +1,11 @@
 AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
 AUX hfsutils-3.2.6-test-tcl-8.6.patch 1651 BLAKE2B bc86ddce138beb81f3d70d43bc4c2fc4696543d70d4cc60ffc60598cafc4cd6573d9813ffd1443fd9bdedc3d99ba5fdbc4b3704d360b6cd9cd0672b4185770d6 SHA512 da19f521696bd837fd03b513f1439472cd2566a1992c92d03804f0aed794767a1b7ad97fa51f3e27488d22dfed5f3214a6270d778d1eb2853dd9f2fae86fb835
+AUX hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch 361 BLAKE2B 6d6bb4a7ad6e5737120c6d9588b8de959734d5d8f03b1f3eec717ea8ff96ac2acdae22ee5555525ea0a9032b007964c5e266a3526d09bde5b50f40f08d9b7c12 SHA512 9dacd0cf67125576028d55a3acc131b11b43e3355e9fc9ca65225f9e6b8d959e62c5975f507839aaf3e3d15fb8e4695ce5ff34de75e035e32bbee22390f02e0a
+AUX hfsutils-3.2.6_p15-drop-manual-autoconf.patch 2137 BLAKE2B 3b0b7dfd04f712b5aed294a8ae1ab4e1d6f46def773e34acf6b3bfd0e2c97d083663019c64197a3870e2a1b560ffb3850895e4cd4d3ac3e30e98da71b16e06f5 SHA512 24fa472278d751d49142523e927ddfe29520559496f359a312d8a4f2025b62b3942f1ca09a7c4f0dc3869f94107e97f1e04f5b821fc6cb0d8df0c6f07b5d2f05
 AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
 DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
+DIST hfsutils_3.2.6-15.debian.tar.xz 6364 BLAKE2B 7a588ceb4fefe50531d669f9c70452d6f7105f54cd674740296154203336a0d0977eb17d6aa9122b003029c26a4aa7674919fcdbbf8c527031be71a56d5a2c3f SHA512 67e3e7d33918b58cb02b7b8626caac890cf6c3bda5d81adeae9d0fa55bf7ad8fad18b0ecec5619bdfb9be037e16b5986eb1c6c8cd2044164e31927c5a1b6b1bf
 DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
 EBUILD hfsutils-3.2.6_p14.ebuild 1590 BLAKE2B 8c208c89cf03fbafe7e5472d6dda27839c2c7b0069e0abc6c949363c505f60c9a26c7db99659a8da91d6451f85afece51d1e804215066338dfb500eaa81905c0 SHA512 29d951b1c231d5c941b86cd020ba92714799ce4e2ec5eb730211947f4efcc537e77b9364320b31fb67d3a8afac2c95e4d56e8812b5b2c11415b16da65e2a8076
+EBUILD hfsutils-3.2.6_p15.ebuild 1689 BLAKE2B b03d21624d11d04194267f2a553783c1c1345c54c0ede06209e6bf3f2d1343c39222f7fe3b709721f93693ca10a38b84e74ebab8a042cf81b460ec61063ba06e SHA512 8fbd56b9f0dd28f93a23c322cf3db3e2875db16b2d8947721d00a2dd53838ecffbb67e01bab65e4950cf1bc4d74566585288145d6382ab20d7229659c2479751
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch
new file mode 100644
index 000000000000..4b9db273ec40
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-Include-string.h-for-strcmp.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/871165
+
+From 065e349d0a0e1db9fda99f90ff825b7934f191da Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 16 Oct 2022 18:18:58 +0100
+Subject: [PATCH] Include <string.h> for strcmp
+
+--- a/hpwd.c
++++ b/hpwd.c
+@@ -24,6 +24,7 @@
+ # endif
+ 
+ # include <stdio.h>
++# include <string.h>
+ 
+ # include "hfs.h"
+ # include "hcwd.h"
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch
new file mode 100644
index 000000000000..00f5bfb8a438
--- /dev/null
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6_p15-drop-manual-autoconf.patch
@@ -0,0 +1,78 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -197,23 +197,6 @@ dist ::
+ 
+ ###############################################################################
+ 
+-Makefile: config.status
+-	./config.status && touch .stamp/config.h
+-
+-.stamp/config.h: config.status
+-	./config.status && touch .stamp/config.h
+-
+-config.status: .stamp/configure .stamp/config.h.in Makefile.in
+-	./config.status --recheck
+-
+-.stamp/configure: configure.in
+-	autoconf && touch .stamp/configure
+-
+-.stamp/config.h.in: configure.in acconfig.h
+-	autoheader && touch .stamp/config.h.in
+-
+-###############################################################################
+-
+ $(LIBHFS) ::
+ 	cd libhfs && $(MAKE)
+ 
+--- a/libhfs/Makefile.in
++++ b/libhfs/Makefile.in
+@@ -96,23 +96,6 @@ maintainer-clean :: distclean
+ 
+ ###############################################################################
+ 
+-Makefile: config.status
+-	./config.status && touch .stamp/config.h
+-
+-.stamp/config.h: config.status
+-	./config.status && touch .stamp/config.h
+-
+-config.status: .stamp/configure .stamp/config.h.in Makefile.in
+-	./config.status --recheck
+-
+-.stamp/configure: configure.in
+-	autoconf && touch .stamp/configure
+-
+-.stamp/config.h.in: configure.in acconfig.h
+-	autoheader && touch .stamp/config.h.in
+-
+-###############################################################################
+-
+ $(HFSTARGET): $(HFSOBJS)
+ 	$(AR) $@ $(HFSOBJS)
+ 	$(RANLIB) $@
+--- a/librsrc/Makefile.in
++++ b/librsrc/Makefile.in
+@@ -92,23 +92,6 @@ maintainer-clean :: distclean
+ 
+ ###############################################################################
+ 
+-Makefile: config.status
+-	./config.status && touch .stamp/config.h
+-
+-.stamp/config.h: config.status
+-	./config.status && touch .stamp/config.h
+-
+-config.status: .stamp/configure .stamp/config.h.in Makefile.in
+-	./config.status --recheck
+-
+-.stamp/configure: configure.in
+-	autoconf && touch .stamp/configure
+-
+-.stamp/config.h.in: configure.in acconfig.h
+-	autoheader && touch .stamp/config.h.in
+-
+-###############################################################################
+-
+ $(RSRCTARGET): $(RSRCOBJS)
+ 	$(AR) $@ $(RSRCOBJS)
+ 	$(RANLIB) $@
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild
new file mode 100644
index 000000000000..dddff37401ba
--- /dev/null
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p15.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="HFS FS Access utils"
+HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+S="${WORKDIR}"/${P/_p*}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tcl tk"
+# Tests are enabled only with USE=tcl
+RESTRICT="!tcl? ( test )"
+# use tk requires tcl - bug #150437
+REQUIRED_USE="tk? ( tcl )"
+
+DEPEND="
+	tcl? ( dev-lang/tcl:= )
+	tk? ( dev-lang/tk:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch
+	"${FILESDIR}"/${PN}-3.2.6-test-tcl-8.6.patch
+	"${FILESDIR}"/${PN}-3.2.6_p15-Include-string.h-for-strcmp.patch
+	"${FILESDIR}"/${PN}-3.2.6_p15-drop-manual-autoconf.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's:configure.in:configure.ac:' {libhfs/,librsrc/,}{configure,Makefile,config.h}.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+
+	econf \
+		$(use_with tcl tcl /usr/$(get_libdir) no) \
+		$(use_with tk tk /usr/$(get_libdir) no)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+	emake CC="$(tc-getCC)" -C hfsck
+}
+
+src_test() {
+	# Tests reuse the same image name. Let's serialize.
+	emake -j1 check
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib /usr/share/man/man1
+	emake \
+		prefix="${ED}"/usr \
+		MANDEST="${ED}"/usr/share/man \
+		infodir="${ED}"/usr/share/info \
+		install
+	dobin hfsck/hfsck
+	dodoc BLURB CHANGES README TODO doc/*.txt
+}