gentoo resync : 04.01.2022

3 files changed, 0 insertions, 110 deletions

diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 4ea008cb9185..76fd0d1d394b 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,9 +1,6 @@
-AUX mdbtools-0.9.2-unixODBC-respect-libdir.patch 1439 BLAKE2B 9afc3b2951947593c029eeff66ebcc93da8ff34ef5d1cf25d08848fb950b2cafa533e08b682cf1a5f11eeec1dcc6e1d0df2f9712d576ac2f63bb207ab6c16b42 SHA512 08df20d8f60a8a1323685571649c7fa0127fa4a29a9fbbf431d51265e06194017f71eb6c7d186a3160679971ebd7cc64b5c1f2e428c939dd7dd79b98952816d7
-DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
 DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e
 DIST mdbtools-0.9.4.tar.gz 215253 BLAKE2B 7538fe36ce63b01a395b39272da3c212d6743bb789b38123d1f951f5678177ba541d64e7a58c08ff5f537d5cda4309c814521a33df5402ad3bc3bacd3d872425 SHA512 4ec5ae66b572970f5d450d94457a5e12a0b376dfbdb10ca8566be2f9d35a8837c0b7381ac6e8b935192b892e7d7c71fef089bb07f4ae789596c1dac07a062e1a
 DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f
-EBUILD mdbtools-0.9.2.ebuild 1147 BLAKE2B 3006a2d2b3c1dab0e14f9338ad4f21e66f1ab655a906db18ea746999560481ae3a8ec6c08d6059890b96004e2beae2b82d30e0268ad33f1212658761e939efac SHA512 b113e23c91258628a08d1fd257b510adf84523c0259538af69f791cdc0eb1ea2f2534d18d730c2007b5409b9321c532057079b627fad4535de2bbce3081026d3
 EBUILD mdbtools-0.9.3.ebuild 1112 BLAKE2B 5b56db9dfd00d08308c3bfe3793bb2581994d3aadb00d97f867f93a5f051eab9343724134ef4fdfd4af3998d586fa97dd2999e34b82a707772208a8a602a424c SHA512 4f01e7c596383250f13bae4ef36e71eb799e1153287ef4a514ddc96b50fece6bf865ab5a1e315f88f1f224d9b70ddaa2ac595a9236e8bb657c2f965aaa8b84d3
 EBUILD mdbtools-0.9.4.ebuild 1112 BLAKE2B 5b56db9dfd00d08308c3bfe3793bb2581994d3aadb00d97f867f93a5f051eab9343724134ef4fdfd4af3998d586fa97dd2999e34b82a707772208a8a602a424c SHA512 4f01e7c596383250f13bae4ef36e71eb799e1153287ef4a514ddc96b50fece6bf865ab5a1e315f88f1f224d9b70ddaa2ac595a9236e8bb657c2f965aaa8b84d3
 EBUILD mdbtools-1.0.0.ebuild 1121 BLAKE2B f6253632c14e8d3eca5ae2a8bceb03293c62b965ba125460605e023c1e058f0a3c8d2b6b3d216815df0d85bd4f523e4d399da9e555d6d20173c5c0d6448a2aee SHA512 cc384097206091aeedcdeec00e92a38aa762b0d673673e9a5a9fda8e44d4b53156bef8a9afbfdb31327a709274aa45e18a38f606ee85b5f772dc78eae5552598
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
deleted file mode 100644
index 42c62f04bec5..000000000000
--- a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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.9.2.ebuild b/app-office/mdbtools/mdbtools-0.9.2.ebuild
deleted file mode 100644
index 4910a56d6104..000000000000
--- a/app-office/mdbtools/mdbtools-0.9.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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/mdbtools/${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
-}