gentoo resync : 06.08.2019

6 files changed, 44 insertions, 45 deletions

diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index b30576b85096..edd7688ac86f 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,9 +1,9 @@
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
-AUX hfsplusutils-1.0.4-errno.patch 445 BLAKE2B dd029daea33967741613d5946950686efaf71a4ef8509f74937e0879735ba9872e7e044ea413aebb647058532fb059b10fad0a48c4f50464f2f02d98440f1241 SHA512 c8df462d82870f027c4c9af5e5c8036d8a9eab89f04d46f6bbdd4679325f751296b99f4f48aa36dcf6dde5b4db3a15f6791e6984f9f02f0e58e8cc47516bb8fd
-AUX hfsplusutils-1.0.4-gcc4.patch 6221 BLAKE2B d21d178149a31e19dced7a030bc3d1f5362a477a5128c6ebb37cbaade0b867ad40140f7b94aba049b2c1b16a9a8deb9f00b214b5908a71949ef428273051c384 SHA512 a1919c6aaee1369cf1d99fd0ee5a47051318f624960a52528d546cec5fe6a6c57f4b3f8ce9824457ec9be9b0d8cd3aca816c990542aae50f140bd22d93153616
-AUX hfsplusutils-1.0.4-glob.patch 288 BLAKE2B 2d7366907b417f087ca4965190b5d349d16387d44043aa5864259971adc32e2d071eeb2bdaf63fd1f2e6047a3663d3310f2f95b3a648f5cd83b4223c7fa3dcd9 SHA512 43f2c51977193d4ac1d9f4d056a6bf1bee2d9b82d27e50edfaa35545710e5a8f8010a6606e868c6670e8958fb52a605e3618299fa61dcf943f8a729186a59291
+AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
+AUX hfsplusutils-1.0.4-gcc4.patch 5736 BLAKE2B c88d82b15ae7126d61bee78a5f10cab757ae462f73dfa5b7892290e8bd8405c11309162cb72159620e38ed47add63c41b43a0e370e53d712a0bd9311393cee6b SHA512 fb357a52452f6f8b16a9f3c9f02f1a7c213f6b8adfaf7fd7da70a15cb6ec3469ca8705f3dcd6419385a340e7b5644c17c323c6b951f0c56f4776b86ee86b267d
+AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14cbb24adbc0aa26b01ced08f741f1f8c3af1cd545fe556e1c6c89e0baf26a94b4317653e795103dc058c1ab6cb710c4 SHA512 da53dc8f18f77b15bb8b76bff371515da0fac03ae79bdd8450dad60063fd18f47d0e95577451ff5da285acf167e547ec392aa42ae254d77fc1789ba4cf2025aa
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r1.ebuild 1023 BLAKE2B 854bcb31d3f54ab713e87f8d756ac7eb3d335c884a4e8f6918bd9fcda3537851641f5cb0cf4eaa74f57760bb3638e2c617b4dc79c68dc6b5061c255ec12f30be SHA512 f1f59aa8d9e938cbc4b72529eb5474b272d34c1dae30d08fe77ca4e2ce4879d2fd19181c7a14ba369a0870a21b257b8bff9dc2636b4a892104bc22ffd3ac7199
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
+EBUILD hfsplusutils-1.0.4-r2.ebuild 1006 BLAKE2B b12ebfcd380b5e741e1ded3f506930b44c17986a09621a69ce5643e81f661ab91519e05cac95159e486f5c72a2582509f01ec26a9e601554534c6c279a213c14 SHA512 726d8386f0945644b7d34161a00c9b3f7c5d6c128cc124d5a24d0ccdf760d091aef6cb1cc3c739844379e46877bcb495a98692a60d4b31751b00bf72d65dd804
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
index c9caeb4208fb..f15e56cc1d91 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
@@ -1,6 +1,5 @@
-diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
---- hfsplus.orig/src/hpmkdir.c	2003-03-30 20:09:59.000000000 +0200
-+++ hfsplus-1.0.4/src/hpmkdir.c	2003-03-30 20:11:15.000000000 +0200
+--- a/src/hpmkdir.c
++++ b/src/hpmkdir.c
 @@ -46,8 +46,9 @@
  # include <string.h>
  # include <time.h>
@@ -12,8 +11,3 @@ diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
  # include <stdio.h>
  # include <stdlib.h>
  
-@@ -164,3 +165,4 @@
-     hfsputil_perrorp(argv0);
-     return -1;
- }
-+
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
index 04724440ddbf..6f633454d3d5 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
@@ -1,5 +1,5 @@
---- hfsplus-1.0.4/libhfsp/src/btree.c~	2002-03-05 19:50:28.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btree.c	2005-04-30 12:48:48.000000000 +0100
+--- a/libhfsp/src/btree.c
++++ b/libhfsp/src/btree.c
 @@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume*
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -9,8 +9,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/swab.h~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/swab.h	2005-04-30 12:48:05.000000000 +0100
+--- a/libhfsp/src/swab.h
++++ b/libhfsp/src/swab.h
 @@ -36,28 +36,28 @@
  
  #define bswabU16(val) bswap_16(val)
@@ -56,8 +56,8 @@
 -#define bstoreU8_inc(ptr,val)	(*((UInt8*) (ptr))++) = val
 +#define bswabU8_inc(ptr)	(*(*((UInt8**) (void *)(&ptr)))++)
 +#define bstoreU8_inc(ptr,val)	(*(*((UInt8**) (void *)(&ptr)))++) = val
---- hfsplus-1.0.4/libhfsp/src/btreecheck.c~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btreecheck.c	2005-04-30 12:49:22.000000000 +0100
+--- a/libhfsp/src/btreecheck.c
++++ b/libhfsp/src/btreecheck.c
 @@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt,
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -67,8 +67,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/fscheck.c~	2002-03-25 15:48:37.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/fscheck.c	2005-04-30 12:50:26.000000000 +0100
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
 @@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
@@ -94,8 +94,8 @@
  	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
  	if (signature != HFSP_VOLHEAD_SIG)
  	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
---- hfsplus-1.0.4/libhfsp/src/volume.c~	2002-03-26 18:00:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/volume.c	2005-04-30 12:51:41.000000000 +0100
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
 @@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
index cd92d0a0a86d..776d69ed825d 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
@@ -1,5 +1,5 @@
---- src/glob.c.orig	2002-10-09 08:02:31.000000000 -0500
-+++ src/glob.c	2002-10-09 08:02:46.000000000 -0500
+--- a/src/glob.c
++++ b/src/glob.c
 @@ -48,7 +48,7 @@
  
  	switch (*pat)
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index 71cc51b2ebaa..4e624f1b33c8 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 MY_P="hfsplus_${PV}"
 DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
@@ -12,33 +12,38 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="static-libs"
 
-DEPEND="app-arch/bzip2"
-RDEPEND=""
+S="${WORKDIR}/hfsplus-${PV}"
 
-S=${WORKDIR}/hfsplus-${PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-glob.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-string.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glob.patch"
-	epatch "${FILESDIR}/${P}-errno.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-string.patch"
-	epatch "${FILESDIR}/${P}-stdlib.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
+	default
+
 	# let's avoid the Makefile.cvs since isn't working for us
+	mv configure.{in,ac} || die
 	eautoreconf
-
-	append-flags -fgnu89-inline
 }
 
 src_configure() {
+	# bug 580620
+	append-flags -fgnu89-inline
+
 	econf $(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	find "${ED}"/usr/ -name libhfsp.la -delete
 	newman doc/man/hfsp.man hfsp.1
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-fs/hfsplusutils/metadata.xml b/sys-fs/hfsplusutils/metadata.xml
index 5eb05198076b..70f78a5392df 100644
--- a/sys-fs/hfsplusutils/metadata.xml
+++ b/sys-fs/hfsplusutils/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>