dev-db/libiodbc: port to EAPI 7

Three warnings killed for the price of 1!
* DeprecatedEclass (ltprune)
* MissingUnpackerDep
* TarballAvailable

Signed-off-by: Sam James <sam@gentoo.org>

7 files changed, 20 insertions, 28 deletions

diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index f8a2fa3f0f0e..586195992a40 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1 +1 @@
-DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
+DIST libiodbc-3.52.12.tar.gz 760155 BLAKE2B ab1a66b34c55f5ebd72c76c09bf356c9e009666634f7f7516c39653840051bd7ae399b54232284e9cfeae37b752eae761d8f749e48e3184857ba59177016e03a SHA512 992a4d0a36651fe55178a4834160901381ea230a0e1671f61e1c5dd17708d2b649823313b97d5954e1656dc2213382361cb5f1eaf2f28f3b1ac55fd9f7aac535
diff --git a/dev-db/libiodbc/files/fix-runpaths-r1.patch b/dev-db/libiodbc/files/fix-runpaths-r1.patch
index 2cd76c816254..a9774e013807 100644
--- a/dev-db/libiodbc/files/fix-runpaths-r1.patch
+++ b/dev-db/libiodbc/files/fix-runpaths-r1.patch
@@ -1,5 +1,5 @@
---- a/samples/Makefile.am	2012-03-27 05:15:02.000000000 +0200
-+++ b/samples/Makefile.am.new	2013-04-09 14:07:48.303789999 +0200
+--- a/samples/Makefile.am
++++ b/samples/Makefile.am
 @@ -78,12 +78,10 @@
  #
  iodbctest_SOURCES	= iodbctest.c
diff --git a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
index e2819211ccac..c4d063f1f6fa 100644
--- a/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
+++ b/dev-db/libiodbc/files/libiodbc-3.52.12-multilib.patch
@@ -1,5 +1,3 @@
-diff --git a/bin/iodbc-config.in b/bin/iodbc-config.in
-index 08d46ae..576aa8b 100644
 --- a/bin/iodbc-config.in
 +++ b/bin/iodbc-config.in
 @@ -145,10 +145,10 @@ while test $# -gt 0; do
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
index 5e19d1e68094..8b1550a1359b 100644
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug501100.patch
@@ -1,7 +1,5 @@
-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
+--- a/include/sqltypes.h
++++ b/include/sqltypes.h
 @@ -96,6 +96,9 @@
  extern "C" {
  #endif
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
index d1e80184e5b1..d501d1b9dc49 100644
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-debian_bug508480.patch
@@ -1,7 +1,5 @@
-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
+--- a/iodbcinst/inifile.c
++++ b/iodbcinst/inifile.c
 @@ -1023,7 +1023,8 @@
  
    if (!_iodbcdm_cfg_find (pCfg, lpszSection, NULL))
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
index 67730ec65556..62ee9178f6b9 100644
--- a/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
+++ b/dev-db/libiodbc/files/libiodbc-3.52.7-unicode_includes.patch
@@ -1,7 +1,5 @@
-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
+--- a/iodbcinst/unicode.h
++++ b/iodbcinst/unicode.h
 @@ -76,6 +76,7 @@
  
  #ifndef _UNICODE_H
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild
index fd954d02ad93..ebcf516830df 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12-r1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools ltprune multilib-minimal
+inherit autotools 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"
+SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 LICENSE="|| ( LGPL-2 BSD )"
@@ -21,15 +22,13 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS NEWS README )
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
 MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config )
 
 PATCHES=(
-	"${FILESDIR}"/libiodbc-3.52.12-multilib.patch
-	"${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch
-	"${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch
-	"${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch
+	"${FILESDIR}"/${PN}-3.52.12-multilib.patch
+	"${FILESDIR}"/${PN}-3.52.7-debian_bug501100.patch
+	"${FILESDIR}"/${PN}-3.52.7-debian_bug508480.patch
+	"${FILESDIR}"/${PN}-3.52.7-unicode_includes.patch
 	"${FILESDIR}"/fix-runpaths-r1.patch
 )
 
@@ -58,7 +57,8 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
-	prune_libtool_files
+
+	find "${ED}" -name '*.la' -delete || die
 
 	# Install lintian overrides
 	insinto /usr/share/lintian/overrides