Enable multilib support, required for dev-qt/qtsql. Remove obsolete dependencies.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 94 insertions, 13 deletions

diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog
index 288b28be4879..da7b58d3f1c7 100644
--- a/dev-db/libiodbc/ChangeLog
+++ b/dev-db/libiodbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libiodbc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.60 2013/04/09 12:17:42 olemarkus Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.61 2014/06/23 07:36:46 mgorny Exp $
+
+*libiodbc-3.52.8-r2 (23 Jun 2014)
+
+  23 Jun 2014; Michał Górny <mgorny@gentoo.org> +libiodbc-3.52.8-r2.ebuild:
+  Enable multilib support, required for dev-qt/qtsql. Remove obsolete
+  dependencies.
 
 *libiodbc-3.52.8-r1 (09 Apr 2013)
 
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 90937272587d..b2f42dc5e19f 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -14,19 +14,26 @@ DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49
 EBUILD libiodbc-3.52.7-r1.ebuild 1396 SHA256 3eb454dde1296db6995bc2dd7ae816adfdf65b66ac0ce752ae5a9fc3bfd7cfe2 SHA512 1e773ea27fc4ccf0697518314da5fe08bea5f7dea39ab5e2c651e482d8dd27853f0500e71b93b6577216131dd398fae49282ecfcd2a1d2741defdc8ad165eb14 WHIRLPOOL 0521dece6bfceb6b34063d9f1f5c1bdaa15caab40d9d0859f2c535e6b46432c9ccadf6adeed743f22681a392331e592879c27ad468368253f3d09446cb074165
 EBUILD libiodbc-3.52.7.ebuild 1052 SHA256 50981eb99116adf3045216d3f479a267401c1b7f47d389862b06d0c32090197a SHA512 b36c7bcf3dc6fc55c324fa01f96b3b16743b95f4e0ce0812d9ed2e9f3fc73ec9c6ffad986adae7b9be4e3a35a9a2ec2664afc72daacc2220a7359a56f8a2b226 WHIRLPOOL 352bd91b9ffe7887465450e47e30b8f19777bedf85f537d5cc1b58eb586e2cb3a3da36bb1f88f93984b2c44670c531448d8527881192d245a2bf08e856a50d9a
 EBUILD libiodbc-3.52.8-r1.ebuild 1642 SHA256 6db63551ff25fe9c858f2da096d08998b1622fbbc9fa50bfbc791775df9418d5 SHA512 b51182128661106023880573a471a5e27e441e1a7ae58a8c6fa76a2c63bf185d44ce6b83ba63cc3df1f2eaae102727632f13c788974f34726c1ee2ce8ef20315 WHIRLPOOL 4582f97afac4e151e0ba789708e724a6318e0d6099052a81b22209cd77ad00e2e080553033e15d54223ef39c4b458421b3d9099d121439b3f4101d3d4dbbc61d
+EBUILD libiodbc-3.52.8-r2.ebuild 1723 SHA256 27904f168e10141c11f60ddcc58847062d4dc3f01048391745ef2161ce4aca33 SHA512 2fb55cc883ebbbe56f9c097fbb86ebc7528560ad25f4c8775885e820e6162b089d68e729a24d6205320d670a5595badc8bf2129e4245cad9ce1b2ef7ce0fd17a WHIRLPOOL 4636f3d78b87353f798ddcde1bfd12fa324b6b0d8fa22f7dff06fac1b4faaebc4fbff85bb17e168595059d72c87ee6c63cb530d4cb3bd44c3329e4ab699fa118
 EBUILD libiodbc-3.52.8.ebuild 1649 SHA256 9b585b1bbbaeb9e2a8ae9d9a9e4b1f16ad74efad2fb2027c8eea593ad8612b80 SHA512 a89ed926bf3846aca70fb008e1ca68ac9dd3fb3b2ea67e631bebf718cee1006ed36b43e8d298395c47b735dae97ace2efa2e8b5a9014c617d3e65ed75b5f491f WHIRLPOOL 06ffd745d35559050fc9ff214a5eedb8b8a17a9fc90d26549876867f7ebdf60e2f305186a994fb44204942a7330d8d8e225df4e9eebfa2de440cd0c123f57ffb
-MISC ChangeLog 7708 SHA256 c3fd836ea93cd1918a7e9ac0b04ace8f21bc198e45f3435ab9dce31123e90367 SHA512 d4ce9336f777dacb9448308980c94bcbbdd5aec5ef3d3466b6f1f84e5bd4373d96dda87b94ce00c39b2ad0f15d525ca7e02c0612e3031287217649f5680a5b16 WHIRLPOOL 5f30ff6a030e42c3548aceae31a86dbfbd0d957e7453b67b075080f4ac74bf152a9bcd4d522e5c5362773c95d420ea4fac6b2c991a3cf70ad3f254f5833fb480
+MISC ChangeLog 7905 SHA256 cc089632d5c44e226404fe27a833c42b1703562d85f447099e03d20a13dc9155 SHA512 3aeb2a7c715a464284b8873e3914b9336417f446ed63a1cbaf4d74e0472531f03ec261efddd63501d3900c0a7032caa514810ea24734d9b94f33f4dcaf6bcda6 WHIRLPOOL 9b2c70e80952144fda85f65be906ea390e49be073e44ae6113931b08d0e1f119ebb6067dcdfe02c1d7a09fb801f522d73f82c67dff07e2b0df1216a0b65b5c89
 MISC metadata.xml 206 SHA256 375feec21d1a56bde55d17f03a78c0163b4171898d96945fd0ab792d5d40f32d SHA512 c24642895ceb33fe433db64cf5c29160c99aba8a1462d30714a0108ceb277c2377628066bd1cda636412579e3147966bacde6627d918cd31ccff506be27e83f9 WHIRLPOOL 93d0e74df30edeb25a99dae15e20948e96e7f8ab0fa1fb12c1bf8b2bb324aaa10eceda2043a2a6b9fa2f0f9ac7ed9e75a81838634bf84932c9a53ec8cb8288e7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQF8BAEBCABmBQJRZAbwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1EiMIAIvfvPkMks2gP5UIoQ0udh/j
-lGJqfsO8z1X6NoqWXdHjuNGEFxzYrzVGvQF5qNaHcCnZA1bn+IojKLAUU2ysM7LT
-JtSh0N5vSml2lfCRyAqxJqSK+Zy2gacd9OObFtw2hrFGNaLcxj+l9da363gYaP57
-6BrOuHBFS/USXZI5XpSQ269aWkvZJWBIxU7jUiJgtQ5+4Bxib3kN5WW9Am7ebaf8
-JXDgBffDBaomiG/Zd+tUPjj6gxbggyB1jl+0KeH5CApXeKhAwMMSAMmmVvRr6hrH
-EQpFEaL96Ev2ykIt8CW6QD81+4VhFCV8WagiC19ZNAaTwTNfa+JiCQ7CB6IuvZY=
-=kQQO
+iQJ8BAEBCABmBQJTp9kUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOg6oP/jRl4Yk9E4GPUTvdFJMVNeK+
+l493IZLmc+voX9esdPpW8R+V0rHfcHPDFMJrRc0cNZG0W+tnILtJttIu8VTedqSp
+1aK2w9/jK0BnENEvFOTXc4+tWVCbPA7rLJzSGSu2alqRJALp+IEHijLxB+/3KqUV
+3+7vx16RfugTmuP1Mv154TcRTwhhqfrlist8EgFIPonKbyX90OOcMU8xLz4vTe+L
+un8S6d34wzOXuSvoZplsT77UiNvRJURXlVKqQyNpbEHpmru6CrN4whag0OARDJdk
+bPZtde+LgSLii73trpycF92EUB+fxM/EsBplXywWs3mupwW5bWdyYgx7GaLyQ181
+7hLOJX9C1tM+cYHeVWewlBArk/qu1SCzukIbpd2tl4dO22ZWt3QKBxxw8b3KeBI3
+sHKu1gkmh+Hh1IBstsVS8odG/9XG0nN2z16jX3OoZJ0rHErI40dhl80rMYH/IbWK
+WBYfzcf+AF1VAQEiKxvdnG1gvQoFZbylejMZqWy6Z3MhFS5I2XeuBrFTb1R2ba//
+2+NYIs6751RENrsNRXJoRdspSDOoZ7lRI3OF8teX9ZgLHz1ctpj362wWi9yqGwFE
+CvpEgxLzPrXoYd3NFxIRf7dY/TifuOgxziShCerJPDWDjtLOhgsQZU1Mtt8Y8T6C
+dfz+Sf9cWCB6AUOA/8M+
+=BoV0
 -----END PGP SIGNATURE-----
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..895ceac7b2d9
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2014/06/23 07:36:46 mgorny Exp $
+
+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="~amd64 ~x86"
+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
+}