1 |
commit: 6a4ef322c7f5386e4476ccdd4b887a295ef38c4a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 1 10:21:34 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 1 10:21:34 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a4ef322 |
7 |
|
8 |
sys-fs/hfsplusutils: Port to EAPI 7, keyword amd64 |
9 |
|
10 |
Package-Manager: Portage-2.3.74, Repoman-2.3.17 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
.../files/hfsplusutils-1.0.4-errno.patch | 10 ++---- |
14 |
.../files/hfsplusutils-1.0.4-gcc4.patch | 20 ++++++------ |
15 |
.../files/hfsplusutils-1.0.4-glob.patch | 4 +-- |
16 |
....0.4-r1.ebuild => hfsplusutils-1.0.4-r2.ebuild} | 37 ++++++++++++---------- |
17 |
4 files changed, 35 insertions(+), 36 deletions(-) |
18 |
|
19 |
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch |
20 |
index c9caeb4208f..f15e56cc1d9 100644 |
21 |
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch |
22 |
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch |
23 |
@@ -1,6 +1,5 @@ |
24 |
-diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c |
25 |
---- hfsplus.orig/src/hpmkdir.c 2003-03-30 20:09:59.000000000 +0200 |
26 |
-+++ hfsplus-1.0.4/src/hpmkdir.c 2003-03-30 20:11:15.000000000 +0200 |
27 |
+--- a/src/hpmkdir.c |
28 |
++++ b/src/hpmkdir.c |
29 |
@@ -46,8 +46,9 @@ |
30 |
# include <string.h> |
31 |
# include <time.h> |
32 |
@@ -12,8 +11,3 @@ diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c |
33 |
# include <stdio.h> |
34 |
# include <stdlib.h> |
35 |
|
36 |
-@@ -164,3 +165,4 @@ |
37 |
- hfsputil_perrorp(argv0); |
38 |
- return -1; |
39 |
- } |
40 |
-+ |
41 |
|
42 |
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch |
43 |
index 04724440ddb..6f633454d3d 100644 |
44 |
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch |
45 |
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch |
46 |
@@ -1,5 +1,5 @@ |
47 |
---- hfsplus-1.0.4/libhfsp/src/btree.c~ 2002-03-05 19:50:28.000000000 +0000 |
48 |
-+++ hfsplus-1.0.4/libhfsp/src/btree.c 2005-04-30 12:48:48.000000000 +0100 |
49 |
+--- a/libhfsp/src/btree.c |
50 |
++++ b/libhfsp/src/btree.c |
51 |
@@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume* |
52 |
{ |
53 |
p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode, |
54 |
@@ -9,8 +9,8 @@ |
55 |
} |
56 |
|
57 |
bt->alloc_bits = malloc(alloc_size); |
58 |
---- hfsplus-1.0.4/libhfsp/src/swab.h~ 2002-03-05 19:50:29.000000000 +0000 |
59 |
-+++ hfsplus-1.0.4/libhfsp/src/swab.h 2005-04-30 12:48:05.000000000 +0100 |
60 |
+--- a/libhfsp/src/swab.h |
61 |
++++ b/libhfsp/src/swab.h |
62 |
@@ -36,28 +36,28 @@ |
63 |
|
64 |
#define bswabU16(val) bswap_16(val) |
65 |
@@ -56,8 +56,8 @@ |
66 |
-#define bstoreU8_inc(ptr,val) (*((UInt8*) (ptr))++) = val |
67 |
+#define bswabU8_inc(ptr) (*(*((UInt8**) (void *)(&ptr)))++) |
68 |
+#define bstoreU8_inc(ptr,val) (*(*((UInt8**) (void *)(&ptr)))++) = val |
69 |
---- hfsplus-1.0.4/libhfsp/src/btreecheck.c~ 2002-03-05 19:50:29.000000000 +0000 |
70 |
-+++ hfsplus-1.0.4/libhfsp/src/btreecheck.c 2005-04-30 12:49:22.000000000 +0100 |
71 |
+--- a/libhfsp/src/btreecheck.c |
72 |
++++ b/libhfsp/src/btreecheck.c |
73 |
@@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt, |
74 |
{ |
75 |
p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode, |
76 |
@@ -67,8 +67,8 @@ |
77 |
} |
78 |
|
79 |
bt->alloc_bits = malloc(alloc_size); |
80 |
---- hfsplus-1.0.4/libhfsp/src/fscheck.c~ 2002-03-25 15:48:37.000000000 +0000 |
81 |
-+++ hfsplus-1.0.4/libhfsp/src/fscheck.c 2005-04-30 12:50:26.000000000 +0100 |
82 |
+--- a/libhfsp/src/fscheck.c |
83 |
++++ b/libhfsp/src/fscheck.c |
84 |
@@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume |
85 |
vh->write_count = bswabU32_inc(p); |
86 |
vh->encodings_bmp = bswabU64_inc(p); |
87 |
@@ -94,8 +94,8 @@ |
88 |
signature = bswabU16_inc(p); /* offset 0x7C, drEmbedSigWord */ |
89 |
if (signature != HFSP_VOLHEAD_SIG) |
90 |
HFSP_ERROR(-1, "This looks like a normal HFS volume"); |
91 |
---- hfsplus-1.0.4/libhfsp/src/volume.c~ 2002-03-26 18:00:29.000000000 +0000 |
92 |
-+++ hfsplus-1.0.4/libhfsp/src/volume.c 2005-04-30 12:51:41.000000000 +0100 |
93 |
+--- a/libhfsp/src/volume.c |
94 |
++++ b/libhfsp/src/volume.c |
95 |
@@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v |
96 |
vh->write_count = bswabU32_inc(p); |
97 |
vh->encodings_bmp = bswabU64_inc(p); |
98 |
|
99 |
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch |
100 |
index cd92d0a0a86..776d69ed825 100644 |
101 |
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch |
102 |
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch |
103 |
@@ -1,5 +1,5 @@ |
104 |
---- src/glob.c.orig 2002-10-09 08:02:31.000000000 -0500 |
105 |
-+++ src/glob.c 2002-10-09 08:02:46.000000000 -0500 |
106 |
+--- a/src/glob.c |
107 |
++++ b/src/glob.c |
108 |
@@ -48,7 +48,7 @@ |
109 |
|
110 |
switch (*pat) |
111 |
|
112 |
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild |
113 |
similarity index 55% |
114 |
rename from sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild |
115 |
rename to sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild |
116 |
index 71cc51b2eba..4e624f1b33c 100644 |
117 |
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild |
118 |
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild |
119 |
@@ -1,9 +1,9 @@ |
120 |
-# Copyright 1999-2016 Gentoo Foundation |
121 |
+# Copyright 1999-2019 Gentoo Authors |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
|
124 |
-EAPI="5" |
125 |
+EAPI=7 |
126 |
|
127 |
-inherit autotools eutils flag-o-matic |
128 |
+inherit autotools flag-o-matic |
129 |
|
130 |
MY_P="hfsplus_${PV}" |
131 |
DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)" |
132 |
@@ -12,33 +12,38 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2" |
133 |
|
134 |
LICENSE="GPL-2" |
135 |
SLOT="0" |
136 |
-KEYWORDS="ppc ppc64 x86" |
137 |
+KEYWORDS="~amd64 ppc ppc64 x86" |
138 |
IUSE="static-libs" |
139 |
|
140 |
-DEPEND="app-arch/bzip2" |
141 |
-RDEPEND="" |
142 |
+S="${WORKDIR}/hfsplus-${PV}" |
143 |
|
144 |
-S=${WORKDIR}/hfsplus-${PV} |
145 |
+PATCHES=( |
146 |
+ "${FILESDIR}"/${P}-glob.patch |
147 |
+ "${FILESDIR}"/${P}-errno.patch |
148 |
+ "${FILESDIR}"/${P}-gcc4.patch |
149 |
+ "${FILESDIR}"/${P}-string.patch |
150 |
+ "${FILESDIR}"/${P}-stdlib.patch |
151 |
+ "${FILESDIR}"/${P}-cflags.patch |
152 |
+) |
153 |
|
154 |
src_prepare() { |
155 |
- epatch "${FILESDIR}/${P}-glob.patch" |
156 |
- epatch "${FILESDIR}/${P}-errno.patch" |
157 |
- epatch "${FILESDIR}/${P}-gcc4.patch" |
158 |
- epatch "${FILESDIR}/${P}-string.patch" |
159 |
- epatch "${FILESDIR}/${P}-stdlib.patch" |
160 |
- epatch "${FILESDIR}/${P}-cflags.patch" |
161 |
+ default |
162 |
+ |
163 |
# let's avoid the Makefile.cvs since isn't working for us |
164 |
+ mv configure.{in,ac} || die |
165 |
eautoreconf |
166 |
- |
167 |
- append-flags -fgnu89-inline |
168 |
} |
169 |
|
170 |
src_configure() { |
171 |
+ # bug 580620 |
172 |
+ append-flags -fgnu89-inline |
173 |
+ |
174 |
econf $(use_enable static-libs static) |
175 |
} |
176 |
|
177 |
src_install() { |
178 |
default |
179 |
- find "${ED}"/usr/ -name libhfsp.la -delete |
180 |
newman doc/man/hfsp.man hfsp.1 |
181 |
+ |
182 |
+ find "${D}" -name '*.la' -delete || die |
183 |
} |