version bump thanks to mschultz on bug #450782

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4849EC6C

5 files changed, 165 insertions, 7 deletions

diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog
index d249d51bce2d..7251489ceb2f 100644
--- a/dev-db/libiodbc/ChangeLog
+++ b/dev-db/libiodbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libiodbc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.57 2012/07/11 23:02:36 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.58 2013/01/08 22:17:03 mabi Exp $
+
+*libiodbc-3.52.8 (08 Jan 2013)
+
+  08 Jan 2013; Matti Bickel <mabi@gentoo.org>
+  +files/libiodbc-3.52.8-gtk-parallel-make.patch,
+  +files/libiodbc-3.52.8-runtime-failures.patch, +libiodbc-3.52.8.ebuild:
+  version bump thanks to mschultz on bug #450782
 
   11 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
   libiodbc-3.52.7-r1.ebuild:
@@ -208,4 +215,3 @@
 
   01 Dec 2003; Michael Imhof <tantive@gentoo.org> libiodbc-3.51.1.ebuild:
   Initial release.
-
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 0aa960417bfd..3b82f4ed7730 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -6,15 +6,19 @@ AUX libiodbc-3.52.7-debian_bug508480.patch 577 SHA256 234990661704b35a475a55f28f
 AUX libiodbc-3.52.7-gtk.patch 445 SHA256 a883c7c87c1abac24c8964f94ccfe61e6011a1d3d6c424782ae3116fae85bd0e SHA512 ec7d682846103ac67274eb145c8501bdc8fdc2f0a7bda650302713e785ca428c75ad29230301e455ec2ad967aa272b13ad5283e8d5b01ff0dfca6beeac7dd0fb WHIRLPOOL e3e0fcb11518ed63fa0ae45f81b2fcf8863bfd4a3fbb61f913a3c6b750d68bccce5e16afef66a06ac8de08937781178c948bf38359046acebc7f1a88bceff6fb
 AUX libiodbc-3.52.7-multilib.patch 853 SHA256 bb9e60277d14f16206351efdd22e74264e03608b487300a5ef6fc641b9078bea SHA512 b91644eb58110cc429458ce372441e76655171ffa52904e0629f238bc6df21793875a6f4b524dddaa9f68f1f2ebc773db56d6da08643e4054299d09f38517849 WHIRLPOOL dec275bcaab1d2c94b3d5d893c5b59f57ac07d81e59dc64b32a955df2dbef01deab31ea657217f9ccec792009601cdaa42bf231d568c79bfe73de7d78fb37ca6
 AUX libiodbc-3.52.7-unicode_includes.patch 432 SHA256 cfa6fc4bdbd200f5eb7d502b9d5878d46a9c7b140b41c876dfda4e42bbda6f97 SHA512 b4bd56e88199ed06ec7ce64bbf53c3d792c501cdadee44a1c52d95336c36e93c2379d312b14c576a138210f2cf277e895ded18e80db4e5bb3f664ccb5695a305 WHIRLPOOL 8af0a923e8425094afaa10b22c00aa67094084c350885d6bd03ec467cafbb703d93d0c94885ba7edbc79e95a1493df38e8c99ff34d3a3beb8bbb7d77d0b79040
+AUX libiodbc-3.52.8-gtk-parallel-make.patch 661 SHA256 c7275637ce251106258d2436f640c352eef11c3083515cf109ce88e0d6efaac5 SHA512 5378bba53eea8c45a13631b5b8d0d4efed78ea2f786835d509431da3813924cbc07aae3d19053efef6fc052d351193f576ed4fcc301956f59f3e36e18280d537 WHIRLPOOL 059a360ff0d0a9cc04e1a65bc6323a2673935dda8eaf7db78a56a1a63e66f31ff3f71ce8bc1bf42a4a3c61b1a5a58c74556763743069c20d66032e2bebd33e49
+AUX libiodbc-3.52.8-runtime-failures.patch 2033 SHA256 84909ef0bbd8a862c9ed83ca73f22fa7bf75107eeb35d36d87a9b8413c9da66d SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142 WHIRLPOOL 2dd19d56ad6ba8ff6688769f22c2afd25d275fe0c75c9824b1b8c3e1d575ead75be6b180b5e7c2e40301a29a381db6a29ff8a94c6ebde1a7cab28a21cbc4a108
 DIST libiodbc-3.52.7.tar.gz 1038710 SHA256 d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7 SHA512 a0274cd40d8fa7445f9442541e7e1d90427273a137fc2d3227e81e8af42fb35a8a38a3601f445ee821a0f88cca732d56cec8b7f08e94492da3aca609063f1a1e WHIRLPOOL c63770fff3fd14cb727828b5c016c127bf17454dbd20b9f7aba6d569fcaf58051d7abf3f9015546931a99144c62a1e38ad0da10bb42b835a2b25017b5ede1134
+DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
 EBUILD libiodbc-3.52.7-r1.ebuild 1396 SHA256 3eb454dde1296db6995bc2dd7ae816adfdf65b66ac0ce752ae5a9fc3bfd7cfe2 SHA512 1e773ea27fc4ccf0697518314da5fe08bea5f7dea39ab5e2c651e482d8dd27853f0500e71b93b6577216131dd398fae49282ecfcd2a1d2741defdc8ad165eb14 WHIRLPOOL 0521dece6bfceb6b34063d9f1f5c1bdaa15caab40d9d0859f2c535e6b46432c9ccadf6adeed743f22681a392331e592879c27ad468368253f3d09446cb074165
 EBUILD libiodbc-3.52.7.ebuild 1052 SHA256 50981eb99116adf3045216d3f479a267401c1b7f47d389862b06d0c32090197a SHA512 b36c7bcf3dc6fc55c324fa01f96b3b16743b95f4e0ce0812d9ed2e9f3fc73ec9c6ffad986adae7b9be4e3a35a9a2ec2664afc72daacc2220a7359a56f8a2b226 WHIRLPOOL 352bd91b9ffe7887465450e47e30b8f19777bedf85f537d5cc1b58eb586e2cb3a3da36bb1f88f93984b2c44670c531448d8527881192d245a2bf08e856a50d9a
-MISC ChangeLog 7101 SHA256 4d19c3085ed75f122338a42e508034f5cfc3724c97a74f77ae40a2e9e5186ffe SHA512 09de9b28fe33b67e87b547818620ff228698cb07c1ac9c10517859f46b4d403e274a67ad1857d3f5694cfea9bc8738d8f4699a68712782cb0fd7735f6bf1fe98 WHIRLPOOL 171234b2d26dacb6ae436230da636edc1b55ab274a6dfceca71b8f6cb03f152de8a84bb0b08a6a7eb5afc794a589ed811da14a784913ceeff305fc078c6c19d0
+EBUILD libiodbc-3.52.8.ebuild 1786 SHA256 ba04925c15c48a36ff8bea030f6c502a65fc8b194b045d66420fd1c29f6ae2d1 SHA512 9f100221f9ee145d71aeed8ea95c095c7832e4c730c096890dbd7d683f297e9dfad7e7388aecb7bbc4b984e42055ce0a0039189880f02264d12bbcc11fc23a9f WHIRLPOOL c24ea5ad294d0bdda7a7d58203edea8d94cb40df1b60b8a0882fb1215d5b1f9f8576bcfb9577f47fff4032b42be885cc6e7bde23a17bc672ffbbfb0b455c53a0
+MISC ChangeLog 7348 SHA256 078cb85677d6cc812476cf86ad0ddf03461cfaef43697d4b9c951bed029238c0 SHA512 4e71cd98b38504cedb38c207ad3a0104c1db7908bf98bbe23b874dc10b269b0f1ef2cb4a303b81726f62643667e0bbc53ec20ed455304a961f22e8c3eca0f94a WHIRLPOOL 05299cf036c909c521970da6bba9a899bc745a735538e38925c27641a2b9978448cd5d6deaf9621a8d03e0ee04dd1f5758eea443b5f671034707fcd3007540d2
 MISC metadata.xml 157 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 SHA512 94adacaefd7d989cc904cc3ee920b15d58fee61df13008ebcbefa66f9b5c58cab2a5fad0499d4b57cd41e5f1ae79c6cf44525d90e649d23ebacd7721466b8947 WHIRLPOOL 66f688809b11b84b1b9d782a3c03cfcefed87989862aaca20c17cb076349ec402da9eaf87f7be02f7b4de178ea42da31029baee1bcd8e563aeabe949d4ed41f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/+BhYACgkQl5yvQNBFVTVM2gCdHbDBX5UwtAOnS7tbF2uE8WWe
-NDMAn2P1AKrfsTK+bdtjhriylGgxngar
-=iKkI
+iEYEAREIAAYFAlDsmusACgkQfNMcoUhJ7Gyk1wCfbXkTW2Xd8CFnZvbT7LiMw7nJ
+RqIAn1k0wuSPzdBn4D1DYMy7w/9yB/yQ
+=jHHr
 -----END PGP SIGNATURE-----
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
new file mode 100644
index 000000000000..7278499aff35
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
@@ -0,0 +1,23 @@
+diff -u -r iODBC-3.52.8.orig/iodbcadm/Makefile.am iODBC-3.52.8/iodbcadm/Makefile.am
+--- iODBC-3.52.8.orig/iodbcadm/Makefile.am	2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/Makefile.am	2013-01-08 08:12:58.639414826 -0600
+@@ -96,7 +96,7 @@
+ 
+ if GTK
+ libiodbcadm_la_LIBADD	= \
+-	../iodbcadm/gtk/libiodbcadm-gtk.la \
++	gtk/libiodbcadm-gtk.la \
+ 	$(LIBADD_DL) \
+ 	@GTK_LIBS@ \
+ 	../iodbcinst/libiodbc_common.la \
+@@ -117,8 +117,8 @@
+ 
+ iodbcadm_gtk_SOURCES	=
+ iodbcadm_gtk_LDADD	= \
+-	../iodbcadm/gtk/main.lo \
+-	../iodbcadm/libiodbcadm.la \
++	gtk/main.lo \
++	libiodbcadm.la \
+ 	../iodbcinst/libiodbcinst.la \
+ 	../iodbc/libiodbc.la \
+ 	@GTK_LIBS@
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
new file mode 100644
index 000000000000..50724ba46b48
--- /dev/null
+++ b/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
@@ -0,0 +1,56 @@
+diff -u -r iODBC-3.52.8.orig/configure.in iODBC-3.52.8/configure.in
+--- iODBC-3.52.8.orig/configure.in	2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/configure.in	2013-01-08 10:31:39.740041040 -0600
+@@ -87,7 +87,7 @@
+ AC_CONFIG_SRCDIR([include/isql.h])
+ AC_CONFIG_AUX_DIR(admin)
+ AC_CONFIG_MACRO_DIR(admin)
+-AM_CONFIG_HEADER(include/config.h)
++AC_CONFIG_HEADER(include/config.h)
+ AM_INIT_AUTOMAKE(AC_PACKAGE_TARNAME, AC_PACKAGE_VERSION)
+ AC_CANONICAL_HOST
+ AM_MAINTAINER_MODE
+diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c iODBC-3.52.8/iodbcadm/gtk/administrator.c
+--- iODBC-3.52.8.orig/iodbcadm/gtk/administrator.c	2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/gtk/administrator.c	2013-01-08 10:29:51.758462953 -0600
+@@ -72,6 +72,13 @@
+  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifdef __linux
++# ifndef _GNU_SOURCE
++#  define _GNU_SOURCE  /* make sure dladdr is declared */
++# endif
++# define HAVE_DL_INFO 1
++#endif
++
+ #include <iodbc.h>
+ #include <dlfcn.h>
+ #include <sys/stat.h>
+@@ -82,7 +89,7 @@
+ #include "odbc4.xpm"
+ 
+ 
+-#if !defined(HAVE_DL_INFO)
++#if defined (HAVE_DLADDR) && !defined(HAVE_DL_INFO)
+ typedef struct
+ {
+   const char *dli_fname;	/* File name of defining object.  */
+@@ -90,6 +97,7 @@
+   const char *dli_sname;	/* Name of nearest symbol.  */
+   void *dli_saddr;		/* Exact value of nearest symbol.  */
+ } Dl_info;
++
+ #endif /* HAVE_DL_INFO */
+ 
+ static char *szDriverButtons[] = {
+diff -u -r iODBC-3.52.8.orig/iodbcadm/gtk/gui.h iODBC-3.52.8/iodbcadm/gtk/gui.h
+--- iODBC-3.52.8.orig/iodbcadm/gtk/gui.h	2012-03-27 05:15:02.000000000 -0500
++++ iODBC-3.52.8/iodbcadm/gtk/gui.h	2013-01-08 10:30:48.124240299 -0600
+@@ -219,5 +219,6 @@
+ void addlistofdir_to_optionmenu(GtkWidget* widget, LPCSTR path, TDSNCHOOSER *choose_t);
+ LPSTR create_keyval (HWND wnd, LPCSTR attrs, BOOL *verify_conn);
+ LPSTR create_fgensetup (HWND hwnd, LPCSTR dsn, LPCSTR attrs, BOOL add, BOOL *verify_conn);
++void  create_message (HWND hwnd, LPCSTR dsn, LPCSTR text);
+ 
+ #endif
diff --git a/dev-db/libiodbc/libiodbc-3.52.8.ebuild b/dev-db/libiodbc/libiodbc-3.52.8.ebuild
new file mode 100644
index 000000000000..23f9ec34db33
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8.ebuild,v 1.1 2013/01/08 22:17:03 mabi Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+MY_PN="iODBC"
+
+DESCRIPTION="ODBC Interface for Linux."
+HOMEPAGE="http://www.iodbc.org/"
+SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+IUSE="gtk static-libs"
+
+RDEPEND=">=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	gtk? ( x11-libs/gtk+:2 )"
+
+DEPEND="app-admin/chrpath
+	${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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 \
+		"${FILESDIR}"/libiodbc-3.52.8-gtk-parallel-make.patch \
+		"${FILESDIR}"/libiodbc-3.52.8-runtime-failures.patch
+	chmod -x include/*.h || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-odbc3 \
+		--enable-pthreads \
+		--with-layout=gentoo \
+		--with-iodbc-inidir=yes \
+		$(use_enable gtk gui) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+
+	# Install lintian overrides
+	insinto /usr/share/lintian/overrides
+	newins debian/iodbc.lintian-overrides iodbc
+	newins debian/libiodbc2.lintian-overrides libiodbc2
+
+	# Remove rpaths to fix insecure RUNPATHS - bug 421603
+	chrpath --delete "${D}"/usr/bin/iodbctest
+	chrpath --delete "${D}"/usr/bin/iodbctestw
+}