gentoo auto-resync : 23:11:2022 - 07:07:57

3 files changed, 4 insertions, 88 deletions

diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 688e4fad59c4..fa10fd6dcd74 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,9 +1,8 @@
 AUX libowfat-0.32-ar.patch 1564 BLAKE2B 43477182d5ea37327376511ff1f6a4db9ac117a11a6246be1e016b6b6e363432d959d2a986a604cce15a2a6d58558dc4627b0824624aae707f127dbfd43e5da8 SHA512 9945333b6cb9bf68242e6053a8634595e226031557309e190ac9ada860019daac8f11c562a661a60ec1cfd91d0502416006d13e877f8429acb0b653a6cccfa98
 AUX libowfat-0.32-gcc10.patch 633 BLAKE2B fdafa991694156b4c9bd93a6ad1a77b8673c9b176735da0bf525faf2549336121e4ca6a17dd7a35e58292ed6fc66ea176656b7cb97884f1fff3400194de3ef00 SHA512 ba3eef982f8345a96b2612bfbb8a97dc6477b21a58a35cda513ecdcd346b0cbf752574d565003f1d6887cda4467d8efc5777aa4d80fd50f731d35387028cda84
-AUX libowfat-0.33-headerdeps.patch 2952 BLAKE2B 25fad54425d3dacae96d79003b9a589655637d3d81b9767be2c270798a1535233c570d2007b92cceaa4f8c6073710dd5cbbe893023fd27c2c4b40e9ed0b0e2d5 SHA512 838934d98e71480656bb8d8bd6e8381118a502ab42ffe340d7595b20268a088ca8f78f1885302939b40e7a2c083c1016359a7ae519f99e7a5e8d76902c26b5ad
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
 DIST libowfat-0.33.tar.xz 213920 BLAKE2B f902279ae2be96a24ff8760e082a16058db06d20f8e9b55ee54731035f142eb1d9058633be31bc975a3916a44d8d1d4372c2b594e317f5957bff32150aa60785 SHA512 03a56bcbc1a58e340c473d260877218a35841a6915a8369381d74463244cd754fc736006344814855c4d33598ad811d51b7fff4ba41c5e6d38d56297903dcaf5
 EBUILD libowfat-0.32-r1.ebuild 1041 BLAKE2B cd184f6303790a883e32e6d706534f3c9324bbb910f4439e54c3ef8d283f7ed36cfd49ec3289b66096ed41d89dfabb8ea61d9e96080d1192ec19a4fd09ad77c6 SHA512 02239d59b02d21f23e6d2aefd915a86b968189e557e271711db93c4b4334f2ceb0fc6e0370709412331aa7190fef05d6006d2d1b3c92f7e9385a8051b1ad2985
 EBUILD libowfat-0.32-r5.ebuild 1573 BLAKE2B dfb20c55e2d648ff60d21791d5f63a79b26ac551eb0c4680c21f5a7648b9927398b3b74df1d79f26ee480126f92085aa1758ab31031bad9c569c7b9503cd7fe2 SHA512 9b392da8307d3be8115ddaf97a53d42a815893732972b8743297e4e718fbcb9a55fbb5185a85fe62c321a2a8e81814e348105dfd5b29bfca4e5af49d0e5e2167
-EBUILD libowfat-0.33.ebuild 1127 BLAKE2B 14a635d356a9a3ec1577c242fb58be84a9d6881e2d6bacad07ff7c1ca8fe3598b951f1aca8d6471543f4350b1249cd25214e13d252dbc4ac3180e7abfeb9473d SHA512 0008142e0fd758b67328b4df348e77a2c82791694dc87410c71a52cedc19020f9318efe16519e7292df5d6e1e0adcc174000bc7ae65cb8c8529a1103ce41f65f
+EBUILD libowfat-0.33-r1.ebuild 1131 BLAKE2B ae23936f4ff45b39dce969e11c38c43ec58a46e1fea9413f63ecbd82c9b992ffb75d01c4f696cea54332077c16dfece2de81ba40b8be643c58f63661d562ae0c SHA512 2d03426cc21926ec39e65d251970d39bff5ce64e610f4b896bbcb3de74d064f8aacea3a055c9ea6be17324b1c1499f49a66583589e8c160580708a9b1857a34a
 MISC metadata.xml 480 BLAKE2B 49c7453e40ab25a232a9c3c107e81d96a1a320fc550ae0855deccdba949747c5eb42119302e21abefe2233308f43a65221e1ce57dd60484790e0224ef64e011f SHA512 54c8b37a53ee832a917721328b30277847e4e8c8562c186edef8f0c28f3b50fb9fbf5745617d051b92c0f99f9a62f81a510ee256d9107a2149a00bfc807356d8
diff --git a/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch b/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch
deleted file mode 100644
index df3d312e3b22..000000000000
--- a/dev-libs/libowfat/files/libowfat-0.33-headerdeps.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 3a34ab07a66da18cbe11321d451be701d814a167 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eb@emlix.com>
-Date: Wed, 16 Nov 2022 15:22:00 +0100
-Subject: [PATCH] libowfat: fix header dependencies
-
----
- GNUmakefile | 44 +++++++++++++++-------------
- 1 file changed, 23 insertions(+), 21 deletions(-)
-
-diff --git a/GNUmakefile b/GNUmakefile
-index 67f8373..63f105b 100644
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -46,7 +46,7 @@ CFLAGS_OPT=-pipe $(WARN) $(DEFINE) $(OPT_PLUS)
- 
- #CFLAGS=-pipe -Os -march=pentiumpro -mcpu=pentiumpro -fomit-frame-pointer -fschedule-insns2 -Wall
- 
--ent: ent.c haveuint128.h
-+ent: ent.c haveuint128.h headers
- 	$(CC) -g -o ent ent.c -I.
- 
- # CFLAGS += -fstrict-aliasing -Wstrict-aliasing=2
-@@ -110,34 +110,36 @@ IO_OBJS=$(patsubst io/%.c,%.o,$(wildcard io/*.c))
- CDB_OBJS=$(patsubst cdb/%.c,%.o,$(wildcard cdb/*.c))
- CRITBIT_OBJS=$(patsubst critbit/%.c,%.o,$(wildcard critbit/*.c))
- 
--$(BYTE_OBJS): byte.h
--$(FMT_OBJS): fmt.h
--$(SCAN_OBJS): scan.h haveuint128.h
--$(STR_OBJS): str.h
-+$(BYTE_OBJS): byte.h headers
-+$(FMT_OBJS): fmt.h headers
-+$(SCAN_OBJS): scan.h haveuint128.h headers
-+$(STR_OBJS): str.h headers
- $(UINT_OBJS): uint16.h uint32.h
--$(STRALLOC_OBJS): stralloc.h
--$(SOCKET_OBJS): socket.h
--$(BUFFER_OBJS): buffer.h
--$(MMAP_OBJS): mmap.h open.h
--$(TEXTCODE_OBJS): textcode.h
--$(TAI_OBJS): tai.h uint64.h
--$(TAIA_OBJS): taia.h tai.h uint64.h
--$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h
--$(CASE_OBJS): case.h
--$(ARRAY_OBJS): uint64.h array.h
--$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h
--$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h
--$(CDB_OBJS): cdb.h uint32.h
--$(CRITBIT_OBJS): critbit.h
-+$(OPEN_OBJS): open.h headers
-+$(STRALLOC_OBJS): stralloc.h headers
-+$(UNIX_OBJS): headers
-+$(SOCKET_OBJS): socket.h headers
-+$(BUFFER_OBJS): buffer.h headers
-+$(MMAP_OBJS): mmap.h open.h headers
-+$(TEXTCODE_OBJS): textcode.h headers
-+$(TAI_OBJS): tai.h uint64.h headers
-+$(TAIA_OBJS): taia.h tai.h uint64.h headers
-+$(DNS_OBJS): dns.h stralloc.h taia.h tai.h uint64.h iopause.h headers
-+$(CASE_OBJS): case.h headers
-+$(ARRAY_OBJS): uint64.h array.h headers
-+$(MULT_OBJS): uint64.h uint32.h uint16.h safemult.h rangecheck.h headers
-+$(IO_OBJS): uint64.h array.h io.h io_internal.h taia.h tai.h haveepoll.h havekqueue.h havesigio.h havebsdsf.h havedevpoll.h havesendfile.h headers
-+$(CDB_OBJS): cdb.h uint32.h headers
-+$(CRITBIT_OBJS): critbit.h headers
- 
- mult64.o: haveuint128.h
- 
- 
--iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h
-+iob_addbuf.o iob_addfile.o iob_new.o iob_reset.o iob_send.o: iob_internal.h iob.h headers
- 
- iopause.o: iopause.h select.h
- openreadclose.o readclose.o: readclose.h
--dns_rcip.o dns_rcrw.o openreadclose.o: openreadclose.h
-+dns_rcip.o dns_rcrw.o openreadclose.o: openreadclose.h headers
- 
- iob_send.o scan_ip6if.o: havealloca.h
- 
--- 
-2.38.1
-
diff --git a/dev-libs/libowfat/libowfat-0.33.ebuild b/dev-libs/libowfat/libowfat-0.33-r1.ebuild
index fb74b9b387c4..140aed4ff868 100644
--- a/dev-libs/libowfat/libowfat-0.33.ebuild
+++ b/dev-libs/libowfat/libowfat-0.33-r1.ebuild
@@ -17,16 +17,15 @@ IUSE="diet"
 RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-headerdeps.patch
-)
-
 pkg_setup() {
 	# Required for mult/umult64.c to be usable
 	append-flags -fomit-frame-pointer
 }
 
 src_compile() {
+	# workaround for broken dependencies
+	emake headers
+
 	emake \
 		CC="$(tc-getCC)" \
 		AR="$(tc-getAR)" \