New ebuild dev-db/unixODBC, needs updating to EAPI=2

10 files changed, 596 insertions, 0 deletions

diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
new file mode 100644
index 000000000..5e25bb526
--- /dev/null
+++ b/dev-db/unixODBC/ChangeLog
@@ -0,0 +1,293 @@
+# ChangeLog for dev-db/unixODBC
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.75 2008/06/15 17:33:57 hoffie Exp $
+
+  15 Jun 2008; Christian Hoffmann <hoffie@gentoo.org>
+  unixODBC-2.2.12.ebuild:
+  Moving autotools calls to src_unpack and using e* wrappers instead of
+  calling them directly. Thanks to flameeyes for noticing that, thanks to
+  Rafał Mużyło <galtgendo@o2.pl> for jogging my memory, bug 226545
+
+  29 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/360-unixODBC-2.2.12-libltdlfixes.patch, unixODBC-2.2.12.ebuild:
+  Removed bundled libltdl (fixes bug #221879).
+
+  13 Mar 2008; <ricmm@gentoo.org> unixODBC-2.2.11-r1.ebuild,
+  unixODBC-2.2.12.ebuild:
+  Drop to ~mips due to unstable deps
+
+  01 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
+  unixODBC-2.2.12.ebuild:
+  Port --as-needed fix from project overlay
+
+  01 Sep 2007; Jakub Moc <jakub@gentoo.org>
+  +files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch,
+  unixODBC-2.2.12.ebuild:
+  Fix compile with --as-needed and USE=gnome, Bug 173048
+
+  21 Aug 2007; Markus Ullmann <jokey@gentoo.org> unixODBC-2.2.12.ebuild:
+  Depend on dev-util/cvs if USE=gnome is set, see Bug 173256 for reasons
+
+  01 Jul 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  unixODBC-2.2.12.ebuild:
+  hppa stable, bug #183194
+
+  29 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  unixODBC-2.2.12.ebuild:
+  Stable on sparc wrt #183194
+
+  28 Jun 2007; Raúl Porcel <armin76@gentoo.org> unixODBC-2.2.12.ebuild:
+  alpha/ia64/x86 stable wrt #183194
+
+  28 Jun 2007; Markus Rothe <corsair@gentoo.org> unixODBC-2.2.12.ebuild:
+  Stable on ppc64; bug #183194
+
+  28 Jun 2007; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.12.ebuild:
+  Stable on mips, per #183194.
+
+  27 Jun 2007; Lars Weiler <pylon@gentoo.org> unixODBC-2.2.12.ebuild:
+  Stable on ppc; bug #183194.
+
+  27 Jun 2007; Christoph Mende <angelos@gentoo.org> unixODBC-2.2.12.ebuild:
+  Stable on amd64
+
+*unixODBC-2.2.12 (01 Apr 2007)
+
+  01 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +unixODBC-2.2.12.ebuild:
+  Version bump of unixODBC - Bug #111910, thanks to Attila Fazekas
+  <turul16@freemail.hu> for all of the patches. Also fixes bug #143149 for
+  static libraries and bug #169566 for libtool handling.
+
+  04 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Fix broken autotools handling.
+
+  02 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Fix bug #151555.
+
+  01 Dec 2006; Luca Longinotti <chtekk@gentoo.org>
+  -files/unixODBC-2.2.6-configure.in.patch, -files/gentoo-yac.diff,
+  metadata.xml, -unixODBC-2.0.8.ebuild, -unixODBC-2.2.2.ebuild,
+  -unixODBC-2.2.6.ebuild, -unixODBC-2.2.6-r1.ebuild, -unixODBC-2.2.8.ebuild,
+  -unixODBC-2.2.11.ebuild, unixODBC-2.2.11-r1.ebuild:
+  PHP herd takes over maintainership, fixup/cleanup ebuilds.
+
+  17 Nov 2006; Saleem Abdulrasool <compnerd@gentoo.org> unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild, unixODBC-2.2.11.ebuild,
+  unixODBC-2.2.11-r1.ebuild:
+  Dropping gnome useflag for gnome-1.x removal
+
+  09 Oct 2006; <malc@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Fix multilib-strict QA checks - bug #149983
+
+  15 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Remove rphillips from metadata.xml as he's retired.
+
+  10 Jul 2006; Javier Villavicencio <the_paya@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Added ~x86-fbsd keyword.
+
+  24 Jun 2006; Doug Goldstein <cardoe@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild,
+  unixODBC-2.2.11.ebuild, unixODBC-2.2.11-r1.ebuild:
+  USE flag change qt->qt3/qt4 bug #137785
+
+  14 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/unixODBC-2.2.11-flex.patch, unixODBC-2.2.11-r1.ebuild:
+  Add patch by Francisco José Cañizares Santofimia to fix building with
+  newer versions of flex #110167.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Mark 2.2.11-r1 stable on ia64
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on sh.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on mips.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Mark 2.2.11-r1 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on ppc64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  add ~ia64
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Stable on sparc
+
+  12 Aug 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
+  Bump to x86 stable
+
+*unixODBC-2.2.11-r1 (12 Aug 2005)
+
+  12 Aug 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
+  Add a patch to fix a compilation issue
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.11.ebuild:
+  Fix qt dep
+
+*unixODBC-2.2.11 (16 Jul 2005)
+
+  16 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/unixODBC-2.2.11-configure.in.patch, +unixODBC-2.2.11.ebuild:
+  Version bump thanks to Russell Chait. Fixes bug #77508
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
+  Fix qt dep
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  29 May 2005; Danny van Dyk <kugelfang@gentoo.org> unixODBC-2.2.8.ebuild:
+  BUG #94262(multilib-strict) fixed as of unixODBC-2.2.8.
+
+  10 May 2005; Carsten Lohrke <carlo@gentoo.org> unixODBC-2.0.8.ebuild:
+  removed Qt 2 support
+
+  08 Apr 2005; Spider <spider@gentoo.org> unixODBC-2.2.6.ebuild:
+  Ugh, Dumb fix. Commited from the wrong overlay :(
+  -now- it works.
+
+  07 Apr 2005; Spider <spider@gentoo.org> unixODBC-2.2.6.ebuild:
+  Fix for bug 86936. ( X headers moved location )
+
+  06 Feb 2005; <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  added dusan cerhaty's fix for QT and finding X libraries. #79620
+
+  07 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> unixODBC-2.2.8.ebuild:
+  Fix libtool version mismatch for bug 74642.
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> unixODBC-2.2.8.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  glibc -> libc
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> unixODBC-2.2.8.ebuild:
+  stable on ppc64, bug# 53766
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  Fix use invocation
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> unixODBC-2.2.8.ebuild:
+  Added s390 keywords
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  For 2.2.8, masked the qt/gnome-libs interface for unixODBC until qt stuff can
+  be sorted out on mips.
+
+  04 Apr 2004; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  I hope this fixes people's problems with the unixODBC build process. #42711
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.8.ebuild:
+  Forgot gnuconfig
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.8.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps (this package still needs
+  qt and gnome-libs, but I can't test those right now, will keyword later).
+
+*unixODBC-2.2.8 (19 Feb 2004)
+
+  19 Feb 2004; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  version bump
+
+  10 Feb 2004; root <root@gentoo.org> unixODBC-2.2.6-r1.ebuild:
+  changed USE var from gtk to gnome and tweaked dependency. Fixes #34916
+
+*unixODBC-2.2.6-r1 (10 Feb 2004)
+
+  10 Feb 2004; root <root@gentoo.org> unixODBC-2.2.6-r1.ebuild:
+  Added William Blew's patch. Bug #35570
+
+  08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> unixODBC-2.2.6.ebuild:
+  bump to ppc stable
+
+  07 Jan 2004; <agriffis@gentoo.org> unixODBC-2.2.6.ebuild:
+  stable on ia64
+
+  16 Dec 2003; Guy Martin <gmsoft@gentoo.org> unixODBC-2.2.6.ebuild:
+  Marked stable on hppa.
+
+  19 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Added Olivier fixes for gODBCConfig
+
+  15 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  added Cory Visi's modified ebuild to correct the dependecy problems with
+  gODBCconfig. #35889
+
+  04 Dec 2003; Jason Wever <weeve@gentoo.org> unixODBC-2.2.6.ebuild:
+  Marked stable to fix dependency borkage.
+
+  01 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Added Jonathan Nall's gtk enabled ebuild.
+
+*unixODBC-2.2.6 (21 Nov 2003)
+
+  21 Nov 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Version bump due to the QT version within portage
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> unixODBC-2.2.2.ebuild:
+  cleanup ebuild slightly
+
+  10 Jun 2003; Will Woods <wwoods@gentoo.org> unixODBC-2.0.6.ebuild,
+  unixODBC-2.0.8.ebuild, unixODBC-2.2.2.ebuild:
+  Added alpha to KEYWORDS
+
+  21 May 2003; Jason Wever <weeve@gentoo.org> unixODBC-2.0.6.ebuild:
+  Added sparc to keywords.
+
+*unixODBC-2.2.2 (9 Jul 2002)
+
+  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.2.ebuild:
+  Fixes #23609. yac patch
+
+  11 Mar 2003; Guy Matrin <gmsoft@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.0.8.ebuild, unixODBC-2.0.6.ebuild :
+  Added hppa to keywords.
+
+  07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.0.6.ebuild :
+  Fixes #13166
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> unixODBC-2.0.6.ebuild
+*unixODBC-2.0.8.ebuild : 
+ 
+  Added ppc to KEYWORDS.
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> unixODBC-2.2.2.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  9 Jul 2002; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.2.ebuild :
+
+  New version
+  
+*unixODBC-2.0.6 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
new file mode 100644
index 000000000..20b8081cc
--- /dev/null
+++ b/dev-db/unixODBC/Manifest
@@ -0,0 +1,12 @@
+AUX 350-unixODBC-2.2.12-gODBCConfig-as-needed.patch 382 RMD160 080c2947d564ed320071ebd7750cda50886084d6 SHA1 11f482aeeea33fc196b45ba35120755ac88c2978 SHA256 460bbf2dd174d0286b89330d991c3f7030ca7256bce8b16ebf4593572cf7be85
+AUX 360-unixODBC-2.2.12-libltdlfixes.patch 1124 RMD160 ee215893cbdb2aa9672ec63501cd0bddaf08c397 SHA1 0d8fc8b5db51c7bf3ce72abfe7ba8119808702ad SHA256 974942040de5e471274b109ae478f05dea75ac0e5042aaf9eb1acd3f2461d4bf
+AUX unixODBC-2.2.11-Makefile.am.patch 1295 RMD160 4ff252fc9aaa9177770e7493e0e71466e53d3b37 SHA1 2b0953ffb879b8dfc98beab0a01eceeaaa01112b SHA256 669c3f0897fad09cb7dd750319605a34221eaeac633501550ca791a83e7e64c5
+AUX unixODBC-2.2.11-configure.in.patch 239 RMD160 c3821bbe8c815997698d66bf6b1c7151cdb853c5 SHA1 ab6493ab5387d27a3c1130cf46b46f603829d965 SHA256 e41f79814d320104273aa9f9b4eaaece593ed07d14fd36c8a6cfe313c93b80fe
+AUX unixODBC-2.2.11-flex.patch 486 RMD160 5962bd7cceb3547446ec384bbb1474151f0eaaf7 SHA1 4b24b239d3c2240f9df11397150946a84be903ab SHA256 9bd580e29ec4211b8bceccd044cd1bb4c6f32af4ae60b847548d08bbdb011ec7
+DIST unixODBC-2.2.11.tar.gz 2406740 RMD160 533a2733aa9f49bf9e3fd062b6d0ebfdff4dfcf1 SHA1 a8869c38d0f1bb18b33e5165a2a79dd8770f98b3 SHA256 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88
+DIST unixODBC-2.2.12-r0-patches.tar.bz2 6968 RMD160 5d53a41f4645cd366e18405d23acbf3f87dc9eda SHA1 1aa13bf8a6d031583fae844a7d0d503405607f28 SHA256 da58a4c4a08ccef6416af4cac17bd0d6e89f1c513aecab21d9092bcbae0faefd
+DIST unixODBC-2.2.12.tar.gz 2798077 RMD160 13c9ec87c3fff4a1fceb45ff7a552a0fa8666b16 SHA1 d1cb286fb538c664549153165e2b9183b58a627b SHA256 d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
+EBUILD unixODBC-2.2.11-r1.ebuild 1558 RMD160 e150b26ada1669b586af6d6d499d2ecd3bcb6ae1 SHA1 5e2878b1a7136a863d60957780b1151c9f09a43d SHA256 ec864f2ed9ce406fe018e98cdaccb46049e64b74276c5a49207c2b34cdf70371
+EBUILD unixODBC-2.2.12.ebuild 2453 RMD160 7dde206eba683a42c3ca62a45d5dc4ce13a9bc93 SHA1 2229f64818a825c4741c4c81015877fd4f31f2a2 SHA256 848916ff39eb06314278a9c397d5cbf179b81cb3f1629848701a7b76644cfecb
+MISC ChangeLog 10734 RMD160 36a8b9d76e6788220d3ef9abda9bdba2fc0127a9 SHA1 156c77d0d8b7bbc5bc9fbc9b62d96406b1517d1d SHA256 d6c8baff3dddc9447842888c33c754d759ab9f471e459387057cd0d212190852
+MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
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
new file mode 100644
index 000000000..566ad68ac
--- /dev/null
+++ b/dev-db/unixODBC/files/350-unixODBC-2.2.12-gODBCConfig-as-needed.patch
@@ -0,0 +1,14 @@
+-- gODBCConfig/src/Makefile.am.orig	2005-09-17 15:08:16.000000000 +0200
++++ gODBCConfig/src/Makefile.am	2007-08-27 18:29:22.000000000 +0200
+@@ -22,6 +22,10 @@
+ 	interface.h \
+ 	callbacks.c callbacks.h
+ 
++
++libgtkodbcconfig_la_LIBADD = ../../odbcinst/libodbcinst.la 
++
++
+ gODBCConfig_DEPENDENCIES = libgtkodbcconfig.la ../../ini/libinilc.la
+ 
+ gODBCConfig_LDADD = $(GNOME_LIBDIR) \
+
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
new file mode 100644
index 000000000..c26f1a8a3
--- /dev/null
+++ b/dev-db/unixODBC/files/360-unixODBC-2.2.12-libltdlfixes.patch
@@ -0,0 +1,35 @@
+diff -Naur unixODBC-2.2.12.orig/configure.in unixODBC-2.2.12/configure.in
+--- unixODBC-2.2.12.orig/configure.in	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/configure.in	2008-05-29 15:58:32.000000000 +0200
+@@ -163,9 +163,6 @@
+ dnl Configure libtool
+ AM_PROG_LIBTOOL
+ 
+-dnl Configure libltdl
+-AC_CONFIG_SUBDIRS(libltdl)
+-
+ use_builtin_libtool="no"
+ 
+ dnl override the libtool lines if we use the system libs
+diff -Naur unixODBC-2.2.12.orig/exe/Makefile.am unixODBC-2.2.12/exe/Makefile.am
+--- unixODBC-2.2.12.orig/exe/Makefile.am	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/exe/Makefile.am	2008-05-29 15:57:14.000000000 +0200
+@@ -103,6 +103,6 @@
+ 
+ if WITHLT
+ dltest_DEPENDENCIES = $(LIBLTDL)
+-dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
+ else
+ endif
++dltest_LDADD = $(LIBLTDL) $(LIBADD_DL)
+diff -Naur unixODBC-2.2.12.orig/Makefile.am unixODBC-2.2.12/Makefile.am
+--- unixODBC-2.2.12.orig/Makefile.am	2008-05-29 15:54:09.000000000 +0200
++++ unixODBC-2.2.12/Makefile.am	2008-05-29 15:57:56.000000000 +0200
+@@ -3,7 +3,6 @@
+     log \
+ 	lst \
+ 	ini \
+-    	libltdl \
+ 	odbcinst \
+ 	DriverManager \
+ 	odbcinstQ \
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
new file mode 100644
index 000000000..0417ff29c
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.2.11-Makefile.am.patch
@@ -0,0 +1,41 @@
+--- unixODBC-2.2.11/DataManager/Makefile.am	2004-09-13 16:46:11.000000000 +0200
++++ unixODBC.cvs/DataManager/Makefile.am	2005-03-09 17:39:17.000000000 +0100
+@@ -8,6 +8,7 @@
+ 	@QT_LDFLAGS@ \
+ 	@USER_LDFLAGS@ \
+ 	@LIB_QT@ \
++	../ini/libinilc.la \
+ 	../odbcinst/libodbcinst.la \
+ 	../DriverManager/libodbc.la 
+ 
+--- unixODBC-2.2.11/DataManagerII/Makefile.am	2004-11-20 13:57:38.000000000 +0100
++++ unixODBC.cvs/DataManagerII/Makefile.am	2005-03-09 17:39:18.000000000 +0100
+@@ -8,6 +8,7 @@
+ 	@QT_LDFLAGS@ \
+ 	@USER_LDFLAGS@ \
+ 	@LIB_QT@ \
++	../ini/libinilc.la \
+ 	../odbcinst/libodbcinst.la \
+ 	../DriverManager/libodbc.la 
+ 
+--- unixODBC-2.2.11/odbctest/Makefile.am	2004-09-13 16:47:34.000000000 +0200
++++ unixODBC.cvs/odbctest/Makefile.am	2005-03-09 17:39:27.000000000 +0100
+@@ -8,6 +8,7 @@
+ 	@QT_LDFLAGS@ \
+ 	@USER_LDFLAGS@ \
+ 	@LIB_QT@ \
++	../ini/libinilc.la \
+ 	../odbcinst/libodbcinst.la \
+ 	../DriverManager/libodbc.la \
+ 	$(LIBLTDL) $(LIBADD_DL)
+--- unixODBC-2.2.11/gODBCConfig/src/Makefile.am.orig	2005-07-21 10:03:12.051477479 +0200
++++ unixODBC-2.2.11/gODBCConfig/src/Makefile.am	2005-07-21 10:04:10.359597876 +0200
+@@ -28,6 +28,7 @@
+ 		$(GNOMEUI_LIBS) \
+ 		$(INTLLIBS) \
+ 		-L$(ODBCLIBS) $(ODBCLIB) \
+-		libgtkodbcconfig.la 
++		libgtkodbcconfig.la \
++		../../ini/.libs/libinilc.la
+ 		
+ 
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
new file mode 100644
index 000000000..6b72daa4f
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.2.11-configure.in.patch
@@ -0,0 +1,10 @@
+--- configure.in.orig	2003-12-10 20:08:49.000000000 -0800
++++ configure.in	2003-12-10 20:11:33.000000000 -0800
+@@ -29,6 +29,7 @@
+ 
+ if test "x$gui" = "xtrue"; then
+ AC_PROG_CXX
++AC_PATH_X
+ else
+ dnl This gets around a autoconf problem
+ if
diff --git a/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch b/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
new file mode 100644
index 000000000..80652cd03
--- /dev/null
+++ b/dev-db/unixODBC/files/unixODBC-2.2.11-flex.patch
@@ -0,0 +1,19 @@
+--- unixODBC-2.2.6/sqp/lex.l.orig	Wed Oct 17 18:40:32 2001
++++ unixODBC-2.2.6/sqp/lex.l	Thu Jul 10 11:23:35 2003
+@@ -178,6 +178,7 @@
+ 
+ '[^'\n]*$	{ 
+ 			yyerror( "Unterminated string" ); 
++			YY_FLUSH_BUFFER;
+ 		}
+ 
+  /***************************************
+@@ -236,8 +237,6 @@
+ void yyerror( char *s )
+ {
+ 	sprintf( g_szError, "%s processing '%s' on line %d", s, yytext, g_nLineNo );
+-	
+-	YY_FLUSH_BUFFER;
+ }
+ 
+ /**********************************************************************
diff --git a/dev-db/unixODBC/metadata.xml b/dev-db/unixODBC/metadata.xml
new file mode 100644
index 000000000..fd3dbe39f
--- /dev/null
+++ b/dev-db/unixODBC/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>php</herd>
+</pkgmetadata>
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
new file mode 100644
index 000000000..7399475e0
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $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 $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils multilib autotools multilib-native
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="ODBC Interface for Linux."
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="qt3 lib32"
+
+DEPEND=">=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+		qt3? ( =x11-libs/qt-3* )"
+RDEPEND="${DEPEND}"
+
+# the configure.in patch is required for 'use qt3'
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	# solve bug #110167
+	epatch "${FILESDIR}/${P}-flex.patch"
+	# braindead check in configure fails - hackish approach
+	epatch "${FILESDIR}/${P}-configure.in.patch"
+	epatch "${FILESDIR}/${P}-Makefile.am.patch"
+
+	eautoreconf
+}
+
+multilib-native_src_compile_internal() {
+	local myconf
+
+	if use qt3 && ! use mips ; then
+		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
+	else
+		myconf="--enable-gui=no"
+	fi
+
+	econf --prefix=/usr \
+		--sysconfdir=/etc/${PN} \
+		--libdir=/usr/$(get_libdir) \
+		${myconf} || die "econf failed"
+
+	emake -j1 || die "emake failed"
+}
+
+multilib-native_src_install_internal() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
+}
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
new file mode 100644
index 000000000..3cf15a6e5
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.12.ebuild,v 1.15 2008/06/15 17:33:57 hoffie Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+PATCH_VERSION="2.2.12-r0"
+PATCH_P="${PN}-${PATCH_VERSION}-patches"
+
+inherit eutils multilib autotools gnuconfig libtool multilib-native
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+
+DESCRIPTION="ODBC Interface for Linux."
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="http://www.unixodbc.org/${P}.tar.gz
+		mirror://gentoo/${PATCH_P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="qt3 gnome lib32"
+
+RDEPEND=">=sys-libs/readline-4.1
+		>=sys-libs/ncurses-5.2
+		qt3? ( =x11-libs/qt-3* )
+		gnome? ( gnome-base/libgnomeui )
+		sys-devel/libtool"
+DEPEND="${RDEPEND}
+	gnome? ( dev-util/cvs )" # see Bug 173256
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${WORKDIR}"/${PATCH_P}/*
+	epatch \
+		"${FILESDIR}/350-${P}-gODBCConfig-as-needed.patch" \
+		"${FILESDIR}/360-${P}-libltdlfixes.patch"
+
+	# Remove bundled libltdl copy
+	rm -rf libltdl
+
+	eautoreconf
+
+	if use gnome ; then
+		cd gODBCConfig
+		touch ChangeLog
+		autopoint -f || die "autopoint -f failed"
+		eautoreconf --install
+	fi
+}
+
+multilib-native_src_compile_internal() {
+	local myconf
+
+	if use qt3 && ! use mips ; then
+		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir)"
+	else
+		myconf="--enable-gui=no"
+	fi
+
+	econf --host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc/${PN} \
+		--libdir=/usr/$(get_libdir) \
+		--enable-static \
+		--enable-fdb \
+		--enable-ltdllib \
+		${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	if use gnome; then
+		# Symlink for configure
+		ln -s "${S}"/odbcinst/.libs ./lib
+		# Symlink for libtool
+		ln -s "${S}"/odbcinst/.libs ./lib/.libs
+
+		cd gODBCConfig
+		econf --host=${CHOST} \
+			--with-odbc="${S}" \
+			--enable-static \
+			--prefix=/usr \
+			--sysconfdir=/etc/${PN} || die "econf gODBCConfig failed"
+		ln -s ../depcomp .
+		ln -s ../libtool .
+
+		emake || die "emake gODBCConfig failed"
+		cd ..
+	fi
+}
+
+multilib-native_src_install_internal() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	if use gnome;
+	then
+		cd gODBCConfig
+		emake DESTDIR="${D}" install || die "emake gODBCConfig install failed"
+		cd ..
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
+}