Version bump (#409437 by Anton Romanov), drop static stuff and remove old.

(Portage version: 2.1.10.51/cvs/Linux x86_64)

4 files changed, 50 insertions, 45 deletions

diff --git a/dev-db/sqliteodbc/ChangeLog b/dev-db/sqliteodbc/ChangeLog
index 9fb6c0d883cf..4ca9be8a5cd8 100644
--- a/dev-db/sqliteodbc/ChangeLog
+++ b/dev-db/sqliteodbc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/sqliteodbc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.24 2010/10/22 18:58:02 ranger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.25 2012/03/24 12:02:33 pacho Exp $
+
+*sqliteodbc-0.93 (24 Mar 2012)
+
+  24 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/sqliteodbc-0.93-respect_LDFLAGS.patch, +sqliteodbc-0.93.ebuild,
+  -sqliteodbc-0.83.ebuild, -sqliteodbc-0.86.ebuild:
+  Version bump (#409437 by Anton Romanov), drop static stuff and remove old.
 
   22 Oct 2010; Brent Baude <ranger@gentoo.org> sqliteodbc-0.87.ebuild:
   stable ppc, bug 341317
diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch
new file mode 100644
index 000000000000..129ce3e65ff3
--- /dev/null
+++ b/dev-db/sqliteodbc/files/sqliteodbc-0.93-respect_LDFLAGS.patch
@@ -0,0 +1,30 @@
+--- Makefile.in.old	2012-03-24 12:57:34.533234122 +0100
++++ Makefile.in	2012-03-24 12:58:06.908198492 +0100
+@@ -37,23 +37,23 @@
+ all:		@LIB_TARGETS@
+ 
+ libsqliteodbc.la:	sqliteodbc.lo
+-		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libsqliteodbc.la \
++		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libsqliteodbc.la \
+ 		    sqliteodbc.lo -rpath $(drvdir) $(SQLITE_LIB) \
+ 		    $(ODBC_LIB) -release $(VER_INFO)
+ 
+ libsqlite3odbc.la:	sqlite3odbc.lo $(SQLITE3_A10N_O)
+-		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libsqlite3odbc.la \
++		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libsqlite3odbc.la \
+ 		    sqlite3odbc.lo $(SQLITE3_A10N_O) -rpath $(drvdir) \
+ 		    $(SQLITE3_LIB) $(ODBC_LIB) -release $(VER_INFO) \
+ 		    @DL_INITFINI@
+ 
+ libsqlite3_mod_blobtoxy.la:	blobtoxy.lo
+-		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
++		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \
+ 		    -o libsqlite3_mod_blobtoxy.la \
+ 		    blobtoxy.lo -rpath $(drvdir) -release $(VER_INFO)
+ 
+ libsqlite3_mod_impexp.la:	impexp.lo
+-		$(LIBTOOL) --mode=link $(CC) $(CFLAGS) \
++		$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) \
+ 		    -o libsqlite3_mod_impexp.la \
+ 		    impexp.lo -rpath $(drvdir) -release $(VER_INFO)
+ 
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.86.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.86.ebuild
deleted file mode 100644
index 36a9da51029d..000000000000
--- a/dev-db/sqliteodbc/sqliteodbc-0.86.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.86.ebuild,v 1.4 2010/10/14 19:05:49 ranger Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="ODBC driver to access local SQLite database files."
-HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
-SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-db/sqlite-3.6
-	|| (
-		>=dev-db/unixODBC-2.2
-		>=dev-db/libiodbc-3.5
-	)"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.83-respect_LDFLAGS.patch"
-}
-
-src_install() {
-	dodir "/usr/$(get_libdir)"
-	einstall || die "einstall failed"
-	dodoc ChangeLog README
-}
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.83.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.93.ebuild
index ca81890b2f25..a35884f9b5f0 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.83.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.93.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.83.ebuild,v 1.4 2009/11/20 15:05:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.93.ebuild,v 1.1 2012/03/24 12:02:33 pacho Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-db/sqlite-3.6
@@ -27,11 +27,16 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	epatch "${FILESDIR}/${PN}-0.93-respect_LDFLAGS.patch"
+}
+
+src_configure() {
+	econf --disable-static
 }
 
 src_install() {
 	dodir "/usr/$(get_libdir)"
-	einstall || die "einstall failed"
+	einstall
+	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
 	dodoc ChangeLog README
 }