commit:     c4d47c9df98b4b8693dbf54b2bf8bd9095177c21
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 03:09:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep  9 03:09:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d47c9d

dev-libs/libofx: add 0.10.7, drop 0.10.6-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libofx/Manifest                           |  2 +-
 ...ix-LIBOFX_MAJOR_VERSION-and-friends-in-li.patch | 45 -------------------
 ...ix-parallel-build-issue-with-ofxconnect-o.patch | 50 ----------------------
 ...ibofx-0.10.6-r1.ebuild => libofx-0.10.7.ebuild} | 14 +-----
 4 files changed, 2 insertions(+), 109 deletions(-)

diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index bd8bd434efdf..bded13c24c1a 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,2 +1,2 @@
 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

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 <[email protected]>
-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 <[email protected]>
---- 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 <[email protected]>
-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 <[email protected]>
---- 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
similarity index 76%
rename from dev-libs/libofx/libofx-0.10.6-r1.ebuild
rename to 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

Reply via email to