Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde-sunset:master commit in: dev-db/unixODBC/files/, dev-db/unixODBC/
Date: Mon, 30 Nov 2020 02:19:30
Message-Id: 1606699554.7533d81c9af91a0082f7d377a7cf00203e53dc2d.asturm@gentoo
1 commit: 7533d81c9af91a0082f7d377a7cf00203e53dc2d
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 01:25:54 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 01:25:54 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=7533d81c
7
8 dev-db/unixODBC: Drop Qt3 adjacent package
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 dev-db/unixODBC/ChangeLog | 301 ---------------------
13 ...350-unixODBC-2.2.12-gODBCConfig-as-needed.patch | 14 -
14 .../files/360-unixODBC-2.2.12-libltdlfixes.patch | 35 ---
15 .../files/unixODBC-2.2.11-Makefile.am.patch | 41 ---
16 .../files/unixODBC-2.2.11-configure.in.patch | 10 -
17 dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch | 19 --
18 dev-db/unixODBC/metadata.xml | 5 -
19 dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild | 62 -----
20 dev-db/unixODBC/unixODBC-2.2.12.ebuild | 105 -------
21 9 files changed, 592 deletions(-)
22
23 diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
24 deleted file mode 100644
25 index 3849d9b1..00000000
26 --- a/dev-db/unixODBC/ChangeLog
27 +++ /dev/null
28 @@ -1,301 +0,0 @@
29 -# ChangeLog for dev-db/unixODBC
30 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.75 2008/06/15 17:33:57 hoffie Exp $
32 -
33 - 21 Mar 2013; Lars Wendler <polynomial-c@g.o>
34 - unixODBC-2.2.11-r1.ebuild, unixODBC-2.2.12.ebuild:
35 - Fixed dependencies on qt packages.
36 -
37 - 25 Jun 2010; Martin von Gagern (MvG) <Martin.vGagern@×××.net>
38 - unixODBC-2.2.12.ebuild:
39 - Update ebuild to use dev-vcs package group.
40 -
41 - 15 Jun 2008; Christian Hoffmann <hoffie@g.o>
42 - unixODBC-2.2.12.ebuild:
43 - Moving autotools calls to src_unpack and using e* wrappers instead of
44 - calling them directly. Thanks to flameeyes for noticing that, thanks to
45 - Rafał Mużyło <galtgendo@××.pl> for jogging my memory, bug 226545
46 -
47 - 29 May 2008; Tiziano Müller <dev-zero@g.o>
48 - +files/360-unixODBC-2.2.12-libltdlfixes.patch, unixODBC-2.2.12.ebuild:
49 - Removed bundled libltdl (fixes bug #221879).
50 -
51 - 13 Mar 2008; <ricmm@g.o> unixODBC-2.2.11-r1.ebuild,
52 - unixODBC-2.2.12.ebuild:
53 - Drop to ~mips due to unstable deps
54 -
55 - 01 Sep 2007; Markus Ullmann <jokey@g.o>
56 - +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
57 - unixODBC-2.2.12.ebuild:
58 - Port --as-needed fix from project overlay
59 -
60 - 01 Sep 2007; Jakub Moc <jakub@g.o>
61 - +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
62 - unixODBC-2.2.12.ebuild:
63 - Fix compile with --as-needed and USE=gnome, Bug 173048
64 -
65 - 21 Aug 2007; Markus Ullmann <jokey@g.o> unixODBC-2.2.12.ebuild:
66 - Depend on dev-util/cvs if USE=gnome is set, see Bug 173256 for reasons
67 -
68 - 01 Jul 2007; Tobias Scherbaum <dertobi123@g.o>
69 - unixODBC-2.2.12.ebuild:
70 - hppa stable, bug #183194
71 -
72 - 29 Jun 2007; Gustavo Zacarias <gustavoz@g.o>
73 - unixODBC-2.2.12.ebuild:
74 - Stable on sparc wrt #183194
75 -
76 - 28 Jun 2007; Raúl Porcel <armin76@g.o> unixODBC-2.2.12.ebuild:
77 - alpha/ia64/x86 stable wrt #183194
78 -
79 - 28 Jun 2007; Markus Rothe <corsair@g.o> unixODBC-2.2.12.ebuild:
80 - Stable on ppc64; bug #183194
81 -
82 - 28 Jun 2007; Joshua Kinard <kumba@g.o> unixODBC-2.2.12.ebuild:
83 - Stable on mips, per #183194.
84 -
85 - 27 Jun 2007; Lars Weiler <pylon@g.o> unixODBC-2.2.12.ebuild:
86 - Stable on ppc; bug #183194.
87 -
88 - 27 Jun 2007; Christoph Mende <angelos@g.o> unixODBC-2.2.12.ebuild:
89 - Stable on amd64
90 -
91 -*unixODBC-2.2.12 (01 Apr 2007)
92 -
93 - 01 Apr 2007; Robin H. Johnson <robbat2@g.o>
94 - +unixODBC-2.2.12.ebuild:
95 - Version bump of unixODBC - Bug #111910, thanks to Attila Fazekas
96 - <turul16@××××××××.hu> for all of the patches. Also fixes bug #143149 for
97 - static libraries and bug #169566 for libtool handling.
98 -
99 - 04 Jan 2007; Diego Pettenò <flameeyes@g.o>
100 - unixODBC-2.2.11-r1.ebuild:
101 - Fix broken autotools handling.
102 -
103 - 02 Dec 2006; Luca Longinotti <chtekk@g.o>
104 - unixODBC-2.2.11-r1.ebuild:
105 - Fix bug #151555.
106 -
107 - 01 Dec 2006; Luca Longinotti <chtekk@g.o>
108 - -files/unixODBC-2.2.6-configure.in.patch, -files/gentoo-yac.diff,
109 - metadata.xml, -unixODBC-2.0.8.ebuild, -unixODBC-2.2.2.ebuild,
110 - -unixODBC-2.2.6.ebuild, -unixODBC-2.2.6-r1.ebuild, -unixODBC-2.2.8.ebuild,
111 - -unixODBC-2.2.11.ebuild, unixODBC-2.2.11-r1.ebuild:
112 - PHP herd takes over maintainership, fixup/cleanup ebuilds.
113 -
114 - 17 Nov 2006; Saleem Abdulrasool <compnerd@g.o> unixODBC-2.2.6.ebuild,
115 - unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild, unixODBC-2.2.11.ebuild,
116 - unixODBC-2.2.11-r1.ebuild:
117 - Dropping gnome useflag for gnome-1.x removal
118 -
119 - 09 Oct 2006; <malc@g.o> unixODBC-2.2.11-r1.ebuild:
120 - Fix multilib-strict QA checks - bug #149983
121 -
122 - 15 Jul 2006; Bryan Østergaard <kloeri@g.o> metadata.xml:
123 - Remove rphillips from metadata.xml as he's retired.
124 -
125 - 10 Jul 2006; Javier Villavicencio <the_paya@g.o>
126 - unixODBC-2.2.11-r1.ebuild:
127 - Added ~x86-fbsd keyword.
128 -
129 - 24 Jun 2006; Doug Goldstein <cardoe@g.o> unixODBC-2.2.2.ebuild,
130 - unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild,
131 - unixODBC-2.2.11.ebuild, unixODBC-2.2.11-r1.ebuild:
132 - USE flag change qt->qt3/qt4 bug #137785
133 -
134 - 14 Jan 2006; Mike Frysinger <vapier@g.o>
135 - +files/unixODBC-2.2.11-flex.patch, unixODBC-2.2.11-r1.ebuild:
136 - Add patch by Francisco José Cañizares Santofimia to fix building with
137 - newer versions of flex #110167.
138 -
139 - 02 Oct 2005; Aron Griffis <agriffis@g.o> unixODBC-2.2.11-r1.ebuild:
140 - Mark 2.2.11-r1 stable on ia64
141 -
142 - 02 Oct 2005; MATSUU Takuto <matsuu@g.o> unixODBC-2.2.11-r1.ebuild:
143 - Stable on sh.
144 -
145 - 29 Sep 2005; Hardave Riar <hardave@g.o> unixODBC-2.2.11-r1.ebuild:
146 - Stable on mips.
147 -
148 - 10 Sep 2005; Aron Griffis <agriffis@g.o> unixODBC-2.2.11-r1.ebuild:
149 - Mark 2.2.11-r1 stable on alpha
150 -
151 - 03 Sep 2005; Markus Rothe <corsair@g.o> unixODBC-2.2.11-r1.ebuild:
152 - Stable on ppc64
153 -
154 - 26 Aug 2005; Aron Griffis <agriffis@g.o> unixODBC-2.2.11-r1.ebuild:
155 - add ~ia64
156 -
157 - 19 Aug 2005; Michael Hanselmann <hansmi@g.o>
158 - unixODBC-2.2.11-r1.ebuild:
159 - Stable on ppc.
160 -
161 - 16 Aug 2005; Gustavo Zacarias <gustavoz@g.o>
162 - unixODBC-2.2.11-r1.ebuild:
163 - Stable on sparc
164 -
165 - 12 Aug 2005; Caleb Tennis <caleb@g.o>
166 - +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
167 - Bump to x86 stable
168 -
169 -*unixODBC-2.2.11-r1 (12 Aug 2005)
170 -
171 - 12 Aug 2005; Caleb Tennis <caleb@g.o>
172 - +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
173 - Add a patch to fix a compilation issue
174 -
175 - 25 Jul 2005; Caleb Tennis <caleb@g.o> unixODBC-2.2.11.ebuild:
176 - Fix qt dep
177 -
178 -*unixODBC-2.2.11 (16 Jul 2005)
179 -
180 - 16 Jul 2005; Daniel Black <dragonheart@g.o>
181 - +files/unixODBC-2.2.11-configure.in.patch, +unixODBC-2.2.11.ebuild:
182 - Version bump thanks to Russell Chait. Fixes bug #77508
183 -
184 - 07 Jul 2005; Caleb Tennis <caleb@g.o> unixODBC-2.2.2.ebuild,
185 - unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
186 - Fix qt dep
187 -
188 - 12 Jun 2005; Sven Wegener <swegener@g.o> unixODBC-2.2.2.ebuild,
189 - unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
190 - Removed * postfix from <, <=, >= and > dependencies.
191 -
192 - 29 May 2005; Danny van Dyk <kugelfang@g.o> unixODBC-2.2.8.ebuild:
193 - BUG #94262(multilib-strict) fixed as of unixODBC-2.2.8.
194 -
195 - 10 May 2005; Carsten Lohrke <carlo@g.o> unixODBC-2.0.8.ebuild:
196 - removed Qt 2 support
197 -
198 - 08 Apr 2005; Spider <spider@g.o> unixODBC-2.2.6.ebuild:
199 - Ugh, Dumb fix. Commited from the wrong overlay :(
200 - -now- it works.
201 -
202 - 07 Apr 2005; Spider <spider@g.o> unixODBC-2.2.6.ebuild:
203 - Fix for bug 86936. ( X headers moved location )
204 -
205 - 06 Feb 2005; <rphillips@g.o> unixODBC-2.2.8.ebuild:
206 - added dusan cerhaty's fix for QT and finding X libraries. #79620
207 -
208 - 07 Jan 2005; Aaron Walker <ka0ttic@g.o> unixODBC-2.2.8.ebuild:
209 - Fix libtool version mismatch for bug 74642.
210 -
211 - 01 Nov 2004; Lars Weiler <pylon@g.o> unixODBC-2.2.8.ebuild:
212 - Stable on ppc for PHP5, Bug #60442.
213 -
214 - 29 Jun 2004; Aron Griffis <agriffis@g.o> unixODBC-2.0.8.ebuild,
215 - unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
216 - unixODBC-2.2.8.ebuild:
217 - glibc -> libc
218 -
219 - 12 Jun 2004; Tom Gall <tgall@g.o> unixODBC-2.2.8.ebuild:
220 - stable on ppc64, bug# 53766
221 -
222 - 02 Jun 2004; Aron Griffis <agriffis@g.o> unixODBC-2.0.8.ebuild,
223 - unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
224 - unixODBC-2.2.8.ebuild:
225 - Fix use invocation
226 -
227 - 11 May 2004; Michael McCabe <randy@g.o> unixODBC-2.2.8.ebuild:
228 - Added s390 keywords
229 -
230 - 23 Mar 2004; Joshua Kinard <kumba@g.o> unixODBC-2.0.8.ebuild,
231 - unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
232 - unixODBC-2.2.8.ebuild:
233 - For 2.2.8, masked the qt/gnome-libs interface for unixODBC until qt stuff can
234 - be sorted out on mips.
235 -
236 - 04 Apr 2004; Ryan Phillips <rphillips@g.o> unixODBC-2.2.8.ebuild:
237 - I hope this fixes people's problems with the unixODBC build process. #42711
238 -
239 - 27 Feb 2004; Joshua Kinard <kumba@g.o> unixODBC-2.2.8.ebuild:
240 - Forgot gnuconfig
241 -
242 - 27 Feb 2004; Joshua Kinard <kumba@g.o> unixODBC-2.2.8.ebuild:
243 - Added ~mips to KEYWORDS to satisfy repoman deps (this package still needs
244 - qt and gnome-libs, but I can't test those right now, will keyword later).
245 -
246 -*unixODBC-2.2.8 (19 Feb 2004)
247 -
248 - 19 Feb 2004; Ryan Phillips <rphillips@g.o> unixODBC-2.2.8.ebuild:
249 - version bump
250 -
251 - 10 Feb 2004; root <root@g.o> unixODBC-2.2.6-r1.ebuild:
252 - changed USE var from gtk to gnome and tweaked dependency. Fixes #34916
253 -
254 -*unixODBC-2.2.6-r1 (10 Feb 2004)
255 -
256 - 10 Feb 2004; root <root@g.o> unixODBC-2.2.6-r1.ebuild:
257 - Added William Blew's patch. Bug #35570
258 -
259 - 08 Jan 2004; Robin H. Johnson <robbat2@g.o> unixODBC-2.2.6.ebuild:
260 - bump to ppc stable
261 -
262 - 07 Jan 2004; <agriffis@g.o> unixODBC-2.2.6.ebuild:
263 - stable on ia64
264 -
265 - 16 Dec 2003; Guy Martin <gmsoft@g.o> unixODBC-2.2.6.ebuild:
266 - Marked stable on hppa.
267 -
268 - 19 Dec 2003; <rphillips@g.o> unixODBC-2.2.6.ebuild:
269 - Added Olivier fixes for gODBCConfig
270 -
271 - 15 Dec 2003; <rphillips@g.o> unixODBC-2.2.6.ebuild:
272 - added Cory Visi's modified ebuild to correct the dependecy problems with
273 - gODBCconfig. #35889
274 -
275 - 04 Dec 2003; Jason Wever <weeve@g.o> unixODBC-2.2.6.ebuild:
276 - Marked stable to fix dependency borkage.
277 -
278 - 01 Dec 2003; <rphillips@g.o> unixODBC-2.2.6.ebuild:
279 - Added Jonathan Nall's gtk enabled ebuild.
280 -
281 -*unixODBC-2.2.6 (21 Nov 2003)
282 -
283 - 21 Nov 2003; <rphillips@g.o> unixODBC-2.2.6.ebuild:
284 - Version bump due to the QT version within portage
285 -
286 - 26 Oct 2003; Robin H. Johnson <robbat2@g.o> unixODBC-2.2.2.ebuild:
287 - cleanup ebuild slightly
288 -
289 - 10 Jun 2003; Will Woods <wwoods@g.o> unixODBC-2.0.6.ebuild,
290 - unixODBC-2.0.8.ebuild, unixODBC-2.2.2.ebuild:
291 - Added alpha to KEYWORDS
292 -
293 - 21 May 2003; Jason Wever <weeve@g.o> unixODBC-2.0.6.ebuild:
294 - Added sparc to keywords.
295 -
296 -*unixODBC-2.2.2 (9 Jul 2002)
297 -
298 - 31 Jul 2003; Ryan Phillips <rphillips@g.o> unixODBC-2.2.2.ebuild:
299 - Fixes #23609. yac patch
300 -
301 - 11 Mar 2003; Guy Matrin <gmsoft@g.o> unixODBC-2.2.2.ebuild,
302 - unixODBC-2.0.8.ebuild, unixODBC-2.0.6.ebuild :
303 - Added hppa to keywords.
304 -
305 - 07 Feb 2003; Ryan Phillips <rphillips@g.o> unixODBC-2.0.6.ebuild :
306 - Fixes #13166
307 -
308 - 19 Oct 2002; Calum Selkirk <cselkirk@g.o> unixODBC-2.0.6.ebuild
309 -*unixODBC-2.0.8.ebuild :
310 -
311 - Added ppc to KEYWORDS.
312 -
313 - 19 Oct 2002; Calum Selkirk <cselkirk@g.o> unixODBC-2.2.2.ebuild :
314 -
315 - Added ppc to KEYWORDS.
316 -
317 - 9 Jul 2002; Ryan Phillips <rphillips@g.o> unixODBC-2.2.2.ebuild :
318 -
319 - New version
320 -
321 -*unixODBC-2.0.6 (1 Feb 2002)
322 -
323 - 1 Feb 2002; G.Bevin <gbevin@g.o> ChangeLog :
324 -
325 - Added initial ChangeLog which should be updated whenever the package is
326 - updated in any way. This changelog is targetted to users. This means that the
327 - comments should well explained and written in clean English. The details about
328 - writing correct changelogs are explained in the skel.ChangeLog file which you
329 - can find in the root directory of the portage repository.
330
331 diff --git a/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch
332 deleted file mode 100644
333 index 566ad68a..00000000
334 --- a/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch
335 +++ /dev/null
336 @@ -1,14 +0,0 @@
337 --- gODBCConfig/src/Makefile.am.orig 2005-09-17 15:08:16.000000000 +0200
338 -+++ gODBCConfig/src/Makefile.am 2007-08-27 18:29:22.000000000 +0200
339 -@@ -22,6 +22,10 @@
340 - interface.h \
341 - callbacks.c callbacks.h
342 -
343 -+
344 -+libgtkodbcconfig_la_LIBADD = ../../odbcinst/libodbcinst.la
345 -+
346 -+
347 - gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la ../../ini/libinilc.la
348 -
349 - gODBCConfig_LDADD = $(GNOME_LIBDIR) \
350 -
351
352 diff --git a/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch b/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch
353 deleted file mode 100644
354 index c26f1a8a..00000000
355 --- a/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch
356 +++ /dev/null
357 @@ -1,35 +0,0 @@
358 -diff -Naur unixODBC-2.2.12.orig/configure.in unixODBC-2.2.12/configure.in
359 ---- unixODBC-2.2.12.orig/configure.in 2008-05-29 15:54:09.000000000 +0200
360 -+++ unixODBC-2.2.12/configure.in 2008-05-29 15:58:32.000000000 +0200
361 -@@ -163,9 +163,6 @@
362 - dnl Configure libtool
363 - AM_PROG_LIBTOOL
364 -
365 --dnl Configure libltdl
366 --AC_CONFIG_SUBDIRS(libltdl)
367 --
368 - use_builtin_libtool="no"
369 -
370 - dnl override the libtool lines if we use the system libs
371 -diff -Naur unixODBC-2.2.12.orig/exe/Makefile.am unixODBC-2.2.12/exe/Makefile.am
372 ---- unixODBC-2.2.12.orig/exe/Makefile.am 2008-05-29 15:54:09.000000000 +0200
373 -+++ unixODBC-2.2.12/exe/Makefile.am 2008-05-29 15:57:14.000000000 +0200
374 -@@ -103,6 +103,6 @@
375 -
376 - if WITHLT
377 - dltest_DEPENDENCIES = $(LIBLTDL)
378 --dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
379 - else
380 - endif
381 -+dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
382 -diff -Naur unixODBC-2.2.12.orig/Makefile.am unixODBC-2.2.12/Makefile.am
383 ---- unixODBC-2.2.12.orig/Makefile.am 2008-05-29 15:54:09.000000000 +0200
384 -+++ unixODBC-2.2.12/Makefile.am 2008-05-29 15:57:56.000000000 +0200
385 -@@ -3,7 +3,6 @@
386 - log \
387 - lst \
388 - ini \
389 -- libltdl \
390 - odbcinst \
391 - DriverManager \
392 - odbcinstQ \
393
394 diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch
395 deleted file mode 100644
396 index 0417ff29..00000000
397 --- a/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch
398 +++ /dev/null
399 @@ -1,41 +0,0 @@
400 ---- unixODBC-2.2.11/DataManager/Makefile.am 2004-09-13 16:46:11.000000000 +0200
401 -+++ unixODBC.cvs/DataManager/Makefile.am 2005-03-09 17:39:17.000000000 +0100
402 -@@ -8,6 +8,7 @@
403 - @QT_LDFLAGS@ \
404 - @USER_LDFLAGS@ \
405 - @LIB_QT@ \
406 -+ ../ini/libinilc.la \
407 - ../odbcinst/libodbcinst.la \
408 - ../DriverManager/libodbc.la
409 -
410 ---- unixODBC-2.2.11/DataManagerII/Makefile.am 2004-11-20 13:57:38.000000000 +0100
411 -+++ unixODBC.cvs/DataManagerII/Makefile.am 2005-03-09 17:39:18.000000000 +0100
412 -@@ -8,6 +8,7 @@
413 - @QT_LDFLAGS@ \
414 - @USER_LDFLAGS@ \
415 - @LIB_QT@ \
416 -+ ../ini/libinilc.la \
417 - ../odbcinst/libodbcinst.la \
418 - ../DriverManager/libodbc.la
419 -
420 ---- unixODBC-2.2.11/odbctest/Makefile.am 2004-09-13 16:47:34.000000000 +0200
421 -+++ unixODBC.cvs/odbctest/Makefile.am 2005-03-09 17:39:27.000000000 +0100
422 -@@ -8,6 +8,7 @@
423 - @QT_LDFLAGS@ \
424 - @USER_LDFLAGS@ \
425 - @LIB_QT@ \
426 -+ ../ini/libinilc.la \
427 - ../odbcinst/libodbcinst.la \
428 - ../DriverManager/libodbc.la \
429 - $(LIBLTDL) $(LIBADD_DL)
430 ---- unixODBC-2.2.11/gODBCConfig/src/Makefile.am.orig 2005-07-21 10:03:12.051477479 +0200
431 -+++ unixODBC-2.2.11/gODBCConfig/src/Makefile.am 2005-07-21 10:04:10.359597876 +0200
432 -@@ -28,6 +28,7 @@
433 - $(GNOMEUI_LIBS) \
434 - $(INTLLIBS) \
435 - -L$(ODBCLIBS) $(ODBCLIB) \
436 -- libgtkodbcconfig.la
437 -+ libgtkodbcconfig.la \
438 -+ ../../ini/.libs/libinilc.la
439 -
440 -
441
442 diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch
443 deleted file mode 100644
444 index 6b72daa4..00000000
445 --- a/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch
446 +++ /dev/null
447 @@ -1,10 +0,0 @@
448 ---- configure.in.orig 2003-12-10 20:08:49.000000000 -0800
449 -+++ configure.in 2003-12-10 20:11:33.000000000 -0800
450 -@@ -29,6 +29,7 @@
451 -
452 - if test "x$gui" = "xtrue"; then
453 - AC_PROG_CXX
454 -+AC_PATH_X
455 - else
456 - dnl This gets around a autoconf problem
457 - if
458
459 diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
460 deleted file mode 100644
461 index 80652cd0..00000000
462 --- a/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
463 +++ /dev/null
464 @@ -1,19 +0,0 @@
465 ---- unixODBC-2.2.6/sqp/lex.l.orig Wed Oct 17 18:40:32 2001
466 -+++ unixODBC-2.2.6/sqp/lex.l Thu Jul 10 11:23:35 2003
467 -@@ -178,6 +178,7 @@
468 -
469 - '[^'\n]*$ {
470 - yyerror( "Unterminated string" );
471 -+ YY_FLUSH_BUFFER;
472 - }
473 -
474 - /***************************************
475 -@@ -236,8 +237,6 @@
476 - void yyerror( char *s )
477 - {
478 - sprintf( g_szError, "%s processing '%s' on line %d", s, yytext, g_nLineNo );
479 --
480 -- YY_FLUSH_BUFFER;
481 - }
482 -
483 - /**********************************************************************
484
485 diff --git a/dev-db/unixODBC/metadata.xml b/dev-db/unixODBC/metadata.xml
486 deleted file mode 100644
487 index 6f49eba8..00000000
488 --- a/dev-db/unixODBC/metadata.xml
489 +++ /dev/null
490 @@ -1,5 +0,0 @@
491 -<?xml version="1.0" encoding="UTF-8"?>
492 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
493 -<pkgmetadata>
494 -<!-- maintainer-needed -->
495 -</pkgmetadata>
496
497 diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
498 deleted file mode 100644
499 index 1c6187a7..00000000
500 --- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
501 +++ /dev/null
502 @@ -1,62 +0,0 @@
503 -# Copyright 1999-2013 Gentoo Foundation
504 -# Distributed under the terms of the GNU General Public License v2
505 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.19 2008/03/13 21:42:01 ricmm Exp $
506 -
507 -WANT_AUTOCONF="latest"
508 -WANT_AUTOMAKE="latest"
509 -
510 -inherit eutils multilib autotools
511 -
512 -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
513 -
514 -DESCRIPTION="ODBC Interface for Linux."
515 -HOMEPAGE="http://www.unixodbc.org/"
516 -SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
517 -LICENSE="GPL-2"
518 -SLOT="0"
519 -IUSE="qt3"
520 -
521 -DEPEND=">=sys-libs/readline-4.1
522 - >=sys-libs/ncurses-5.2
523 - qt3? ( =dev-qt/qt-meta-3* )"
524 -RDEPEND="${DEPEND}"
525 -
526 -# the configure.in patch is required for 'use qt3'
527 -src_unpack() {
528 - unpack ${P}.tar.gz
529 - cd "${S}"
530 -
531 - # solve bug #110167
532 - epatch "${FILESDIR}/${P}-flex.patch"
533 - # braindead check in configure fails - hackish approach
534 - epatch "${FILESDIR}/${P}-configure.in.patch"
535 - epatch "${FILESDIR}/${P}-Makefile.am.patch"
536 -
537 - eautoreconf
538 -}
539 -
540 -src_compile() {
541 - local myconf
542 -
543 - if use qt3 && ! use mips ; then
544 - myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
545 - else
546 - myconf="--enable-gui=no"
547 - fi
548 -
549 - econf --prefix=/usr \
550 - --sysconfdir=/etc/${PN} \
551 - --libdir=/usr/$(get_libdir) \
552 - ${myconf} || die "econf failed"
553 -
554 - emake -j1 || die "emake failed"
555 -}
556 -
557 -src_install() {
558 - emake -j1 DESTDIR="${D}" install || die "emake install failed"
559 -
560 - dodoc AUTHORS ChangeLog NEWS README*
561 - find doc/ -name "Makefile*" -exec rm '{}' \;
562 - dohtml doc/*
563 - prepalldocs
564 -}
565
566 diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
567 deleted file mode 100644
568 index e7e02901..00000000
569 --- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
570 +++ /dev/null
571 @@ -1,105 +0,0 @@
572 -# Copyright 1999-2013 Gentoo Foundation
573 -# Distributed under the terms of the GNU General Public License v2
574 -# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.15 2008/06/15 17:33:57 hoffie Exp $
575 -
576 -WANT_AUTOCONF="latest"
577 -WANT_AUTOMAKE="latest"
578 -PATCH_VERSION="2.2.12-r0"
579 -PATCH_P="${PN}-${PATCH_VERSION}-patches"
580 -
581 -inherit eutils multilib autotools gnuconfig libtool
582 -
583 -KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
584 -
585 -DESCRIPTION="ODBC Interface for Linux."
586 -HOMEPAGE="http://www.unixodbc.org/"
587 -SRC_URI="http://www.unixodbc.org/${P}.tar.gz
588 - mirror://gentoo/${PATCH_P}.tar.bz2"
589 -LICENSE="GPL-2"
590 -SLOT="0"
591 -IUSE="qt3 gnome"
592 -
593 -RDEPEND=">=sys-libs/readline-4.1
594 - >=sys-libs/ncurses-5.2
595 - qt3? ( =dev-qt/qt-meta-3* )
596 - gnome? ( gnome-base/libgnomeui )
597 - sys-devel/libtool"
598 -DEPEND="${RDEPEND}
599 - gnome? ( dev-vcs/cvs )" # see Bug 173256
600 -
601 -src_unpack() {
602 - unpack ${A}
603 - cd "${S}"
604 -
605 - epatch "${WORKDIR}"/${PATCH_P}/*
606 - epatch \
607 - "${FILESDIR}/350-${P}-gODBCConfig-as-needed.patch" \
608 - "${FILESDIR}/360-${P}-libltdlfixes.patch"
609 -
610 - # Remove bundled libltdl copy
611 - rm -rf libltdl
612 -
613 - eautoreconf
614 -
615 - if use gnome ; then
616 - cd gODBCConfig
617 - touch ChangeLog
618 - autopoint -f || die "autopoint -f failed"
619 - eautoreconf --install
620 - fi
621 -}
622 -
623 -src_compile() {
624 - local myconf
625 -
626 - if use qt3 && ! use mips ; then
627 - myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
628 - else
629 - myconf="--enable-gui=no"
630 - fi
631 -
632 - econf --host=${CHOST} \
633 - --prefix=/usr \
634 - --sysconfdir=/etc/${PN} \
635 - --libdir=/usr/$(get_libdir) \
636 - --enable-static \
637 - --enable-fdb \
638 - --enable-ltdllib \
639 - ${myconf} || die "econf failed"
640 - emake -j1 || die "emake failed"
641 -
642 - if use gnome; then
643 - # Symlink for configure
644 - ln -s "${S}"/odbcinst/.libs ./lib
645 - # Symlink for libtool
646 - ln -s "${S}"/odbcinst/.libs ./lib/.libs
647 -
648 - cd gODBCConfig
649 - econf --host=${CHOST} \
650 - --with-odbc="${S}" \
651 - --enable-static \
652 - --prefix=/usr \
653 - --sysconfdir=/etc/${PN} || die "econf gODBCConfig failed"
654 - ln -s ../depcomp .
655 - ln -s ../libtool .
656 -
657 - emake || die "emake gODBCConfig failed"
658 - cd ..
659 - fi
660 -}
661 -
662 -src_install() {
663 - emake -j1 DESTDIR="${D}" install || die "emake install failed"
664 -
665 - if use gnome;
666 - then
667 - cd gODBCConfig
668 - emake DESTDIR="${D}" install || die "emake gODBCConfig install failed"
669 - cd ..
670 - fi
671 -
672 - dodoc AUTHORS ChangeLog NEWS README*
673 - find doc/ -name "Makefile*" -exec rm '{}' \;
674 - dohtml doc/*
675 - prepalldocs
676 -}