gentoo resync : 03.03.2021

5 files changed, 119 insertions, 2 deletions

diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 2b8ce0e67350..82ffeed248c3 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,6 +1,9 @@
 AUX mdbtools-0.7.1-parallel-make.patch 513 BLAKE2B 1f9e2ccebe4dbf4bbf4655eef237da00016fe060a43ef7a2479b6bd83f98f198959fb3101a97ad016c81ab7d09cf006cb8531c675a066bb6e185282cc8e16609 SHA512 946139271a757a8beeeb03a909104bc348cbc081a9ef6dde7f739865c775cce06717de57560a49b5055d5196b1f3985824b80b728f139cf7684c0ba847f4bd85
+AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7
 DIST mdbtools-0.7.1.tar.gz 277257 BLAKE2B 3740c543b1ea2e898a96dc1a560fd83cf079d37f5d02805891c5902b75a417c9efbf421346902766017113d447b088656afbfd0297b26655aa07fce973adc216 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75
 DIST mdbtools-0.9.1.tar.gz 158762 BLAKE2B a730c1ea4efceebb494fc69eac5b94ab23088e0c496684fe027b005492168b6639ec3ebc950e09f643e4a1b50017150caee639255e5e1deb5f9a46c0969077ff SHA512 d8383c20c062a759386e80927337f8ed526914fb53095480dfe791d80fe4cc3e19e83627ca9d34986968b282b16b4c43a6302f76c55d3c2545b6e7b625d47966
-EBUILD mdbtools-0.7.1-r2.ebuild 1058 BLAKE2B 5888b1284e69e61cdc5404aa4e7bb965d9e746358c334f3518e1c0bbe9103ead7b2522dd23f1244793cac4d9239622d0be9607eab7d513017be812e0372b1019 SHA512 8db409fa492f03359cc453c3cfe16c705d6d99098a27e863690eb08c5b3fd1227b4c5b58b295ed475b58f422a23774ac51a0e94861b0788001df64b39092808a
-EBUILD mdbtools-0.9.1.ebuild 1069 BLAKE2B 8b939bc4147b8c4c82f72380a05673cc17a1c9b28f739faba13d385d9ea560139a130ea83e9b45d64829ab44fa840e602df0fe72d31bd092d3ecbd2079d1ff10 SHA512 f8ffebe9d0c295d332ddcf6558bf884e3cd74a0181826667f9c235692e8998535c0f8824f8272c44889f729ac1b4b0987c0c6354e9ddd6bc3c28cc886d2b6ce2
+DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
+EBUILD mdbtools-0.7.1-r2.ebuild 1134 BLAKE2B cf15361d03c654a166260cf2c64469d74d6c0085708204732a40e319cf78a1e9e89e5ca9694f80b8bffaa297ac1c19d7d7b76a3f278d58faa26e1f89848b8d5e SHA512 410bb846549dbdc5a99b848847980d2c5a29b2c38e493df38d7162986bde16045c0674d291e944157806df5bdc8bdd52c4eaab20e313bba1e51611577bf04883
+EBUILD mdbtools-0.9.1.ebuild 1182 BLAKE2B df9f6bc65fc09be68aae1e304e14ea9ce16334910404e7da8389b0fc27b253dbde89b957b6d153298dcbb8fb61ca99ac228071e440bb4734b06ca40bf6b9f1d3 SHA512 9a0792c77fbc5cb8436a1f37f543a3ae2abd7603995359b2c77ec1fcd6d7066007934de62bf3d434a18a8023b6dfc2f0044995e11badf7d34ee0a7cdf8063d1f
+EBUILD mdbtools-0.9.2.ebuild 1145 BLAKE2B 8f6696b5fefc19c4ae2f3264ef3dd24a9cef1237db97a6ee545b0a928a444e002f9f2353cfa5cb58e8060805b868790412a49d128d636d780bbaac274987a4cb SHA512 a635ffbb5ad30f6be4816d5f76eae97afb908a427c5c768e49b5b6fd9ff8525d593f3eecee5825ecee42aeab8bea2621b6e9549a2dcea37b03cea33b40b15141
 MISC metadata.xml 354 BLAKE2B fff9791af58b802e3ac40795a7d3c298d70a09cdf3e394ed265411bb98587802fc29e5b670f96b45ef0a03c001efd5bd6a246f46a9ad9f4e55690efb4f920cfb SHA512 dadf070ffc6e1ffc0b55ebc63147b88c74586b9d357ea60e931c676683607243ae1537e607167bebe84267b095637b0380034f617bd5562e5b5011db09f8a35a
diff --git a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
new file mode 100644
index 000000000000..42c62f04bec5
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
@@ -0,0 +1,46 @@
+https://github.com/mdbtools/mdbtools/commit/686110d2241f02b3242d02d7c4ded9509aacd0df
+https://bugs.gentoo.org/697568
+
+From 686110d2241f02b3242d02d7c4ded9509aacd0df Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 27 Feb 2021 14:33:23 +0000
+Subject: [PATCH] configure.ac: Respect --libdir for unixODBC
+
+When searching for unixODBC, 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
+unixODBC copy of the library 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 ODBC in the right place.
+
+Note that this previously affected
+us with iODBC but that's since been
+resolved by using their
+iodbc-config binary.
+
+Bug: https://bugs.gentoo.org/697568
+Signed-off-by: Sam James <sam@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c802843d..7a1f357b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -157,7 +157,7 @@ AC_ARG_WITH(unixodbc,
+ if test "$with_unixodbc"; then
+ 	HAVE_ODBC=true
+ 	ODBC_CFLAGS="-I$with_unixodbc/include"
+-	ODBC_LIBS="-L$with_unixodbc/lib"
++	ODBC_LIBS="-L$with_unixodbc/$libdir"
+ 	CFLAGS="$CFLAGS -DUNIXODBC"
+ 
+ 	dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
diff --git a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
index ee4183e217e7..f64c8aa4c17e 100644
--- a/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
+++ b/app-office/mdbtools/mdbtools-0.7.1-r2.ebuild
@@ -34,6 +34,9 @@ PATCHES=( "${FILESDIR}/${P}-parallel-make.patch" )
 src_prepare() {
 	default
 
+	# bug #697568
+	sed -i -e "s:/lib\":/$(get_libdir)\":" configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-office/mdbtools/mdbtools-0.9.1.ebuild b/app-office/mdbtools/mdbtools-0.9.1.ebuild
index d88b6b3b98a7..9632418d1e42 100644
--- a/app-office/mdbtools/mdbtools-0.9.1.ebuild
+++ b/app-office/mdbtools/mdbtools-0.9.1.ebuild
@@ -36,6 +36,10 @@ src_prepare() {
 	# bug #770019
 	sed -i -e 's/-Werror//' configure.ac || die
 
+	# bug #697568
+	# TODO: upstream with autotools fix
+	sed -i -e "s:/lib\":/$(get_libdir)\":" configure.ac || die
+
 	eautoreconf
 }
 
diff --git a/app-office/mdbtools/mdbtools-0.9.2.ebuild b/app-office/mdbtools/mdbtools-0.9.2.ebuild
new file mode 100644
index 000000000000..6a6ef62bb51b
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="https://github.com/mdbtools/mdbtools"
+SRC_URI="https://github.com/brianb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="glib odbc"
+
+BDEPEND="
+	app-text/txt2man
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+"
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	odbc? ( >=dev-db/unixODBC-2.0 )
+	glib? ( dev-libs/glib:2 )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS HACKING NEWS README.md )
+
+PATCHES=(
+	# bug #697568
+	"${FILESDIR}/${P}-unixODBC-respect-libdir.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #770019
+	sed -i -e 's/-Werror//' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_enable glib)
+		$(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}