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

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

5 files changed, 59 insertions, 57 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/Manifest b/dev-db/sqliteodbc/Manifest
index 1c2e6380b3ed..566c65fdad9c 100644
--- a/dev-db/sqliteodbc/Manifest
+++ b/dev-db/sqliteodbc/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX sqliteodbc-0.83-respect_LDFLAGS.patch 1081 RMD160 2d83d4fade80b4045df6e9f0c890ca9ca9297040 SHA1 20938dfbcb65439812c6b20f4989cd3540657407 SHA256 2b6ba70b03c78808a0efd17e312811c2e0b2c2af5e85a17e73184502d96ed16c
-DIST sqliteodbc-0.83.tar.gz 448635 RMD160 8cf4e3d86392df2ac7df59b02eac7c95244c1d20 SHA1 d30e0d5f532a2399e431b93834581cceebbd29e3 SHA256 4ee8c61ee201749adaee63ef5d15cc2b16234b8611aa44bd8b25efc7e4e1af08
-DIST sqliteodbc-0.86.tar.gz 454329 RMD160 83c1b986015df6c9f21ea88968a56767c557fd48 SHA1 73b3f73f28b01549f59a54af121a5d4a33183169 SHA256 1ddbb3a8d97fb2b3a6bd8a71617bfb308250dd66c8784ad3666f9d6eb1fcf71b
+AUX sqliteodbc-0.93-respect_LDFLAGS.patch 1180 RMD160 7ae195150c6401333e35325faf5ad1057028c59f SHA1 6c4d6d83d083cb2276ec67e0c536e4cd63a4804a SHA256 f5864db1996857fb7a062e4d0b85f4d6501175f2b67fb7f5dbd6d4c7301755ab
 DIST sqliteodbc-0.87.tar.gz 456973 RMD160 cf194fb683f5a156682c55cccc76c2c60d3d978e SHA1 a0b4aaa8fb1bf691f1a5169db68da3919fc1dbef SHA256 3ffb3495bccb1b6169c3aac5e15016edcb596044b5f52b073c75223ae152372c
-EBUILD sqliteodbc-0.83.ebuild 803 RMD160 16d903d1ffe402a7d53c277f0cec6c607184bb16 SHA1 b841c150bf33abfd129f9364f840db0b2e7357cf SHA256 f57c64617f16f0196edfb6f9e937c5eaa57a7397ff8f615444033d200c5401a0
-EBUILD sqliteodbc-0.86.ebuild 809 RMD160 a7447e937e03116ff3c779ab0b4927b289f7c224 SHA1 ba0f1ab9f6f48c0aca0a27f93ef606fec5ce66bf SHA256 2f606ff7d68e96647399f473f8f898ae515c0630fed28b1f461dfcf702860e02
+DIST sqliteodbc-0.93.tar.gz 667407 RMD160 92775540425b40657e514d4526cb435ca1a8ac04 SHA1 0a02894aac576047a0153987b5a3fe8e5067dcc1 SHA256 9cc89fe23d3a65abaefd6e78142eb010ba5de5078cdf443a33d9d17d0bd3eda0
 EBUILD sqliteodbc-0.87.ebuild 809 RMD160 d3cec88338e4522191a8ee50fee83afcc2ec9be2 SHA1 fbf1f4b9e3e99173e508c1ab406f8fb72be1b976 SHA256 14e5eeb5220ef6855739ed0931f89eb97578963b7e66b5a6ff9bc0c0affe8e88
-MISC ChangeLog 3544 RMD160 bb303a478b95d9658f35a7c30b61902c848d4631 SHA1 60ed8a9f8eb0f0f77160c1e83b191f0b688a3110 SHA256 4b4de1ec6e881bf8abf782a94f1c0b2f18e87e6167b5b20fcd50a3898c2b6407
+EBUILD sqliteodbc-0.93.ebuild 904 RMD160 529943cc032d437389c7c1d86147246d8d8615ff SHA1 382e1a2bd8d566e2c41022bb509371bd73e40e5a SHA256 e973f26f2b62ce06360a7d334cd4bef70448705f09b7afbbec3a94adfcb59bf5
+MISC ChangeLog 3824 RMD160 f2220329498146d8e474cfb5045617c70bfbf6bb SHA1 f0715258243afb4c4ee90dc5b3c16199ca5fb87a SHA256 cd81249ed27443ac191379034b0a8a547a39961b61f3db0fb734d85d85c8681a
 MISC metadata.xml 268 RMD160 01696164cd82ae0617304a419940adecf5a9d222 SHA1 b52a9b90dd049bc8749bc0d25cdfddebd447860f SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59A9QACgkQfXuS5UK5QB37pwP/XyFU5WvZ75YYMKVWkDedPZJd
-dVETUMDOpoVNg4CGQHKrG7Rj6fAe5TVQNqu/XdOp3CtYowor/iu5trjnumKkHR9S
-hiCJ0UNoBr/d2agEKVNJ2JbtTd+cKz9tRs8tamPC8zyvC5P6TMARKUBK4LwXQgiJ
-JvZtEbb8x1x5ajB4WWQ=
-=WEEB
+iEUEARECAAYFAk9tt98ACgkQCaWpQKGI+9RY0ACfWvgd4BkCXzfMlQ3EF6NXPH2R
+tz0AmNZWfYFHaeHYE6bNr4PL/uxMXag=
+=w9XS
 -----END PGP SIGNATURE-----
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
 }