Bug #104601, sqlite3 support is now controlled by a seperate use flag.

(Portage version: 2.1_pre4-r1)

4 files changed, 68 insertions, 4 deletions

diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index 1094da4962de..a219158990bd 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/libdbi-drivers
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.15 2006/02/25 10:23:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.16 2006/02/25 11:54:00 robbat2 Exp $
+
+*libdbi-drivers-0.8.1-r1 (25 Feb 2006)
+
+  25 Feb 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +libdbi-drivers-0.8.1-r1.ebuild:
+  Bug #104601, sqlite3 support is now controlled by a seperate use flag.
 
   25 Feb 2006; Robin H. Johnson <robbat2@gentoo.org>
   libdbi-drivers-0.8.0.ebuild, libdbi-drivers-0.8.1.ebuild:
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 84563901df83..276fc475d3f2 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,6 +1,6 @@
-MD5 6590b0daef76486bafc6117888a87d81 ChangeLog 1957
-RMD160 a7c9e95b44f2a37d78e9ebdd555912c3d716b59a ChangeLog 1957
-SHA256 19520c4351fe666d25bbef69e9cc6ca4f66aeeedec83fc9ef1f5438eaad42525 ChangeLog 1957
+MD5 f392caaed45cfb2b5ed9c4f806c221f0 ChangeLog 2159
+RMD160 f3a8f2df8b8b544d35cc72153e6cdee6e5c31b61 ChangeLog 2159
+SHA256 ac21fce05441a4982a29c1690b1ca3d5a0b21e246ecd1b7316ca24d139bafc4f ChangeLog 2159
 MD5 773b07f27a69df8943d40fea56b1c36e files/digest-libdbi-drivers-0.7.1 72
 RMD160 8611269dab8089c3040574df871dda639f1a1570 files/digest-libdbi-drivers-0.7.1 72
 SHA256 cf242d3c3a7b32ccb3c5096627a411a668c52fe681d9458dc95a1eb410d53b20 files/digest-libdbi-drivers-0.7.1 72
@@ -13,6 +13,9 @@ SHA256 04bb8442dc0c31a7b7ce3a140a92391f810c7dd3cc7ac2790f29731ef6e29623 files/di
 MD5 5276e1f443163a798a93ab46b113b30e files/digest-libdbi-drivers-0.8.1 265
 RMD160 fa1003851702876e101a4a6630729353623f7515 files/digest-libdbi-drivers-0.8.1 265
 SHA256 66077515bfe11edb2a0161ba4f213b0cf20dde885d7124364d3bcdce6456e737 files/digest-libdbi-drivers-0.8.1 265
+MD5 5276e1f443163a798a93ab46b113b30e files/digest-libdbi-drivers-0.8.1-r1 265
+RMD160 fa1003851702876e101a4a6630729353623f7515 files/digest-libdbi-drivers-0.8.1-r1 265
+SHA256 66077515bfe11edb2a0161ba4f213b0cf20dde885d7124364d3bcdce6456e737 files/digest-libdbi-drivers-0.8.1-r1 265
 MD5 7b8fb743ca0472ec8ae0994c12991bcb libdbi-drivers-0.7.1-r1.ebuild 1552
 RMD160 c957fe720772f47ab09906d963ed578ae78dca8b libdbi-drivers-0.7.1-r1.ebuild 1552
 SHA256 9951407fa04347b7eb14b058d2637ce91eea414f77786612dd0bd2287350294c libdbi-drivers-0.7.1-r1.ebuild 1552
@@ -22,6 +25,9 @@ SHA256 d4d4de5e16c572100e150d4a5c5c9ad34005a367c9125d69f6aa84a25e6c1df1 libdbi-d
 MD5 48d7a74d5a9f54231af65d746f39cf32 libdbi-drivers-0.8.0.ebuild 1809
 RMD160 6b45a6eabf8656773ea9e954ce365e4295d03e19 libdbi-drivers-0.8.0.ebuild 1809
 SHA256 b2000e6a21ae7da6a36a72ccf227681d7c4d22e4a8f59afe9922528f6b3e34a9 libdbi-drivers-0.8.0.ebuild 1809
+MD5 97f40ac8f71d29efa049369139fa222f libdbi-drivers-0.8.1-r1.ebuild 1842
+RMD160 501afcd639ea380526bf684f5cafa4bf101a8fd5 libdbi-drivers-0.8.1-r1.ebuild 1842
+SHA256 7696cef2d37d819718fa075845c683756387b3e2ef08804027f10e95e1caa671 libdbi-drivers-0.8.1-r1.ebuild 1842
 MD5 a136a4ed0120eecf08612217d12ad9c9 libdbi-drivers-0.8.1.ebuild 1809
 RMD160 c2d8aebf5e441ac645cd48c56ac97de911460cc5 libdbi-drivers-0.8.1.ebuild 1809
 SHA256 b6c04afcd508793b321f56ddfd59441afd667f5533c95e0853feecbfcbaebb6f libdbi-drivers-0.8.1.ebuild 1809
diff --git a/dev-db/libdbi-drivers/files/digest-libdbi-drivers-0.8.1-r1 b/dev-db/libdbi-drivers/files/digest-libdbi-drivers-0.8.1-r1
new file mode 100644
index 000000000000..bc3c428cfd78
--- /dev/null
+++ b/dev-db/libdbi-drivers/files/digest-libdbi-drivers-0.8.1-r1
@@ -0,0 +1,3 @@
+MD5 bca4dd6184e3e78676c35eb9a7ae1186 libdbi-drivers-0.8.1.tar.gz 1147446
+RMD160 280c5ea3a8a2b7029865d4fc48064620d9db2e38 libdbi-drivers-0.8.1.tar.gz 1147446
+SHA256 1b45bb53693feccdcc7fe7d32d37474e3ae15e8013553cc7051faa101f445bcd libdbi-drivers-0.8.1.tar.gz 1147446
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..181ca107a6fb
--- /dev/null
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.1-r1.ebuild,v 1.1 2006/02/25 11:54:00 robbat2 Exp $
+
+DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
+LICENSE="LGPL-2.1"
+DEPEND=">=dev-db/libdbi-0.8.0
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql )
+		sqlite? ( <dev-db/sqlite-3 )
+		sqlite3? ( >=dev-db/sqlite-3 )
+		firebird? ( dev-db/firebird )"
+
+IUSE="mysql postgres sqlite oci8 firebird sqlite3"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+SLOT=0
+
+src_compile() {
+	local myconf=""
+	local drivers=""
+# WARNING: the configure script does NOT work correctly
+# --without-$driver does NOT work
+# so do NOT use `use_with...`
+	use mysql && drivers="${drivers} mysql" myconf="${myconf} --with-mysql"
+	use postgres && drivers="${drivers} pgsql" myconf="${myconf} --with-pgsql"
+	use sqlite && drivers="${drivers} sqlite" myconf="${myconf} --with-sqlite"
+	use sqlite3 && drivers="${drivers} sqlite3" myconf="${myconf} --with-sqlite3"
+	use firebird && drivers="${drivers} firebird" myconf="${myconf} --with-firebird"
+	if use oci8; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			die "\$ORACLE_HOME is not set!"
+		fi
+		myconf="${myconf} --with-oracle-dir=${ORACLE_HOME} --with-oracle" drivers="${drivers} oracle"
+	fi
+# safety check
+	if [ -z "${drivers}" ]; then
+		die "You have not specified any supported databases in your use flags (mysql, pgsql, sqlite, sqlite3, oracle, firebird)"
+	fi
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake install DESTDIR=${D} || die "make install failed"
+	dodoc AUTHORS ChangeLog COPYING NEWS README README.osx TODO
+}