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

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)

4 files changed, 89 insertions, 5 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/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
 }