version bump thanks to mschultz on bug #450782

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x4849EC6C)

4 files changed, 157 insertions, 3 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/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
+}