Remove support for static-libs. Cleaner fix for bug 421603

Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

5 files changed, 101 insertions, 15 deletions

diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog
index d8887bcc4d11..288b28be4879 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.59 2013/03/31 14:03:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.60 2013/04/09 12:17:42 olemarkus Exp $
+
+*libiodbc-3.52.8-r1 (09 Apr 2013)
+
+  09 Apr 2013; Ole Markus With <olemarkus@gentoo.org> +files/fix-runpaths.patch,
+  +libiodbc-3.52.8-r1.ebuild, libiodbc-3.52.8.ebuild:
+  Remove support for static-libs. Cleaner fix for bug 421603
 
   31 Mar 2013; Ole Markus With <olemarkus@gentoo.org> metadata.xml:
   Dropping from php-herd, adding myself as maintainer
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index f2b7701fa10f..90937272587d 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fix-runpaths.patch 434 SHA256 b18af410745b0c0fe2468c486e310fa8e48ec36f28ff3315fd1be395ed419b9a SHA512 48364d6004c0f2dadb71a8b6838a4c4b1caf4d2df59e2f4acca82f6203704c4ad4aa4b3d0d4f33fdab4e8d01d7c70dad916b6bc4455dfa1581ff80f9f48468fa WHIRLPOOL a51adaa95024a5ed0ea1130328b7c9d96b39c8848f554f790a52c23e5211254db41c5cca598a00b2d578962425eb3bfc2e372535ad2687ffa0f646f1d77f5fbb
 AUX libiodbc-3.52.7-debian_bug501100.patch 408 SHA256 d81564fdf0637bacbcbad52d7ad097ec9236f4145ad4f958763747bdc5239158 SHA512 e36a2b936b36af3cbdf125725628a2c5ca1f4d246c7b7eaf8c08a97e96fa25915b2b03bdd33f7a1c42b08d54f89174edbcb7f1ebaaa1a2e9777ff33023ac2575 WHIRLPOOL 215843432087ee2d8f782c301491167b4d8599a527774a6a10154975b082a65cfea390e16847a9a357c531c206156ff1fa6bcd08cfb4a71489929b497477d6ea
 AUX libiodbc-3.52.7-debian_bug508480.patch 577 SHA256 234990661704b35a475a55f28fe0c7275558bf85c5faf1abac4f94ccb8302113 SHA512 2e3a0ab2284b0b302e2eb5d27e1cc952810c5ec2d123491047cda15d1e0b2aa651a1d3357fb330be24fa72ec855a89143eb88bd4b87ce079b469b6ab8647ce74 WHIRLPOOL 949aa7a117577b7331b955fa5981e92e4e0041315d9a00375c2bb8d131b92cbbbc63c2da4aa7f20c38ce0f35bce31f57bf72d440b84e9d8c99f85f0791ade6c8
 AUX libiodbc-3.52.7-gtk.patch 445 SHA256 a883c7c87c1abac24c8964f94ccfe61e6011a1d3d6c424782ae3116fae85bd0e SHA512 ec7d682846103ac67274eb145c8501bdc8fdc2f0a7bda650302713e785ca428c75ad29230301e455ec2ad967aa272b13ad5283e8d5b01ff0dfca6beeac7dd0fb WHIRLPOOL e3e0fcb11518ed63fa0ae45f81b2fcf8863bfd4a3fbb61f913a3c6b750d68bccce5e16afef66a06ac8de08937781178c948bf38359046acebc7f1a88bceff6fb
@@ -12,19 +13,20 @@ DIST libiodbc-3.52.7.tar.gz 1038710 SHA256 d7002cc7e566785f1203f6096dcb49b0aad02
 DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
 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.ebuild 1786 SHA256 ba04925c15c48a36ff8bea030f6c502a65fc8b194b045d66420fd1c29f6ae2d1 SHA512 9f100221f9ee145d71aeed8ea95c095c7832e4c730c096890dbd7d683f297e9dfad7e7388aecb7bbc4b984e42055ce0a0039189880f02264d12bbcc11fc23a9f WHIRLPOOL c24ea5ad294d0bdda7a7d58203edea8d94cb40df1b60b8a0882fb1215d5b1f9f8576bcfb9577f47fff4032b42be885cc6e7bde23a17bc672ffbbfb0b455c53a0
-MISC ChangeLog 7476 SHA256 5a163271a16cce9da5c24c88478e026525cb734abf6f0cef1a48ad3c405caeba SHA512 848647b4d687268a10c47a7219c963baee43c124cdcd3b9e437e1e256889e73e6149fbdb16ad298f41f9d4df923996da496f64f2fd3112362b4f71c955f7ea66 WHIRLPOOL 7d5b1f07e4aa1b67f49d240c8dca671d940cd5b96cafd25f8fa5f16401cc19bdde2c2a0e3b3a43b28ac295d708f28419ef9d2b5b9484e2e05e245a83f8dfa54d
+EBUILD libiodbc-3.52.8-r1.ebuild 1642 SHA256 6db63551ff25fe9c858f2da096d08998b1622fbbc9fa50bfbc791775df9418d5 SHA512 b51182128661106023880573a471a5e27e441e1a7ae58a8c6fa76a2c63bf185d44ce6b83ba63cc3df1f2eaae102727632f13c788974f34726c1ee2ce8ef20315 WHIRLPOOL 4582f97afac4e151e0ba789708e724a6318e0d6099052a81b22209cd77ad00e2e080553033e15d54223ef39c4b458421b3d9099d121439b3f4101d3d4dbbc61d
+EBUILD libiodbc-3.52.8.ebuild 1649 SHA256 9b585b1bbbaeb9e2a8ae9d9a9e4b1f16ad74efad2fb2027c8eea593ad8612b80 SHA512 a89ed926bf3846aca70fb008e1ca68ac9dd3fb3b2ea67e631bebf718cee1006ed36b43e8d298395c47b735dae97ace2efa2e8b5a9014c617d3e65ed75b5f491f WHIRLPOOL 06ffd745d35559050fc9ff214a5eedb8b8a17a9fc90d26549876867f7ebdf60e2f305186a994fb44204942a7330d8d8e225df4e9eebfa2de440cd0c123f57ffb
+MISC ChangeLog 7708 SHA256 c3fd836ea93cd1918a7e9ac0b04ace8f21bc198e45f3435ab9dce31123e90367 SHA512 d4ce9336f777dacb9448308980c94bcbbdd5aec5ef3d3466b6f1f84e5bd4373d96dda87b94ce00c39b2ad0f15d525ca7e02c0612e3031287217649f5680a5b16 WHIRLPOOL 5f30ff6a030e42c3548aceae31a86dbfbd0d957e7453b67b075080f4ac74bf152a9bcd4d522e5c5362773c95d420ea4fac6b2c991a3cf70ad3f254f5833fb480
 MISC metadata.xml 206 SHA256 375feec21d1a56bde55d17f03a78c0163b4171898d96945fd0ab792d5d40f32d SHA512 c24642895ceb33fe433db64cf5c29160c99aba8a1462d30714a0108ceb277c2377628066bd1cda636412579e3147966bacde6627d918cd31ccff506be27e83f9 WHIRLPOOL 93d0e74df30edeb25a99dae15e20948e96e7f8ab0fa1fb12c1bf8b2bb324aaa10eceda2043a2a6b9fa2f0f9ac7ed9e75a81838634bf84932c9a53ec8cb8288e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRWEJFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJRZAbwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOEZEMjNGNzBENkE5N0Q2Q0ZFMkFDNDA2
-QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1qDYIAL3ZJq67+V0FQuYdRIl1PJvW
-YqH663GAgxnPScp7bOuXEs/J8A/tyYpDG9B6pttGI0rSfktAPoWnwhBnulXav1iq
-F1RQvRbv6y0thsOXBjja6yBuW7CUCt+HjrdAS38gz0x5laarbiuYtRUzQeSfSZxo
-7uWSMRhaZI3Vt9wanm4mpVUNF8L0G8kFlQRr34zBx/zZ0HaXE0mqOby1Q1DcsCbg
-0NQ4JHstzOVvBEyB0gpSeM2JXZhL0toAAW+QCBBWYe48oa2UEHVXQxr8of858t7e
-mIZWV8SLKnGEXtoFy5eOUStqmkAk7d0gychzRztlIKKg6WM4YwfwnQ7VgTUNNPM=
-=Uzyd
+QkFCNEFFNUM0QTkyQkY1AAoJEGurSuXEqSv1EiMIAIvfvPkMks2gP5UIoQ0udh/j
+lGJqfsO8z1X6NoqWXdHjuNGEFxzYrzVGvQF5qNaHcCnZA1bn+IojKLAUU2ysM7LT
+JtSh0N5vSml2lfCRyAqxJqSK+Zy2gacd9OObFtw2hrFGNaLcxj+l9da363gYaP57
+6BrOuHBFS/USXZI5XpSQ269aWkvZJWBIxU7jUiJgtQ5+4Bxib3kN5WW9Am7ebaf8
+JXDgBffDBaomiG/Zd+tUPjj6gxbggyB1jl+0KeH5CApXeKhAwMMSAMmmVvRr6hrH
+EQpFEaL96Ev2ykIt8CW6QD81+4VhFCV8WagiC19ZNAaTwTNfa+JiCQ7CB6IuvZY=
+=kQQO
 -----END PGP SIGNATURE-----
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/libiodbc-3.52.8-r1.ebuild b/dev-db/libiodbc/libiodbc-3.52.8-r1.ebuild
new file mode 100644
index 000000000000..652500436e99
--- /dev/null
+++ b/dev-db/libiodbc/libiodbc-3.52.8-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/04/09 12:17:41 olemarkus Exp $
+
+EAPI="5"
+
+inherit autotools eutils
+
+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=">=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	gtk? ( x11-libs/gtk+:2 )"
+
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-odbc3 \
+		--enable-pthreads \
+		--with-layout=gentoo \
+		--with-iodbc-inidir=yes \
+		$(use_enable gtk gui)
+}
+
+src_install() {
+	default
+	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/libiodbc-3.52.8.ebuild b/dev-db/libiodbc/libiodbc-3.52.8.ebuild
index 23f9ec34db33..60d5d5ba92ee 100644
--- a/dev-db/libiodbc/libiodbc-3.52.8.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.ebuild,v 1.1 2013/01/08 22:17:03 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8.ebuild,v 1.2 2013/04/09 12:17:41 olemarkus Exp $
 
 EAPI="5"
 
@@ -63,7 +63,4 @@ src_install() {
 	newins debian/iodbc.lintian-overrides iodbc
 	newins debian/libiodbc2.lintian-overrides libiodbc2
 
-	# Remove rpaths to fix insecure RUNPATHS - bug 421603
-	chrpath --delete "${D}"/usr/bin/iodbctest
-	chrpath --delete "${D}"/usr/bin/iodbctestw
 }