8 files changed, 93 insertions, 139 deletions
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index d2972bc72cb3..d92f7b444774 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,8 +1,5 @@
-AUX libofx-0.9.15-docdir-nothanks.patch 539 BLAKE2B 816194bff853bfec0cee811a2906a3c09143e79f3935e66f3ea7693bb7a8befc8a3e23bfa82cf612a928a4417554ccb42bfefa6885230fe33f27177d85d364c0 SHA512 819941c94e9c6ed393f3224d70a0905bd58d6d30d7b9f5fff68554f0d22030be9b170b44542fd70c7d6bbe3b3e2ee011cbe286e72d6b4bab2f05a3d1610cf0c1
-DIST libofx-0.10.0.tar.gz 225574 BLAKE2B 29ce24ce8f0a333e2d35371cba217223e59e72e1f41051279c15033fecd5f33d7381e9be8403f2e639c007ca6aca1d53cf651e057c9842350772c2296b92c436 SHA512 b7767088701e22a2eba072c365d379987c6e9b2403888550068d6f62f48eaee7935e5355fa6ec97ac7a79bb847c833552250c0bd3065f9274b209585a7884f1d
+AUX libofx-0.10.1-docdir.patch 1192 BLAKE2B 0fde1254701b6022970346600f1dbdec14c9024e72f6d8012c64e5e81e24af469ed5933a16d4702b68e4f0f2e7bb4afc8ae8a7a730ebb3fd6af52e4f06e0884c SHA512 953cdc7e38fe7ce563eac06087f114294abde65cd8fb93c25d3fcdad8cb6d0a49a3ab1818558eb3ca58617f868b2eff146ad8f55fa38774dd675476e19983e9f
+AUX libofx-0.10.1-opensp-libdir.patch 1216 BLAKE2B 504ef0fd3a06539d1ec3590c0613a80470c5b2fcde2c2c2ffaaeb75901e1391e79c617270af5b22942d067d43bb9522e78faeadca300e7a59c2f9f5a4e58332a SHA512 f5bb1ba87e68213e609c50f96635e7bf1de009a8e6720586fa62ad19f68776f9b8871a7782ff439f310ea31dc8010c5a4bce4b78398b980c11a6f8b6a81ebf27
 DIST libofx-0.10.1.tar.gz 226512 BLAKE2B bc0fa1ea0d5c7968730b50b9163a045304dd82f7e312e407ce9393a56ea6b1f9d47382b1299ee990640b98d5f047656aa38a9a8da4d8f19d3bea0236e0487cf1 SHA512 4575424abb56b93021ef223f90460979b544c32b4624936bbad16d0b5711afb6b5fa31b7c2cb835ff7a26be8c7ac51951198e5565a098713b8d33f0e17be774a
-DIST libofx-0.9.15.tar.gz 207361 BLAKE2B c84fd4593a9888268c691653dc1b5fff5c38013f12ccc4a8454f9a5026ba190388e5747074aa800266efcfd49a0fdb391a605d5837f664bdcb8fe1dc5c064839 SHA512 6014bf9c457adbe9053a47718064e6246c911c3bf081c690bf761650220208aabe94824aaa38794c1834462894b7948a06b3ff6b517a9a84b9f881ba51aee3a1
-EBUILD libofx-0.10.0.ebuild 1140 BLAKE2B 9afd641e07b3f052c83296611ecdebcb335c20e1fa7b0dcccbb6d9129bb154caeacdbc3858b6224a454c668d4034a431ddadc2d28076bd7e50536731262a9904 SHA512 dccb49c1e6b018c086cee1bf22f1b6a791bb6208fc65987eb141e9c9e563f6a24db3c7b915c760f924ecbc2f1c56c23f10fd827f210e7d25c95cf0b411adca5d
-EBUILD libofx-0.10.1-r1.ebuild 1156 BLAKE2B 0d79282546b28500d40840514f973adbe56bd3f0b3e16318b74815a9331dfeeb1a3b74ef0763c9736cf4ff9a1a9f2d7c0c5e0907f8ace237512259d2d686323a SHA512 a0f1eb2b8878266d962a01d3650f8e5f9274b18c242f615a8fdf9a1aaf5c81e43dafd8af0dd2fe4fe8c64168273aa88911feb93191bf0acda9b87a8c9272f572
-EBUILD libofx-0.9.15.ebuild 1037 BLAKE2B e8dfb36676b66ea17433f2a5320c74946f42def29eb972668dc388b58f4b25bcd410e57efcbf61b7a860a35d652ece28f955ec41a38f5dc41538b1623f03189f SHA512 9c18d1650b0c2ff2cc822dae6de12d64d2315cf489669df5c8cce8547eacc61ab700a1d530fa81dc3e900dcef90fb3277deba661873b7e4170d2c8fa082870e9
-MISC metadata.xml 243 BLAKE2B 1611cb7b6df68e87374031fa563dcb5388243c0df9537b81e1c53f05cc297789e1f4d178edbbc8906af7a6b0ec549aae225662f87df1d48dc4a6fa2cc2c703c0 SHA512 fc5071bd581b91f72ea6f021641f47d46d1e6038cac7bd34bc13d94e6229441e3b2f7cdd981490a169d7e645339fe4137496a0eb0956014027ffd42a5b9814a8
+EBUILD libofx-0.10.1-r1.ebuild 1239 BLAKE2B 83292626ed46b5c33d6d50fa02e8f564a906040d225c525de948f8eaba3a617aec3e50a3ad06328b7cbc42a3df539489dcf9ba519c61aaaff554657a40a5c06b SHA512 832c114686f8c26d72af61de21bd165e3a6bedb128de84cac53b5cd1e0177420fc6a0928dda3aec320e5f5925f1575ebe2a870629fa3cf08e5a45f482e013631
+MISC metadata.xml 296 BLAKE2B 8c2ee36fd8bf974eaef2eb12ba873f5459d71b0dd9a161740f70bbb9e157ff6aac8e82457a30f8e00d1fc502aa4b186f31fdd97bd83ef4c54970aa751d379d54 SHA512 a95d11edfc43b8a9ea3bac90eb1ee87fa9e73388ac87eb9f8fe8773e7558bb9b761482355a841a784baaa9d0ca69a2ee08274392adc852e03594cb4d1bd7f60b
diff --git a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
new file mode 100644
index 000000000000..a43fdffd523f
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
@@ -0,0 +1,40 @@
+https://github.com/libofx/libofx/commit/ee296908c23a944b9b034c9b1f8b974edcb44b80
+
+From ee296908c23a944b9b034c9b1f8b974edcb44b80 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 06:09:11 +0000
+Subject: [PATCH] Makefile.am, doc/Makefile.am: don't override docdir
+
+'docdir' is already provided by autotools. By not overriding it,
+we allow the directory to be easily overriden at build time.
+
+By default, docdir is /usr/share/doc/libofx, so no change!
+
+e.g. In Gentoo, we prefer to use --docdir=/usr/share/doc/${PF}
+where ${PF} represents the upstream version combined with any
+internal distribution changes made.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,8 +6,6 @@ endif
+ DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
+ SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
+ 
+-docdir = $(datadir)/doc/libofx
+-
+ doc_DATA = \
+   AUTHORS \
+   COPYING \
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 23e9d34..bd0a04d 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,5 @@
+ SUBDIRS =
+ 
+-docdir = ${prefix}/share/doc/libofx
+-
+ EXTRA_DIST = \
+ 	doxygen.cfg \
+ 	ofx_sample_files \
diff --git a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
new file mode 100644
index 000000000000..036c6864bed9
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
@@ -0,0 +1,34 @@
+https://github.com/libofx/libofx/commit/a647c1db417459bded7fb47af69dff375eae83c1
+
+From a647c1db417459bded7fb47af69dff375eae83c1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 6 Mar 2021 05:57:49 +0000
+Subject: [PATCH] configure.ac: Respect --libdir for OpenSP
+
+When searching for OpenSP, we want to use
+the libdir passed in to autotools (--libdir)
+to ensure that we find the library
+for the correct ABI.
+
+It is possible that we pick up the wrong
+copy from e.g. /usr/lib/ where a 32-bit
+copy of OpenSP exists
+when we're in the middle of a 64-bit build.
+
+Use ${libdir} to ensure we respect
+any preferences/information given and
+search for OpenSP in the right place.
+
+Bug: https://bugs.gentoo.org/693458
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -112,7 +112,7 @@ AC_ARG_WITH(opensp-libs,
+ [  --with-opensp-libs=PATH         specify where to look for libosp
+                                   - default is /usr/lib],
+ 			OPENSPLIBPATH="$with_opensp_libs",
+-			OPENSPLIBPATH="/usr/lib")
++			OPENSPLIBPATH="${libdir}")
+ 
+ 			echo $OPENSPLIBPATH
+ for d in /usr/include/OpenSP /usr/local/include/OpenSP /usr/include/sp/generic /usr/local/include/sp/generic; do
diff --git a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch b/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
deleted file mode 100644
index 6b8cc215eadb..000000000000
--- a/dev-libs/libofx/files/libofx-0.9.15-docdir-nothanks.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am	2019-09-30 22:33:58.000000000 +0200
-+++ b/Makefile.am	2019-10-12 22:46:00.915146241 +0200
-@@ -4,18 +4,7 @@
-   MAYBE_OFXCONNECT = ofxconnect
- endif
- DIST_SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump ofxconnect
--SUBDIRS = m4 inc dtd lib doc . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
--
--docdir = $(datadir)/doc/libofx
--
--doc_DATA = \
--  AUTHORS \
--  COPYING \
--  INSTALL \
--  NEWS \
--  README \
--  ChangeLog \
--  totest.txt
-+SUBDIRS = m4 inc dtd lib . ofx2qif ofxdump $(MAYBE_OFXCONNECT)
- 
- EXTRA_DIST = \
-   libofx.spec.in \
diff --git a/dev-libs/libofx/libofx-0.10.0.ebuild b/dev-libs/libofx/libofx-0.10.0.ebuild
deleted file mode 100644
index 72d72da9a57b..000000000000
--- a/dev-libs/libofx/libofx-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-RDEPEND="
-	>app-text/opensp-1.5
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# Not included in the tarball
-	sed -i -e '/INSTALL/d' Makefile.am || die
-	# Use correct location for docs
-	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
-
-	eautoreconf
-	append-cxxflags -std=c++14 # bug #566456
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -type f -delete || die
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -type f -delete || die
-	fi
-}
diff --git a/dev-libs/libofx/libofx-0.10.1-r1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
index 0db669fdea8e..e2f99a67303d 100644
--- a/dev-libs/libofx/libofx-0.10.1-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
@@ -12,13 +12,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/10"
 KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-util/gengetopt
 	sys-apps/help2man
 	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
 	test? ( app-crypt/gnupg )
 "
 RDEPEND="
@@ -30,13 +31,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-opensp-libdir.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
+
 src_prepare() {
 	default
 
 	# Not included in the tarball
 	sed -i -e '/INSTALL/d' Makefile.am || die
-	# Use correct location for docs
-	sed -i -e 's:doc/libofx:doc/${PF}:' Makefile.am doc/Makefile.am || die
 
 	# bug #566456
 	append-cxxflags -std=c++14
@@ -45,11 +49,17 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-static
+	econf \
+		$(use_enable doc html-docs) \
+		--disable-static
 }
 
 src_compile() {
 	emake -j1
+
+	if use doc ; then
+		emake doc
+	fi
 }
 
 src_install() {
diff --git a/dev-libs/libofx/libofx-0.9.15.ebuild b/dev-libs/libofx/libofx-0.9.15.ebuild
deleted file mode 100644
index 81c4ebbb55b0..000000000000
--- a/dev-libs/libofx/libofx-0.9.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Library to support the Open Financial eXchange XML format"
-HOMEPAGE="https://github.com/libofx/libofx"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig
-	test? ( app-crypt/gnupg )
-"
-RDEPEND="
-	>=dev-cpp/libxmlpp-2.40.1:2.6
-	>=net-misc/curl-7.9.7
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	>app-text/opensp-1.5
-"
-
-PATCHES=( "${FILESDIR}/${P}-docdir-nothanks.patch" )
-
-# workaround needed for ofxconnect to compile
-MAKEOPTS="-j1"
-
-src_prepare() {
-	default
-	eautoreconf
-	append-cxxflags -std=c++14 # bug #566456
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-	if ! use static-libs; then
-		find "${D}" -name '*.a' -type f -delete || die
-	fi
-}
diff --git a/dev-libs/libofx/metadata.xml b/dev-libs/libofx/metadata.xml
index 78afc83cfd53..a635fdae3fd9 100644
--- a/dev-libs/libofx/metadata.xml
+++ b/dev-libs/libofx/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<remote-id type="github">libofx/libofx</remote-id>
 		<remote-id type="sourceforge">libofx</remote-id>
 	</upstream>
 </pkgmetadata>