fix bugfix bug

Package-Manager: portage-2.1_pre3-r1

5 files changed, 69 insertions, 17 deletions

diff --git a/dev-db/sqliteodbc/ChangeLog b/dev-db/sqliteodbc/ChangeLog
index 8485c3d4ad0a..bbcd14d082c6 100644
--- a/dev-db/sqliteodbc/ChangeLog
+++ b/dev-db/sqliteodbc/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/sqliteodbc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.2 2005/04/23 12:41:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.3 2006/02/02 19:12:08 arj Exp $
 
+*sqliteodbc-0.64 (02 Feb 2006)
+
+  02 Feb 2006; Anders Rune Jensen <arj@gentoo.org> +sqliteodbc-0.64-r1.ebuild:
+  Allow one to select sqlite library to compile against. Fixes #121185
+	
   23 Apr 2005; Sven Wegener <swegener@gentoo.org> sqliteodbc-0.64.ebuild:
   Fixed invalid atoms in *DEPEND.
 
diff --git a/dev-db/sqliteodbc/Manifest b/dev-db/sqliteodbc/Manifest
index ca40b58be8fa..80498c2f17a8 100644
--- a/dev-db/sqliteodbc/Manifest
+++ b/dev-db/sqliteodbc/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8d009a4770e51e6ff124e18837a72dd0 sqliteodbc-0.64.ebuild 807
-MD5 a9f08a06353274c74d465a997340ae22 ChangeLog 456
-MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
-MD5 f913bd86e7d47123636499d181ccddd8 files/sqliteodbc-0.64-gentoo.patch 1513
+MD5 b830bd0ad93857ab6a2aa1e80963f952 ChangeLog 635
 MD5 c0491eff8f0c25f53320c2fa4b009a1d files/digest-sqliteodbc-0.64 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCakKfI1lqEGTUzyQRAsHSAKDTIM3GP7B437CPURKlQ5avNR153gCfdv42
-xT8q/rJqW4QbEfWXvAm5wlc=
-=EyVv
------END PGP SIGNATURE-----
+MD5 c0491eff8f0c25f53320c2fa4b009a1d files/digest-sqliteodbc-0.64-r1 67
+MD5 f913bd86e7d47123636499d181ccddd8 files/sqliteodbc-0.64-gentoo.patch 1513
+MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
+MD5 70e49ca20e8970433523941299569ecc sqliteodbc-0.64-r1.ebuild 1144
+MD5 16692d61ab919626b753eb8a6336f9aa sqliteodbc-0.64.ebuild 802
diff --git a/dev-db/sqliteodbc/files/digest-sqliteodbc-0.64-r1 b/dev-db/sqliteodbc/files/digest-sqliteodbc-0.64-r1
new file mode 100644
index 000000000000..ff06d70d1de8
--- /dev/null
+++ b/dev-db/sqliteodbc/files/digest-sqliteodbc-0.64-r1
@@ -0,0 +1 @@
+MD5 f2ebdac541838e6db0e897fd98c5f34e sqliteodbc-0.64.tar.gz 284413
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild
new file mode 100644
index 000000000000..67faf2514064
--- /dev/null
+++ b/dev-db/sqliteodbc/sqliteodbc-0.64-r1.ebuild
@@ -0,0 +1,54 @@
+# 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.1 2006/02/02 19:12:08 arj 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.64.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
index b8dcf06b1af2..dd33055b3a8d 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.ebuild,v 1.2 2005/04/23 12:41:47 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild,v 1.3 2006/02/02 19:12:08 arj Exp $
 
 inherit eutils