gentoo auto-resync : 09:09:2022 - 10:40:04

4 files changed, 3 insertions, 112 deletions

diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 07aa2df8d4fd..cff5cf29a9fb 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,7 +1,5 @@
-AUX libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch 1492 BLAKE2B 18332883446eab98d32663950dcd6db179d5fd370a4b6d7a06c00ea4e46336b01b1558123c801392dda559fe7101b326ea1dad3b9818033916340af227fb7952 SHA512 117fb2a008dd11b4b6a49d2dd29407021637923fd1828431e172931dd87bc252e886dd330fb8c09c8ee482114dceb82dda9ac93adbdf6242e440572075c12443
-AUX libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch 1663 BLAKE2B bfd5d53aa1b71ebb1a51f0e5c1159e00b1cc1c62d72342903f8dd24d3f4d6dffc440e8356666bbf415d7faaffd200b93b1eab1eb2c67368fb7c160e51def3e47 SHA512 87574fad469fc29dedf0b9a2744552751b08e5de9fd09a5eba428f1038ee12a54a9f41ddf7847e737879f54cb1eb649d24eb71163561d4126da010e1ea54aaa2
 DIST libofx-0.10.3.tar.gz 225132 BLAKE2B 29dff4cb79a4a535bf255c787e184d103ecdbe975bb4bb223b675bbacaff9f8a228ae0a3dffe7710c2707496ac65c4f48ce993243b8353172c53cb02067d9267 SHA512 6c024628a6a11d9542c669a438223331a033eb820b1a2c3001c60d1ab3fad45ccdec64f9b54dd206fe0058ead8e14e751eb7a3bd88e8f9e1013b0bdd5b6c5242
-DIST libofx-0.10.6.tar.gz 1836880 BLAKE2B 4c5fd24576f969e9ced311e112f183596905bd1225dbfe8646a8f24d545d49fe3b496baadf46e174bfb708ffbaac67b44e746cc8acb8e74509ef5ec22f8f3972 SHA512 8c8a569ca3083c7101c051857d286c3615461fdd88065666d7d6dc53a95d1251a6e5fd44be6cbf54e3591d9ba2b3916c846a4e9e83d6a6c4724e35a193c6a679
+DIST libofx-0.10.7.tar.gz 1420230 BLAKE2B 03a98fa3dc79519a7e84b5c0df1686ef523c2f2209caa4f4cb3e40f2cbac0172956cab107ef4086f0e13aea2898bdd36e7a56140874cbd8a2a88d5634ef988c2 SHA512 da96d24675cf681d007e3d4f7d83f4fc2ca56d991b4128f4e3a870fd66d70302950b24b1e17e78a9795d19704f1af7cd2102929b3290f27204499f42a24502a2
 EBUILD libofx-0.10.3.ebuild 1160 BLAKE2B cdfce6873c28f88c8cdc17b8b640962f494a0ef20e9c02518099ae9498b54eefc103ddaacda063144f7bc28ad7a963fe53503ea8717bc2a02bbbadf3c7f68700 SHA512 da36e60cd6780ab8ce1df578cef553bfec2406e180ad3873098a5cbde535e4a40691ff80daa502f307644c7942e48bd5592758d50eec02a0680e1fa5b6479b7c
-EBUILD libofx-0.10.6-r1.ebuild 1274 BLAKE2B aceedcf170571d43626d9f65815e4129471dc4f6950a2665395a4dbaa98f52255761e74e623d735634fbbf8d43054e270fad37b12dc22b604c4cec25fff2f8b2 SHA512 ffd995b9b5e1f865c99b64bdc8e09de167a8e73b7ff21ecef805ad362c7ee200470cd58931ae885762c599733010224297906e6f2d918e8d8a3b24e801b88359
+EBUILD libofx-0.10.7.ebuild 990 BLAKE2B 8ca537b4aadb23799fafdba8c57aa4c0576219bcf6bb06f41d26ffb15666c2bff3a1ce0383d478c875ea15ba78cddf2cc006a82f85793c79d6ed7f854f6ac903 SHA512 efc48d240828f7a52daa3c434ee5cffa3f68a5e25afdc19a4c0a0c9a4d978795144249282e4272b148d50bba2a9fdf67c9465b395a9393c199bfc789321a8269
 MISC metadata.xml 297 BLAKE2B 819f3298f3f9a816e9630ebce9f8d163b5974cbd76a1e6bf5ad5c499a3e926b887c0396b6f1c8d13e765b3b37cce93188d15b2ff0bef52d98b7f9bb516225bbb SHA512 58f2ece0d8cb8ffb32fc849e42a49cd086c08a0dbd4e03ab78ec51a9224f3ce60c69acaa56712567ee4e1a4d87aabd7830d2a60af1a5669af7a9eb7b4ec4f046
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch b/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
deleted file mode 100644
index 283e852fef0f..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From a8326e0800c5c28228624005566ae9f37a775367 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 05:47:00 +0100
-Subject: [PATCH 1/2] autotools: fix LIBOFX_MAJOR_VERSION and friends in
- libofx.h
-
-Closes: https://github.com/libofx/libofx/issues/76
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,17 +8,15 @@ dnl Process this file with autoconf to produce a configure script.
- # FUNCTION:
- # implements checks for a variety of system-specific functions
- 
--
--
--LIBOFX_MAJOR_VERSION=0
--LIBOFX_MINOR_VERSION=10
--LIBOFX_MICRO_VERSION=6
--AC_INIT(libofx, 0.10.6)  # must repeat the version number here, sorry
-+AC_INIT([libofx], [0.10.6])  # must repeat the version number here, sorry
-+AC_SUBST([LIBOFX_MAJOR_VERSION], [0])
-+AC_SUBST([LIBOFX_MINOR_VERSION], [10])
-+AC_SUBST([LIBOFX_MICRO_VERSION], [6])
- 
- LIBOFX_VERSION_RELEASE_STRING="$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION"
- 
- AC_CONFIG_SRCDIR(inc/libofx.h.in)
--AM_CONFIG_HEADER(config.h)
-+AM_CONFIG_HEADER([config.h])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(m4)
- AC_PROG_CC
-@@ -57,9 +55,6 @@ CXXFLAGS="-DIN_LIBOFX $CXXFLAGS"
- 
- LIBOFX_VERSION=$LIBOFX_MAJOR_VERSION.$LIBOFX_MINOR_VERSION.$LIBOFX_MICRO_VERSION
- 
--AC_SUBST(LIBOFX_MAJOR_VERSION)
--AC_SUBST(LIBOFX_MINOR_VERSION)
--AC_SUBST(LIBOFX_MICRO_VERSION)
- LIBOFX_BUILD_VERSION=0
- AC_SUBST(LIBOFX_BUILD_VERSION)
- AC_SUBST(LIBOFX_VERSION_RELEASE_STRING)
diff --git a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch b/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
deleted file mode 100644
index 8288aac50947..000000000000
--- a/dev-libs/libofx/files/libofx-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/libofx/libofx/pull/77
-
-From 55923eba7617c7c4056b21ddf3b569adaea43858 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 6 Sep 2022 06:00:04 +0100
-Subject: [PATCH 2/2] autotools: fix parallel build issue with ofxconnect,
- ofxdump
-
-We need to build the relevant tool before calling help2man, as
-help2man tries to call the tool itself.
-
-Otherwise, we get:
-```
-help2man: can't get `--help' info from ./ofxdump
-Try `--no-discard-stderr' if option outputs to stderr
-make[2]: *** [Makefile:1211: ofxdump.1] Error 127
-make[2]: *** Waiting for unfinished jobs....
-```
-
-Ends up building okay as a workaround with -j1.
-
-Bug: https://github.com/libofx/libofx/pull/56
-See: 0597b8a0a9da3226af0779163fbb3ca389d70bc9
-Fixes: 76dae192b4bf642b311084043cf9d6273dd69bb2
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/ofxconnect/Makefile.am
-+++ b/ofxconnect/Makefile.am
-@@ -23,9 +23,9 @@ EXTRA_DIST = cmdline.ggo test-privateserver.sh CMakeLists.txt
- 
- # See README.privateserver for details on this server and how to get
- # the key needed to run this test.
--TESTS = test-privateserver.sh 
-+TESTS = test-privateserver.sh
- 
--ofxconnect.1: $(top_srcdir)/configure.ac
-+ofxconnect.1: ofxconnect$(EXEEXT)
- if HAVE_HELP2MAN
- 	$(HELP2MAN)  -n 'Create a statement request file' -N --output=ofxconnect.1 ./ofxconnect$(EXEEXT)
- else
---- a/ofxdump/Makefile.am
-+++ b/ofxdump/Makefile.am
-@@ -15,7 +15,7 @@ cmdline.c cmdline.h: cmdline.ggo Makefile
- 
- endif
- 
--ofxdump.1: $(top_srcdir)/configure.ac
-+ofxdump.1: ofxdump$(EXEEXT)
- if HAVE_HELP2MAN
- 	$(HELP2MAN) -n 'Dump content of OFX files as human-readable text' -N --output=ofxdump.1 ./ofxdump$(EXEEXT)
- else
diff --git a/dev-libs/libofx/libofx-0.10.6-r1.ebuild b/dev-libs/libofx/libofx-0.10.7.ebuild
index fb768f5ba89e..87cfdff2482d 100644
--- a/dev-libs/libofx/libofx-0.10.6-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Library to support the Open Financial eXchange XML format"
 HOMEPAGE="https://github.com/libofx/libofx"
@@ -31,18 +31,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.6-0001-autotools-fix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch
-	"${FILESDIR}"/${PN}-0.10.6-0002-autotools-fix-parallel-build-issue-with-ofxconnect-o.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for header version patch
-	eautoreconf
-}
-
 src_configure() {
 	# bug #566456
 	append-cxxflags -std=c++14