summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/libiodbc
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/libiodbc')
-rw-r--r--dev-db/libiodbc/Manifest1
-rw-r--r--dev-db/libiodbc/files/fix-runpaths.patch15
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch14
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch14
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch16
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch35
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch12
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch23
-rw-r--r--dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch56
-rw-r--r--dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild68
-rw-r--r--dev-db/libiodbc/metadata.xml10
11 files changed, 264 insertions, 0 deletions
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
new file mode 100644
index 000000000000..c74ce7e0c469
--- /dev/null
+++ b/dev-db/libiodbc/Manifest
@@ -0,0 +1 @@
+DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch
new file mode 100644
index 000000000000..e913b4c7c4cc
--- /dev/null
+++ b/dev-db/libiodbc/files/fix-runpaths.patch
@@ -0,0 +1,15 @@
+--- samples/Makefile.am 2012-03-27 05:15:02.000000000 +0200
++++ samples/Makefile.am.new 2013-04-09 14:07:48.303789999 +0200
+@@ -78,12 +78,10 @@
+ #
+ iodbctest_SOURCES = iodbctest.c
+ iodbctest_LDADD = ../iodbc/libiodbc.la
+-iodbctest_LDFLAGS = -static
+
+ iodbctestw_CFLAGS = -DUNICODE
+ iodbctestw_SOURCES = iodbctest.c
+ iodbctestw_LDADD = ../iodbc/libiodbc.la
+-iodbctestw_LDFLAGS = -static
+
+ EXTRA_DIST = $(srcdir)/Makefile.sample
+
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/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-r2.ebuild b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
new file mode 100644
index 000000000000..20769287343a
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils multilib-minimal
+
+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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/iodbc-config
+)
+
+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 \
+ "${FILESDIR}"/fix-runpaths.patch
+ chmod -x include/*.h || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-static \
+ --enable-odbc3 \
+ --enable-pthreads \
+ --with-layout=gentoo \
+ --with-iodbc-inidir=yes \
+ $(use_enable gtk gui)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+
+ # Install lintian overrides
+ insinto /usr/share/lintian/overrides
+ newins debian/iodbc.lintian-overrides iodbc
+ newins debian/libiodbc2.lintian-overrides libiodbc2
+}
diff --git a/dev-db/libiodbc/metadata.xml b/dev-db/libiodbc/metadata.xml
new file mode 100644
index 000000000000..ccf439c60983
--- /dev/null
+++ b/dev-db/libiodbc/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>olemarkus@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">openlink/iODBC</remote-id>
+ </upstream>
+</pkgmetadata>