(non maintainer commit) remove old, broke versions. Add new version from Ingo Bormuth in bug #162180

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo x86_64)

6 files changed, 37 insertions, 146 deletions

diff --git a/dev-db/sqliteodbc/ChangeLog b/dev-db/sqliteodbc/ChangeLog
index 32d52f3d5c36..2d6154854b33 100644
--- a/dev-db/sqliteodbc/ChangeLog
+++ b/dev-db/sqliteodbc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/sqliteodbc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.7 2008/04/21 17:06:45 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.8 2008/10/14 03:15:04 darkside Exp $
+
+*sqliteodbc-0.79 (14 Oct 2008)
+
+  14 Oct 2008; Jeremy Olexa <darkside@gentoo.org>
+  -files/sqliteodbc-0.64-gentoo.patch, +files/sqliteodbc-0.77-iodbc.patch,
+  -sqliteodbc-0.64.ebuild, -sqliteodbc-0.64-r1.ebuild,
+  -sqliteodbc-0.70.ebuild, +sqliteodbc-0.79.ebuild:
+  (non maintainer commit) remove old, broke versions. Add new version from
+  Ingo Bormuth in bug #162180
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch
deleted file mode 100644
index 4812873b97fc..000000000000
--- a/dev-db/sqliteodbc/files/sqliteodbc-0.64-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru sqliteodbc-0.64.orig/configure sqliteodbc-0.64/configure
---- sqliteodbc-0.64.orig/configure	2004-07-08 09:33:50.000000000 +0200
-+++ sqliteodbc-0.64/configure	2005-03-27 13:30:44.759094368 +0200
-@@ -5412,9 +5412,9 @@
- ODBC_FLAGS=UNKNOWN
- ODBC_LIB=UNKNOWN
- for i in $ODBC_DIR ; do
--   if test -r "$i/include/sql.h" ; then
--      if test -r "$i/include/iodbcinst.h" ; then
--         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include"
-+   if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then
-+      if test -r "$i/include/iodbc/iodbcinst.h" ; then
-+         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc"
-          if test -r "$i/lib/libiodbcinst.la" ; then
-             ODBC_LIB="$i/lib/libiodbcinst.la"
-          else
-diff -ru sqliteodbc-0.64.orig/configure.in sqliteodbc-0.64/configure.in
---- sqliteodbc-0.64.orig/configure.in	2004-07-08 09:30:56.000000000 +0200
-+++ sqliteodbc-0.64/configure.in	2005-03-27 13:30:29.765373760 +0200
-@@ -170,9 +170,9 @@
- ODBC_FLAGS=UNKNOWN
- ODBC_LIB=UNKNOWN
- for i in $ODBC_DIR ; do
--   if test -r "$i/include/sql.h" ; then
--      if test -r "$i/include/iodbcinst.h" ; then
--         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include"
-+   if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then
-+      if test -r "$i/include/iodbc/iodbcinst.h" ; then
-+         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc"
-          if test -r "$i/lib/libiodbcinst.la" ; then
-             ODBC_LIB="$i/lib/libiodbcinst.la"
-          else
-Only in sqliteodbc-0.64: .configure.in.swp
diff --git a/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch b/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch
new file mode 100644
index 000000000000..4e33006be534
--- /dev/null
+++ b/dev-db/sqliteodbc/files/sqliteodbc-0.77-iodbc.patch
@@ -0,0 +1,11 @@
+--- sqliteodbc-0.77/configure.in.orig	2008-07-19 14:10:18.000000000 +0300
++++ sqliteodbc-0.77/configure.in	2008-07-19 14:11:06.000000000 +0300
+@@ -273,7 +273,7 @@
+ for i in $ODBC_DIR ; do
+    if test -r "$i/include/iodbc/sql.h" -o -r "$i/include/sql.h" ; then
+       if test -r "$i/include/iodbc/iodbcinst.h" ; then
+-         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/iodbc/include"
++         ODBC_FLAGS="-DHAVE_IODBC=1 -I$i/include/iodbc"
+          if test -r "$i/lib/libiodbcinst.la" ; then
+             ODBC_LIB="$i/lib/libiodbcinst.la"
+          else
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild
deleted file mode 100644
index e03b71f312b3..000000000000
--- a/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild,v 1.2 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit eutils
-
-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="~x86 ~amd64"
-IUSE="sqlite sqlite3"
-
-DEPEND="sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	|| (
-		>=dev-db/unixODBC-2
-		>=dev-db/libiodbc-3.0.6
-	)"
-
-pkg_setup() {
-	if use !sqlite && use !sqlite3
-	then
-		eerror "Please select at least one sqlite library to link against"
-		exit 1
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	if use !sqlite
-	then
-		myconf="${myconf} $(use_with sqlite)"
-	fi
-	if use !sqlite3
-	then
-		myconf="${myconf} $(use_with sqlite3)"
-	fi
-	econf --disable-static ${myconf} || die "could not configure"
-	emake || die "could not compile"
-}
-
-src_install() {
-	dodir /usr/lib
-	einstall || die "could not install"
-}
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.70.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.70.ebuild
deleted file mode 100644
index 81f6c57fea2d..000000000000
--- a/dev-db/sqliteodbc/sqliteodbc-0.70.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.70.ebuild,v 1.3 2007/07/13 06:38:59 mr_bones_ Exp $
-
-inherit eutils autotools
-
-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="sqlite sqlite3"
-
-DEPEND="sqlite? ( =dev-db/sqlite-2* )
-	sqlite3? ( =dev-db/sqlite-3* )
-	|| (
-		>=dev-db/unixODBC-2
-		>=dev-db/libiodbc-3.0.6
-	)"
-
-pkg_setup() {
-	if use !sqlite && use !sqlite3
-	then
-		eerror "Please select at least one sqlite library to link against"
-		exit 1
-	fi
-}
-
-src_compile() {
-	if use !sqlite
-	then
-		myconf="${myconf} $(use_with sqlite)"
-	fi
-	if use !sqlite3
-	then
-		myconf="${myconf} $(use_with sqlite3)"
-	fi
-	econf --disable-static ${myconf} || die "could not configure"
-	emake || die "could not compile"
-}
-
-src_install() {
-	dodir /usr/lib
-	einstall || die "could not install"
-}
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.79.ebuild
index 08d528c4c3e1..373fd847771c 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.79.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild,v 1.4 2007/07/13 06:38:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.79.ebuild,v 1.1 2008/10/14 03:15:04 darkside Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="ODBC driver to access local SQLite database files."
 
@@ -10,27 +10,31 @@ HOMEPAGE="http://www.ch-werner.de/sqliteodbc/"
 SRC_URI="http://www.ch-werner.de/sqliteodbc/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="sqlite3 static"
 
-DEPEND="=dev-db/sqlite-2*
+DEPEND="
+	>=dev-db/sqlite-2.8.16
 	|| (
-		>=dev-db/unixODBC-2
-		>=dev-db/libiodbc-3.0.6
-	)"
+		>=dev-db/unixODBC-2.2
+		>=dev-db/libiodbc-3.5
+	)
+	sqlite3? ( >=dev-db/sqlite-3.5 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.77-iodbc.patch"
+	eautoconf
 }
 
 src_compile() {
-	econf --disable-static || die "could not configure"
+	econf $(use_enable static)
 	emake || die "could not compile"
 }
 
 src_install() {
 	dodir /usr/lib
 	einstall || die "could not install"
+	dodoc README ChangeLog
 }