Gentoo Archives: gentoo-commits

From: John Helmert III <ajak@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/mdbtools/, app-office/mdbtools/files/
Date: Sat, 01 Jan 2022 09:42:51
Message-Id: 1641030102.26b84082902202ace4963dced4b1c2436d896a39.ajak@gentoo
1 commit: 26b84082902202ace4963dced4b1c2436d896a39
2 Author: John Helmert III <ajak <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 1 09:32:30 2022 +0000
4 Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 1 09:41:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b84082
7
8 app-office/mdbtools: drop 0.9.2
9
10 Bug: https://bugs.gentoo.org/830371
11 Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
12
13 app-office/mdbtools/Manifest | 1 -
14 .../mdbtools-0.9.2-unixODBC-respect-libdir.patch | 46 ----------------
15 app-office/mdbtools/mdbtools-0.9.2.ebuild | 61 ----------------------
16 3 files changed, 108 deletions(-)
17
18 diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
19 index 3a80361f7404..4b1a7e93af57 100644
20 --- a/app-office/mdbtools/Manifest
21 +++ b/app-office/mdbtools/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST mdbtools-0.9.2.tar.gz 214246 BLAKE2B f62ffae2b084e53f7222ab969aa7f57f65735281383f93aeb025cff38b32b9aa22ffffb819532f816cc45a9156f7136bd9de953b17b86817380123451d51170c SHA512 cb2bddca83eb9867b765f6fc57fb289f91ce4e2e09dd953e338c26f6c4bcfe9ddb53368c4eef6d02927e582c2e10312462b82916c2e956fa269f25a765371d8d
24 DIST mdbtools-0.9.3.tar.gz 214697 BLAKE2B 59aca58d11b9c513c8d5b8401423b04484657543d742e20e058e7b29e8225a2c2c3b6e5a95a61a2214a1323b1c5d80b08a71c9f9bcdbf2f35b079a7b05919841 SHA512 3ceb9e374fd638a01d087a1f5e8fb357b24f0a85a8f9c65743a78ec1d6a981fed299744610382ae525f3781e73e268de5c4bb2e48eff78e48b197e2add23587e
25 DIST mdbtools-0.9.4.tar.gz 215253 BLAKE2B 7538fe36ce63b01a395b39272da3c212d6743bb789b38123d1f951f5678177ba541d64e7a58c08ff5f537d5cda4309c814521a33df5402ad3bc3bacd3d872425 SHA512 4ec5ae66b572970f5d450d94457a5e12a0b376dfbdb10ca8566be2f9d35a8837c0b7381ac6e8b935192b892e7d7c71fef089bb07f4ae789596c1dac07a062e1a
26 DIST mdbtools-1.0.0.tar.gz 220553 BLAKE2B 55cf3120f16ded1374c0b5535c45a0d15e4d2ec62d4029856bea570282e6099565698c00b27295b01b455eca10d9271e743e60086b427647dfe51c25d65c531d SHA512 3844bde9df3a5beafa40914fef3db25a9b3bc0e66cbd012fd6ad0fcf89e66f48afa922be61972b4d6a7a3d0ba0bf1881f7d8fdebce7f52f19254133dd1d3fc5f
27
28 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
29 deleted file mode 100644
30 index 42c62f04bec5..000000000000
31 --- a/app-office/mdbtools/files/mdbtools-0.9.2-unixODBC-respect-libdir.patch
32 +++ /dev/null
33 @@ -1,46 +0,0 @@
34 -https://github.com/mdbtools/mdbtools/commit/686110d2241f02b3242d02d7c4ded9509aacd0df
35 -https://bugs.gentoo.org/697568
36 -
37 -From 686110d2241f02b3242d02d7c4ded9509aacd0df Mon Sep 17 00:00:00 2001
38 -From: Sam James <sam@g.o>
39 -Date: Sat, 27 Feb 2021 14:33:23 +0000
40 -Subject: [PATCH] configure.ac: Respect --libdir for unixODBC
41 -
42 -When searching for unixODBC, we want to use
43 -the libdir passed in to autotools (--libdir)
44 -to ensure that we find the library
45 -for the correct ABI.
46 -
47 -It is possible that we pick up the wrong
48 -copy from e.g. /usr/lib/ where a 32-bit
49 -unixODBC copy of the library exists
50 -when we're in the middle of a 64-bit build.
51 -
52 -Use ${libdir} to ensure we respect
53 -any preferences/information given and
54 -search for ODBC in the right place.
55 -
56 -Note that this previously affected
57 -us with iODBC but that's since been
58 -resolved by using their
59 -iodbc-config binary.
60 -
61 -Bug: https://bugs.gentoo.org/697568
62 -Signed-off-by: Sam James <sam@g.o>
63 ----
64 - configure.ac | 2 +-
65 - 1 file changed, 1 insertion(+), 1 deletion(-)
66 -
67 -diff --git a/configure.ac b/configure.ac
68 -index c802843d..7a1f357b 100644
69 ---- a/configure.ac
70 -+++ b/configure.ac
71 -@@ -157,7 +157,7 @@ AC_ARG_WITH(unixodbc,
72 - if test "$with_unixodbc"; then
73 - HAVE_ODBC=true
74 - ODBC_CFLAGS="-I$with_unixodbc/include"
75 -- ODBC_LIBS="-L$with_unixodbc/lib"
76 -+ ODBC_LIBS="-L$with_unixodbc/$libdir"
77 - CFLAGS="$CFLAGS -DUNIXODBC"
78 -
79 - dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
80
81 diff --git a/app-office/mdbtools/mdbtools-0.9.2.ebuild b/app-office/mdbtools/mdbtools-0.9.2.ebuild
82 deleted file mode 100644
83 index 4910a56d6104..000000000000
84 --- a/app-office/mdbtools/mdbtools-0.9.2.ebuild
85 +++ /dev/null
86 @@ -1,61 +0,0 @@
87 -# Copyright 1999-2021 Gentoo Authors
88 -# Distributed under the terms of the GNU General Public License v2
89 -
90 -EAPI=7
91 -
92 -inherit autotools
93 -
94 -DESCRIPTION="Set of libraries and utilities for reading Microsoft Access database (MDB) files"
95 -HOMEPAGE="https://github.com/mdbtools/mdbtools"
96 -SRC_URI="https://github.com/mdbtools/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
97 -
98 -LICENSE="GPL-2 LGPL-2.1"
99 -SLOT="0/3"
100 -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
101 -IUSE="glib odbc"
102 -
103 -BDEPEND="
104 - app-text/txt2man
105 - sys-devel/flex
106 - virtual/pkgconfig
107 - virtual/yacc
108 -"
109 -RDEPEND="
110 - sys-libs/ncurses:0=
111 - sys-libs/readline:0=
112 - odbc? ( >=dev-db/unixODBC-2.0 )
113 - glib? ( dev-libs/glib:2 )
114 -"
115 -DEPEND="${RDEPEND}"
116 -
117 -DOCS=( AUTHORS HACKING NEWS README.md )
118 -
119 -PATCHES=(
120 - # bug #697568
121 - "${FILESDIR}/${P}-unixODBC-respect-libdir.patch"
122 -)
123 -
124 -src_prepare() {
125 - default
126 -
127 - # bug #770019
128 - sed -i -e 's/-Werror//' configure.ac || die
129 -
130 - eautoreconf
131 -}
132 -
133 -src_configure() {
134 - local myeconfargs=(
135 - --disable-static
136 - $(use_enable glib)
137 - $(use odbc && echo "--with-unixodbc=${EPREFIX}/usr")
138 - )
139 -
140 - econf "${myeconfargs[@]}"
141 -}
142 -
143 -src_install() {
144 - default
145 -
146 - find "${ED}" -name '*.la' -delete || die
147 -}