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

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

8 files changed, 172 insertions, 16 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/Manifest b/dev-db/libiodbc/Manifest
index 09fe29aadbe5..5359bd56409a 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,24 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libiodbc-3.52.7-debian_bug501100.patch 408 RMD160 00d0eb72842e2e32c5858788ee73d0346e01409a SHA1 89b731bccaeae4e639e8028ab4fd5f76fe16f71c SHA256 d81564fdf0637bacbcbad52d7ad097ec9236f4145ad4f958763747bdc5239158
+AUX libiodbc-3.52.7-debian_bug508480.patch 577 RMD160 a29d20dba127843cc03431746982a564a21b6401 SHA1 16b64fbf472e86caf9086c2af667a09cfad3c812 SHA256 234990661704b35a475a55f28fe0c7275558bf85c5faf1abac4f94ccb8302113
+AUX libiodbc-3.52.7-gtk.patch 445 RMD160 00496144163b2ec5c0ece29adf0db451d861c28b SHA1 96838e366ff6b6fe76313b302607d206ddab8857 SHA256 a883c7c87c1abac24c8964f94ccfe61e6011a1d3d6c424782ae3116fae85bd0e
+AUX libiodbc-3.52.7-multilib.patch 853 RMD160 ef3c07b7ea6874f34ff882d25b3cfac508c220a4 SHA1 21c6d3849c6176ba115783ce20bdc92dc7cea4ed SHA256 bb9e60277d14f16206351efdd22e74264e03608b487300a5ef6fc641b9078bea
+AUX libiodbc-3.52.7-unicode_includes.patch 432 RMD160 4cc5e08eaccd99a8d42edd0cbe7ac90d8887b68d SHA1 c4a79670f1c9d9217e60761cf9299c07bc39fc58 SHA256 cfa6fc4bdbd200f5eb7d502b9d5878d46a9c7b140b41c876dfda4e42bbda6f97
 DIST libiodbc-3.52.7.tar.gz 1038710 RMD160 7bdac0e18dd65debd41059ceb59b4653bed4774b SHA1 53988878b6897d5ce7b8f62138f1f7e0e40b7d4f SHA256 d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7
+EBUILD libiodbc-3.52.7-r1.ebuild 1351 RMD160 26b8803273f5dfd304282833a33797a93a79aa78 SHA1 069a5cb5daa64bb103aa7f99d368d71dcce09ce9 SHA256 590e6f39b85fc823a33c20da37ef69c6e00e675ef305581fe42b49a2a30df159
 EBUILD libiodbc-3.52.7.ebuild 1052 RMD160 0693ec3636f71f2da7cb06ab16fd4daef39e81c0 SHA1 920633bd2af4279543d71862a6f8c22db68337ed SHA256 50981eb99116adf3045216d3f479a267401c1b7f47d389862b06d0c32090197a
-MISC ChangeLog 6137 RMD160 9d4e8677f9bd36d90297db238e68dcabcb6c415e SHA1 f5fe323b8b7dd43868350b3a34979bd05f96708a SHA256 c469fd40c2a0698ca16cbe06632167ee7900ce8a43ab8991314a0ecf2c49e9c0
+MISC ChangeLog 6577 RMD160 61eb66f582ed1640e3aac4988e3988575860361a SHA1 e7c2c7e24fe8af0bff29b0e39d7fb4c36074911f SHA256 314f05db2b2afccf12d92320da089e3567138014d581bb579c57e8456ef1bd15
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjyz1AAoJEO/kOhxWD91k8YAP/08y7/hyJuvMYYXHAoBagZSU
-qCoF3yEPmkXvre30DlusghmaF3G8ofyVRv/fhO5HmKkf2dap6a7FZmCa+TAhJRpr
-05RZ03hxzBQB7C9/dVKuTDMAW3z+vBV7dNTA53ijw6Jg40l5jwdawYLy0Nv8v+5a
-0+gKZCAsF9wWoGMmO5YsMbl+Bx/09Ipcmzx5/bh9KhB7/klCt9fHldjEA6I+A9Nv
-efo5YlBWTaq18NBQsoQmcL67qDImt6jOzZgIN1F6QFWcN+nRIN0FXkklSQyGDPff
-gcWSe7XMnhogh/JfP/yQx+DyqQPMHbpSeQWsD3Fo8L8jyiBVkbnaB7bVhftunXBT
-XKN6jTvVfanMNunaHep/gdoZZtP4KKOPgSFjeQZrQOEJF/NA/0mESWyg/FGGqpfY
-WFJdt8UzuFdBQXV4xuWpfpj2JOuOESMH4mZu422zRoo+zCVEvjO9a6uxTaVFOkI/
-le4ssKGiuLPHJVoiNkxozDNrf6e1PpUY+yuyVyxCQkpS2okN/gajDV7nEhIQnIE8
-VB1oyCEbOGc9CZ9q/tv9Wl9kx/O2L4HNiaaqbEjnfi46PNLlIYJRl0S50xj6fG12
-K3TihiMSoFqEabVD6vgwbkJlenNsCdDeJwCVFpqVjeNeYktF1y+Kkc0wJAl/gHkF
-NXUuy2v4U1ITWILEZfSr
-=I0Ek
+iQIcBAEBAgAGBQJPQh80AAoJEOSiRoyO7jvo7cwQAJ2Ui2sA74in6qLptX1cqAvg
+dOwFF/JU63bUA2Vr/SZ7uc3Gc4QbQH4noKDPt0cy4tAHm+VVg6Q7hCOFrMHlCmMS
+aSjwLRU1pgh0MQZRil+6Q+2kp4Pj2fiL2PKEHO3Z1pqxafd8CobH0c2aQfuBNNWr
+eHz+m2TxDIict/xyR0h+1lH5CEki1TmTIh5vEWl9Hd6TkpwVQ7/EyluPPZWerZ2C
+f7Q0mJAfqppKjDSad6253YyVLLRuoNkuSkX2YLgLUVef35P3BtVwwmmuwA4QdyY4
+omjlZxbEq1UNiqH6u0D0rNvPUSmg/a6AEEAMKvvsYGTwhaRdX0qm+sHyqXoJlMsS
+Z4gxfTZO37CHP2ouwvUUMxuBdXuA1y/FHwdXDFZgVEIeDbPvn4/WVP4To07RpWxZ
+ogu/tT8IFHtlEhTDsctA7mBpXUezzHYS6eibx1imsOi2l8Ed9o+5EVcPg23WXY5b
+wQxGu1SVvM3RaCSMACJd/csuEJXYduNtmSrkZt6xTsv3XdnsOcs6GDaMgs6Oejwd
+oGVVpdpq77vSCnjz3YIEbAgCs4MiXxsRapMQ10+aOhQI5O87J1aDDp8NKhC7bpt2
+1DyWbqapxGhiOoM4O8Odjzqq08Sg/iM16SLTjG3h9OzYsEQtnc1LW5BG9eXHZevL
+O+RguXPHsHIn7pUpULnW
+=93J2
 -----END PGP SIGNATURE-----
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 {} +
+}