Revision bump to include few fixes, from debian and others. Fix also static-libs bug#377529.

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64)

7 files changed, 152 insertions, 2 deletions

diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog
index c5cc5f4593fd..5cb9592c2a5e 100644
--- a/dev-db/libiodbc/ChangeLog
+++ b/dev-db/libiodbc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/libiodbc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.52 2011/03/27 12:26:23 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.53 2012/02/20 10:21:59 scarabeus Exp $
+
+*libiodbc-3.52.7-r1 (20 Feb 2012)
+
+  20 Feb 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libiodbc-3.52.7-debian_bug501100.patch,
+  +files/libiodbc-3.52.7-debian_bug508480.patch,
+  +files/libiodbc-3.52.7-gtk.patch, +files/libiodbc-3.52.7-multilib.patch,
+  +files/libiodbc-3.52.7-unicode_includes.patch, +libiodbc-3.52.7-r1.ebuild:
+  Revision bump to include few fixes, from debian and others. Fix also static-
+  libs bug#377529.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   libiodbc-3.52.7.ebuild:
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
new file mode 100644
index 000000000000..5e19d1e68094
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
@@ -0,0 +1,14 @@
+Index: libiodbc2-3.52.7/include/sqltypes.h
+===================================================================
+--- libiodbc2-3.52.7.orig/include/sqltypes.h	2010-06-26 21:15:00.000000000 +0200
++++ libiodbc2-3.52.7/include/sqltypes.h	2010-06-26 21:15:36.000000000 +0200
+@@ -96,6 +96,9 @@
+ extern "C" {
+ #endif
+ 
++#ifndef _IODBCUNIX_H
++#include <iodbcunix.h>
++#endif
+ 
+ /*
+  *  Environment specific definitions
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
new file mode 100644
index 000000000000..d1e80184e5b1
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
@@ -0,0 +1,14 @@
+Index: libiodbc2-3.52.7/iodbcinst/inifile.c
+===================================================================
+--- libiodbc2-3.52.7.orig/iodbcinst/inifile.c	2010-06-26 21:29:43.000000000 +0200
++++ libiodbc2-3.52.7/iodbcinst/inifile.c	2010-06-26 21:30:07.000000000 +0200
+@@ -1023,7 +1023,8 @@
+ 
+   if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL))
+     {
+-      while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg))
++      while (curr < cbRetBuffer && 0 == _iodbcdm_cfg_nextentry (pCfg)
++	     && pCfg->section)
+ 	{
+ 	  if (_iodbcdm_cfg_section (pCfg))
+ 	    break;
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
new file mode 100644
index 000000000000..83fc954d46c9
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
@@ -0,0 +1,16 @@
+diff -pruN 3.52.6-1/configure.in 3.52.6-1ubuntu1/configure.in
+--- 3.52.6-1/configure.in	2007-10-08 14:04:32.000000000 +0100
++++ 3.52.6-1ubuntu1/configure.in	2007-12-06 00:12:00.000000000 +0000
+@@ -315,12 +315,6 @@ then
+   no_gtk=""
+   # Check for GTK+ 2.x
+   AM_PATH_GTK_2_0(2.0.0)
+-  if test x$no_gtk != x
+-  then
+-      # Try GTK 1.2.x instead
+-      no_gtk=""
+-      AM_PATH_GTK(1.2.3)
+-  fi
+   if test x$no_gtk = x
+   then
+     USE_GTK=true
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
new file mode 100644
index 000000000000..73e81d30aec0
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
@@ -0,0 +1,35 @@
+--- bin/iodbc-config.in.orig	2006-01-23 11:29:22.000000000 +0100
++++ bin/iodbc-config.in	2009-06-04 17:48:19.000000000 +0200
+@@ -145,10 +145,10 @@
+       echo_libs=yes
+       ;;
+    --static-libs)
+-      echo_staticlibs=yes
++      echo_libs=yes
+       ;;
+    --libtool-libs)
+-      echo_libtoollibs=yes
++      echo_libs=yes
+       ;;
+    --data-dir)
+       echo_data_dir=yes
+@@ -196,19 +196,5 @@
+ 	if test "$lib_iodbc" = "yes"; then
+ 		libs="$libs -liodbc -liodbcinst"
+ 	fi
+-	echo "-L@libdir@ $libs"
+-fi
+-if test "$echo_staticlibs" = "yes"; then
+-	libs=""
+-	if test "$lib_iodbc" = "yes"; then
+-		libs="@libdir@/libiodbc.a @libdir@/libiodbcinst.a @LIBADD_DL@"
+-	fi
+-	echo "$libs"
+-fi
+-if test "$echo_libtoollibs" = "yes"; then
+-	libs=""
+-	if test "$lib_iodbc" = "yes"; then
+-		libs="@libdir@/libiodbc.la @libdir@/libiodbcinst.la"
+-	fi
+ 	echo "$libs"
+ fi
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
new file mode 100644
index 000000000000..67730ec65556
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
@@ -0,0 +1,12 @@
+Index: libiodbc2-3.52.7/iodbcinst/unicode.h
+===================================================================
+--- libiodbc2-3.52.7.orig/iodbcinst/unicode.h	2009-09-09 14:13:17.000000000 +0200
++++ libiodbc2-3.52.7/iodbcinst/unicode.h	2010-06-26 21:16:26.000000000 +0200
+@@ -76,6 +76,7 @@
+ 
+ #ifndef _UNICODE_H
+ #define _UNICODE_H
++#include <iodbc.h>
+ 
+ 
+ #if defined (__APPLE__) && !defined (MACOSX102) && !defined (HAVE_CONFIG_H)
diff --git a/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild b/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild
new file mode 100644
index 000000000000..4f926f3875d4
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild,v 1.1 2012/02/20 10:21:59 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="ODBC Interface for Linux."
+HOMEPAGE="http://www.iodbc.org/"
+SRC_URI="http://www.iodbc.org/downloads/iODBC/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+IUSE="gtk static-libs"
+
+DEPEND=">=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	gtk? ( x11-libs/gtk+:2 )"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	sed -i.orig \
+		-e '/^cd "$PREFIX"/,/^esac/d' \
+		iodbc/install_libodbc.sh || die "sed failed"
+	epatch \
+		"${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \
+		"${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \
+		"${FILESDIR}"/libiodbc-3.52.7-gtk.patch \
+		"${FILESDIR}"/libiodbc-3.52.7-multilib.patch \
+		"${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch
+	chmod -x include/*.h
+}
+
+src_configure() {
+	econf \
+		--with-layout=gentoo \
+		--with-iodbc-inidir=yes \
+		$(use_enable gtk gui) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+}