[gentoo-commits] repo/gentoo:master commit in: dev-db/libiodbc/, dev-db/libiodbc/files/

[Pacho Ramos]

commit:     0407596a1b78e1bef696967d85c940aa471b7dd4
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 16 09:13:14 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 16 09:28:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0407596a

dev-db/libiodbc: Drop old

Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 dev-db/libiodbc/Manifest                           |  1 -
 dev-db/libiodbc/files/fix-runpaths.patch           | 15 -----
 dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch    | 16 ------
 .../libiodbc/files/libiodbc-3.52.7-multilib.patch  | 35 -----------
 .../files/libiodbc-3.52.8-gtk-parallel-make.patch  | 23 --------
 .../files/libiodbc-3.52.8-runtime-failures.patch   | 56 ------------------
 dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild          | 67 ----------------------
 7 files changed, 213 deletions(-)

diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index d45470deb1e..f8a2fa3f0f0 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,2 +1 @@
 DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
-DIST libiodbc-3.52.8.zip 1188493 BLAKE2B 8439d0268b64d847c2bbb733fb203b3c2811f14dcd1cf2993472244e6430c2dac042f2b5056aed04049ba2cd139c83cd9c6c7ac6d4e1576dea58fc6e6aa0a5f0 SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551

diff --git a/dev-db/libiodbc/files/fix-runpaths.patch b/dev-db/libiodbc/files/fix-runpaths.patch
deleted file mode 100644
index e913b4c7c4c..00000000000
--- a/dev-db/libiodbc/files/fix-runpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-gtk.patch b/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
deleted file mode 100644
index 83fc954d46c..00000000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-gtk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 73e81d30aec..00000000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-multilib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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.8-gtk-parallel-make.patch b/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
deleted file mode 100644
index 7278499aff3..00000000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.8-gtk-parallel-make.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 50724ba46b4..00000000000
--- a/dev-db/libiodbc/files/libiodbc-3.52.8-runtime-failures.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 364fe91e946..00000000000
--- a/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-}