summaryrefslogtreecommitdiff
path: root/sys-fs/hfsutils
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/hfsutils')
-rw-r--r--sys-fs/hfsutils/Manifest11
-rw-r--r--sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch5
-rw-r--r--sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch4
-rw-r--r--sys-fs/hfsutils/files/largerthan2gb.patch4
-rw-r--r--sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild (renamed from sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild)20
-rw-r--r--sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild66
6 files changed, 88 insertions, 22 deletions
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 8b81149c0b0a..d3d9f73a88e4 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,6 +1,9 @@
-AUX hfsutils-3.2.6-errno.patch 377 BLAKE2B 1c3e45b7b5874e7a5d1798e47b846f1a53bf991aaa6649c7b55e2663c28178f42af9896828e6d8a8e79e34f3efab626454bc7fdd9a658430743d987abf120c96 SHA512 564eb03f85299c3fddd5f61d1563b38951a866daeca1bd1ba020a4e1fe8603ae22f1f764be54ecb1fdc47f97bbca68a512936fff21b2a359050ddebef978eb1b
-AUX hfsutils-3.2.6-fix-tcl-8.6.patch 184 BLAKE2B e3efbab15a8cbcf4f642b83daf871da315136699123d06e4912047965351acbc44a3460dd56e5e5052351a6c6a7aa71312183cc65368b27065f8381268af496f SHA512 0868c22b49f5cae7602982f71a0ea8e9c1f4cd350a27b7bb8d810db8d1d4b2396358f410875e21cc2b0611d127960384dc152a93abc0ec63128efaaf5d81a0f2
-AUX largerthan2gb.patch 289 BLAKE2B abb2d405007a16382d5e6e997b0ed2c44fac241cdb4f66f14699306c26c6c4cf3f291a24a8900676648c62c54679a82afb38bb5041a672563fe9cc12638aa5ad SHA512 896b4c89e04b8d0ec6ac66d928a60ccbdab30fd6bb7196e747af91b0823f7875542bfb0c3264062dc9627493d859a6ef28571848fd5e82a73a460ef705bd5362
+AUX hfsutils-3.2.6-errno.patch 223 BLAKE2B d6b42f5cb76fb57dc158bf9ae4ba43ad5518d1326048eb0e4cea7067ccd16925fd892a8a2df2d71a79f6042d4c33f3425f8be316b6f287c32b61278c588885e8 SHA512 0a6074d77690ac73513f7197b49c5309e6066104301aa53dd1c3d1b4b55abb542cef8a76f8c2f7b5aff47c1b3476446498cfe27e5763fe28bc08bba9e47dd8b1
+AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
+AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
DIST hfsutils-3.2.6.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6-r5.ebuild 1067 BLAKE2B b98f6591ec0bff3cf78652497ac5141ab5b77e447b113d5f6f797f6891a3f3a18ac3a294df1f28a2684582a8f774a62953bab4d0985e3522575816ee761a4b16 SHA512 6afabb87d4de717bd31a521ef383a36cab72a7475a597690b63fc5759159c5972aba4753e935c21ad788c34cc1e1d62a12ed8c1605f584db87c091d4791ab064
+DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
+DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
+EBUILD hfsutils-3.2.6-r6.ebuild 1046 BLAKE2B b5d120855a6285b7cabb38b897eb942c9fd52241495a05fdeb04f7bed686e15581affa77c6fb2711865ee17342a9832f69e5ea2a2ffdf46d4963b36f58d697e4 SHA512 2cf1dbd3c3fe26e7e963b2f8530803033077236e6acd11628eba25997fdb50c50a7caf4c9abd7505b2e62b860fd146bbc853d148d18068ae0d22c9f846783283
+EBUILD hfsutils-3.2.6_p14.ebuild 1391 BLAKE2B d07394734bd278c859466965c8bad2344ac2326a61fa5576d5b6c02e59963a06e2cb92065d6cc5c90afa3809370d3933970c944254f7a6942f2802389a10bc06 SHA512 4e9165f8053907a6c4a348d37acf303e3d454daae2222cde6c9be7b9e0ea3d40983c74dff516619e9f8d63984d8d8fe66059521bc56d0b2c1ca58bbe1bf2a107
MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
index 6e25f794b220..f8ab6a0bf0a0 100644
--- a/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
@@ -1,6 +1,5 @@
-diff -ruN hfsutils.orig/tclhfs.c hfsutils-3.2.6/tclhfs.c
---- hfsutils.orig/tclhfs.c 2003-03-31 17:34:55.000000000 +0200
-+++ hfsutils-3.2.6/tclhfs.c 2003-03-31 17:39:51.000000000 +0200
+--- a/tclhfs.c
++++ b/tclhfs.c
@@ -43,8 +43,7 @@
# include "charset.h"
# include "suid.h"
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
index 19f15424543c..8faf06e0f77a 100644
--- a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
@@ -1,5 +1,5 @@
---- hfsutils-3.2.6/config.h.in
-+++ hfsutils-3.2.6/config.h.in
+--- a/config.h.in
++++ b/config.h.in
@@ -91,3 +91,5 @@
# ifndef HAVE_STRTOL
long strtol(const char *, char **, int);
diff --git a/sys-fs/hfsutils/files/largerthan2gb.patch b/sys-fs/hfsutils/files/largerthan2gb.patch
index a688ff621a30..fb9fb7787f9c 100644
--- a/sys-fs/hfsutils/files/largerthan2gb.patch
+++ b/sys-fs/hfsutils/files/largerthan2gb.patch
@@ -1,5 +1,5 @@
---- libhfs/os/unix.c-orig 1998-11-02 23:09:13.000000000 +0100
-+++ libhfs/os/unix.c 2004-12-13 14:39:28.099124272 +0100
+--- a/libhfs/os/unix.c
++++ b/libhfs/os/unix.c
@@ -19,6 +19,11 @@
* $Id$
*/
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
index 1d19c5f6f8e0..23076395fd73 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
DESCRIPTION="HFS FS Access utils"
HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
@@ -21,15 +20,14 @@ RDEPEND="${DEPEND}"
# use tk requires tcl - bug #150437
REQUIRED_USE="tk? ( tcl )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-errno.patch \
- "${FILESDIR}"/largerthan2gb.patch \
- "${FILESDIR}"/${P}-fix-tcl-8.6.patch
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-errno.patch
+ "${FILESDIR}"/largerthan2gb.patch
+ "${FILESDIR}"/${P}-fix-tcl-8.6.patch
+)
src_configure() {
+ tc-export CC
econf $(use_with tcl) $(use_with tk)
}
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
new file mode 100644
index 000000000000..b25482a3b41e
--- /dev/null
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tcl tk"
+
+DEPEND="
+ tcl? ( dev-lang/tcl:0= )
+ tk? ( dev-lang/tk:0= )
+"
+RDEPEND="
+ ${DEPEND}
+"
+
+# use tk requires tcl - bug #150437
+REQUIRED_USE="tk? ( tcl )"
+PATCHES=(
+ "${FILESDIR}"/largerthan2gb.patch
+ "${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+ eapply $(
+ for file in $(cat "${WORKDIR}"/debian/patches/series)
+ do echo "${WORKDIR}"/debian/patches/${file}
+ done
+ )
+ default
+ 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_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
+}