gentoo resync : 12.03.2021

8 files changed, 94 insertions, 34 deletions

diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 3599e7979fa8..bde55623c1bc 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,8 +1,10 @@
-AUX fix-runpaths-r1.patch 438 BLAKE2B 0089f678dea14f4f1f3cf0e6fdaa9863b2659b3a93208404fbf29939a7d797cbac75a9f128d625fd4a8691807507bc69e42894bae19cacc680d202616d0e3de1 SHA512 2c64890a2e61f7fd3c6c053a35308b57eb7c50bf070d4833bd0b8a4182d3581cfb358ee315cc26cb26d6b11941d4e9265b38f59732f7b679d3b2d23d0dda0035
-AUX libiodbc-3.52.12-multilib.patch 934 BLAKE2B e98b6bb650605154c251752d2208237a45dbc794ca141a292628192765020b33a3d6b331194d9f204657d06e590446b2809a91ad24944221005afae557c1d361 SHA512 718f564371d962283525f946b60b9028e66b3477d4bf20fd6f5363d08635c2d2603d9de5fb157e6039c124324578e5367e985d83623a3b1cd4dd0de7605f1911
-AUX libiodbc-3.52.7-debian_bug501100.patch 408 BLAKE2B 6fb1e24cb2d4f32eca6cde6d50bf9ce77e6a55e3e09c491f971863067b402e7f77bc5238750062094b4092d172909ff592fa36c31e50db122bb85bdfa0eaaaeb SHA512 e36a2b936b36af3cbdf125725628a2c5ca1f4d246c7b7eaf8c08a97e96fa25915b2b03bdd33f7a1c42b08d54f89174edbcb7f1ebaaa1a2e9777ff33023ac2575
-AUX libiodbc-3.52.7-debian_bug508480.patch 577 BLAKE2B 0d605b754b6b4b970a15a236be6eebdc6e24dcb1231cacf10e859b22eb577ac49b26ffcdae437cf05de26850de33ed10cfbbffb9b54ab79fada2525a6de939a3 SHA512 2e3a0ab2284b0b302e2eb5d27e1cc952810c5ec2d123491047cda15d1e0b2aa651a1d3357fb330be24fa72ec855a89143eb88bd4b87ce079b469b6ab8647ce74
-AUX libiodbc-3.52.7-unicode_includes.patch 432 BLAKE2B 3f9c833c223fb5d5dd94530501b5403732b88b420a6cf6a0453734d1cacd9eebdb0e69d7cf265b4ce2da4baa2faad32b467beffdf76d6c339316323b2ba9237c SHA512 b4bd56e88199ed06ec7ce64bbf53c3d792c501cdadee44a1c52d95336c36e93c2379d312b14c576a138210f2cf277e895ded18e80db4e5bb3f664ccb5695a305
-DIST libiodbc-3.52.12.zip 1248801 BLAKE2B e19b740904a332df7d7f510a6ef7414121e99bcbce0b89db94f4b7a09c0de09f39a8f8abdbec40029b79140fab6e1e1d319ad146cc7d74872a7fe69852a3f710 SHA512 240f6f7dc406fcc6688499bac8800b81380d32e8443e4f098875fabc649da1b86567b67d2259206be64cced8537d3171040d16be39845b9009cd90be62ae97db
-EBUILD libiodbc-3.52.12.ebuild 1635 BLAKE2B 33e84b45f1e80eb45b47ba4b0cea63ab9131c9db0bd5100feb837542386322a4a25c77e9f9f958436288e717a81ad77500135bbe520583d1b5a158ac0bb11a02 SHA512 c72beda1b707bc40a80cd0b3a13f9d7f49689c884f9c1e2188cbc0f13698488eb8a8b62c1ba98461613c9a00b3824377ed858cffc2cfb51bf82821961875448f
+AUX fix-runpaths-r1.patch 362 BLAKE2B 25ae148f9170b1c8d2a112c84d231611e6e042775daceaeca8c0df0a3bbbc586fb6c668a3cd53f280bbfeb091823d77157ec17b53f20e1c3abee2802eefe07ad SHA512 36baa70ad2a33145b30cc3a9841fed9c81a5aa2d6a6c8aa7037aa6b859abdc5b45b7bfbcaeac5ebe7480589c205b7e9fc3863e7b81711e9c09b38d311345cbb3
+AUX libiodbc-3.52.12-multilib.patch 849 BLAKE2B acf21f410e8f187cdd221de8f4c6099e816a69177f71364f8e7575b45ee135db19cf604bf793a995e0f08f6f5452da163243c1f592d1ae043ef27ccb3ca47163 SHA512 adb175b2f5f1221bd2e55b598a7b5a72529f09e04f25fd14471ac84e207a5030a153e0a2b397259e20fa2cd1efadde6a4efa83fc9b9959f89e688ae6dd71b7ad
+AUX libiodbc-3.52.7-debian_bug501100.patch 190 BLAKE2B 9543a5d3a1772b12b76d7a5ebcd01437de37a9d8c26189b2c4eae8e69fa16d9ba1239aecdf8be616cd204e7bc3ba66a296aeb006ecd7c1e771d8a491ad40f49e SHA512 57f0f6f1cc6f513daabf0e57db6d2ca1445e19615987d5714c3b5e7ee9672ce782da17711d1051660042a6e062e6b827c59b6dc6c8ba3e4799dfdaaa9ce269ed
+AUX libiodbc-3.52.7-debian_bug508480.patch 358 BLAKE2B d2fcd5ebed2f71f1e679eaf4973b45ff98cc6863abf034ce8d752546fdfef5287e4d198317f55798e10bfb5e6b788cd946ac74a08733da4a0997679534fb05b7 SHA512 b9da90f0deffbfd8ca35a1583f35689d2f04fd83817c9884b0566a78a95a2407bc478455402d68debbce298149ca736453ada1010ad00dac4f524bf32b3bc6e0
+AUX libiodbc-3.52.7-unicode_includes.patch 213 BLAKE2B cc4c0abb2d694497cb38bac5dc746a70ffb8c0b904133a128c2328bcbe11ff2e5926b1cbb330c8b017ec39face9925b646dc655fde5554bf22118572242f2a76 SHA512 56d370dfd916c74f4bb66db4e13378fc3b6978a53921c831c0c56bd8e803773fd2e327ac43b69ce533acdd023cc042f1748159bd82a8cfe2dedb0f98fb17b496
+DIST libiodbc-3.52.12.tar.gz 760155 BLAKE2B ab1a66b34c55f5ebd72c76c09bf356c9e009666634f7f7516c39653840051bd7ae399b54232284e9cfeae37b752eae761d8f749e48e3184857ba59177016e03a SHA512 992a4d0a36651fe55178a4834160901381ea230a0e1671f61e1c5dd17708d2b649823313b97d5954e1656dc2213382361cb5f1eaf2f28f3b1ac55fd9f7aac535
+DIST libiodbc-3.52.14.tar.gz 800285 BLAKE2B 6d6c52ae6eb133c5d844a9106079878290a317c72e1d1fb31f4a91c703ff26b8b97fbeccfcf0041442dc7775042f64711cf7a47db7a2eba745e6a502b3f2adeb SHA512 76f60b1bf818937f1aa6fa4ac8a98573860e37d437ece94de9500b815be9e931fbd81a5ca700aa645329727773cc1710b4a7de69fbf2ef43cf610b6fbca05bac
+EBUILD libiodbc-3.52.12-r1.ebuild 1642 BLAKE2B 0be8913bf0a957c2834b20abb938385eaea7336de460f43aeb939a0e96e182d1de79f64de4f981021218e714626c08fd855ba60dd056e61bedaa2687cf493522 SHA512 1bbec0ca5ac9725c0d9cad5ac78d080305adddb0a60bddd66fe1dad7922684945c911220ac0827ee7f71303f3d0e390333bb1bf2e8730bceac7b0963606ee795
+EBUILD libiodbc-3.52.14.ebuild 1598 BLAKE2B 9d1e47306d4d86d0a34558f419c0677541eb46ef4ba21dd2c5cce5896ef64e754618565c55ee4351921bb1d5ab0b864e18217557ca3d6522c0fd34fdc0ebfbdd SHA512 d463fe93d4aab5f5c26433a317e37977c552b43dc12911b0ac3c488120cca604133f251618c027740c746603e75c272b6ce8f650ae43941aecbfc139a1c3b07f
 MISC metadata.xml 251 BLAKE2B de1fe040cd23515516e31a81c78089f5fb4b9240f43a659d0e6981665bec427ebfe5f68bbea534b92dd4352f42e366c2070d3ef3e7fc0d3beee880445d973bef SHA512 ec0eb5cbc30d0a7ad8c74612255d84a473c370d977f9be4c95904eb5281060bbe3c23d97fb9537e844bbaf90c2f6dd1fae891d44628bbca29fbecb0fe0cb8bbd
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
diff --git a/dev-db/libiodbc/libiodbc-3.52.14.ebuild b/dev-db/libiodbc/libiodbc-3.52.14.ebuild
new file mode 100644
index 000000000000..e7acaba82d3f
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="|| ( LGPL-2 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/iodbc-config )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.52.12-multilib.patch
+	"${FILESDIR}"/${PN}-3.52.7-debian_bug501100.patch
+	"${FILESDIR}"/${PN}-3.52.7-unicode_includes.patch
+	"${FILESDIR}"/fix-runpaths-r1.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i.orig \
+		-e '/^cd "$PREFIX"/,/^esac/d' \
+		iodbc/install_libodbc.sh || die "sed failed"
+
+	# Without this, automake dies. It's what upstream's autogen.sh does.
+	touch ChangeLog || die "failed to create empty ChangeLog"
+
+	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
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install lintian overrides
+	insinto /usr/share/lintian/overrides
+	newins debian/iodbc.lintian-overrides iodbc
+	newins debian/libiodbc2.lintian-overrides libiodbc2
+}