Update sqlite deps per bug 462390.

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 21 insertions, 29 deletions

diff --git a/dev-db/libzdb/ChangeLog b/dev-db/libzdb/ChangeLog
index cde973ad37c7..7b1e7f6f8759 100644
--- a/dev-db/libzdb/ChangeLog
+++ b/dev-db/libzdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/libzdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/ChangeLog,v 1.8 2013/03/17 15:20:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/ChangeLog,v 1.9 2013/03/27 22:55:09 floppym Exp $
+
+  27 Mar 2013; Mike Gilbert <floppym@gentoo.org> libzdb-2.10.3.ebuild,
+  libzdb-2.10.5.ebuild, libzdb-2.11.1.ebuild:
+  Update sqlite deps per bug 462390.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-db/libzdb/libzdb-2.10.3.ebuild b/dev-db/libzdb/libzdb-2.10.3.ebuild
index da8706bfe220..06a37d756a6b 100644
--- a/dev-db/libzdb/libzdb-2.10.3.ebuild
+++ b/dev-db/libzdb/libzdb-2.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.3.ebuild,v 1.2 2012/09/05 19:27:25 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.3.ebuild,v 1.3 2013/03/27 22:55:09 floppym Exp $
 
 EAPI="4"
 
@@ -13,13 +13,12 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
+IUSE="debug doc mysql postgres +sqlite ssl static-libs"
 REQUIRED_USE=" || ( postgres mysql sqlite )"
 
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
-	sqlite? ( >=dev-db/sqlite-3 )
-	sqliteunlock? ( >=dev-db/sqlite-3.6.12[unlock-notify] )
+	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -43,11 +42,8 @@ src_configure() {
 		myconf="${myconf} --enable-protected"
 	fi
 
-	if ( use sqlite ); then
-		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
-		if has_version 'dev-db/sqlite[unlock-notify]'; then
-			myconf="${myconf} --enable-sqliteunlock"
-		fi
+	if use sqlite; then
+		myconf=+=" --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
 	else
 		myconf="${myconf} --without-sqlite"
 	fi
diff --git a/dev-db/libzdb/libzdb-2.10.5.ebuild b/dev-db/libzdb/libzdb-2.10.5.ebuild
index 59b239b74b63..1d20d9223cf1 100644
--- a/dev-db/libzdb/libzdb-2.10.5.ebuild
+++ b/dev-db/libzdb/libzdb-2.10.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.4 2013/01/09 13:37:40 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.10.5.ebuild,v 1.5 2013/03/27 22:55:09 floppym Exp $
 
 EAPI="4"
 
@@ -13,15 +13,14 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
+IUSE="debug doc mysql postgres +sqlite ssl static-libs"
 REQUIRED_USE=" || ( postgres mysql sqlite )"
 
 RESTRICT=test
 
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
-	sqlite? ( >=dev-db/sqlite-3 )
-	sqliteunlock? ( >=dev-db/sqlite-3.6.12[unlock-notify] )
+	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -41,11 +40,8 @@ src_configure() {
 		myconf="${myconf} --enable-protected"
 	fi
 
-	if ( use sqlite ); then
-		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
-		if has_version 'dev-db/sqlite[unlock-notify]'; then
-			myconf="${myconf} --enable-sqliteunlock"
-		fi
+	if use sqlite; then
+		myconf=+=" --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
 	else
 		myconf="${myconf} --without-sqlite"
 	fi
diff --git a/dev-db/libzdb/libzdb-2.11.1.ebuild b/dev-db/libzdb/libzdb-2.11.1.ebuild
index 7d6e10d8695c..4f22d3978548 100644
--- a/dev-db/libzdb/libzdb-2.11.1.ebuild
+++ b/dev-db/libzdb/libzdb-2.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.11.1.ebuild,v 1.1 2013/01/09 13:37:40 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libzdb/libzdb-2.11.1.ebuild,v 1.2 2013/03/27 22:55:09 floppym Exp $
 
 EAPI="4"
 
@@ -13,15 +13,14 @@ SRC_URI="http://www.tildeslash.com/${PN}/dist/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="debug doc mysql postgres +sqlite +sqliteunlock ssl static-libs"
+IUSE="debug doc mysql postgres +sqlite ssl static-libs"
 REQUIRED_USE=" || ( postgres mysql sqlite )"
 
 RESTRICT=test
 
 RDEPEND="mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql-base )
-	sqlite? ( >=dev-db/sqlite-3 )
-	sqliteunlock? ( >=dev-db/sqlite-3.6.12[unlock-notify] )
+	sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -41,11 +40,8 @@ src_configure() {
 		myconf="${myconf} --enable-protected"
 	fi
 
-	if ( use sqlite ); then
-		myconf="${myconf} --with-sqlite=${EPREFIX}/usr/"
-		if has_version 'dev-db/sqlite[unlock-notify]'; then
-			myconf="${myconf} --enable-sqliteunlock"
-		fi
+	if use sqlite; then
+		myconf=+=" --with-sqlite=${EPREFIX}/usr/ --enable-sqliteunlock"
 	else
 		myconf="${myconf} --without-sqlite"
 	fi