Fix error in sqlite USE flag; cleanup old versions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 10 insertions, 99 deletions

diff --git a/dev-db/libdrizzle/ChangeLog b/dev-db/libdrizzle/ChangeLog
index 0007cfe7156c..75521e3b43ff 100644
--- a/dev-db/libdrizzle/ChangeLog
+++ b/dev-db/libdrizzle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/libdrizzle
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdrizzle/ChangeLog,v 1.5 2010/04/19 06:04:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdrizzle/ChangeLog,v 1.6 2010/05/12 10:04:51 flameeyes Exp $
+
+*libdrizzle-0.8-r1 (12 May 2010)
+
+  12 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libdrizzle-0.6.ebuild, -libdrizzle-0.7.ebuild, -libdrizzle-0.8.ebuild,
+  +libdrizzle-0.8-r1.ebuild:
+  Fix error in sqlite USE flag; cleanup old versions.
 
   19 Apr 2010; Robin H. Johnson <robbat2@gentoo.org> libdrizzle-0.8.ebuild:
   Missed a commit from my laptop.
diff --git a/dev-db/libdrizzle/libdrizzle-0.6.ebuild b/dev-db/libdrizzle/libdrizzle-0.6.ebuild
deleted file mode 100644
index a75fa16bbd48..000000000000
--- a/dev-db/libdrizzle/libdrizzle-0.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdrizzle/libdrizzle-0.6.ebuild,v 1.2 2009/12/23 18:19:22 flameeyes Exp $
-
-EAPI=2
-
-DESCRIPTION="a C client and protocol library for the Drizzle project"
-HOMEPAGE="http://launchpad.net/libdrizzle"
-SRC_URI="http://launchpad.net/libdrizzle/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug tcmalloc +sqlite static-libs"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Don't ever use --enable-assert since configure.ac is broken, and
-	# only does --disable-assert correctly.
-	 if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-flags -DDEBUG
-
-	# Right now disabling asserts break the code, so never disable
-	# them as it is.
-	#else
-	#	myconf="${myconf} --disable-assert"
-	fi
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		$(use_enable tcmalloc) \
-		$(use_enable libsqlite3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS PROTOCOL README || die
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/libdrizzle/libdrizzle-0.7.ebuild b/dev-db/libdrizzle/libdrizzle-0.7.ebuild
deleted file mode 100644
index d51c0aa838e3..000000000000
--- a/dev-db/libdrizzle/libdrizzle-0.7.ebuild
+++ /dev/null
@@ -1,48 +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/libdrizzle/libdrizzle-0.7.ebuild,v 1.1 2010/01/13 09:59:57 flameeyes Exp $
-
-EAPI=2
-
-DESCRIPTION="a C client and protocol library for the Drizzle project"
-HOMEPAGE="http://launchpad.net/libdrizzle"
-SRC_URI="http://launchpad.net/libdrizzle/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug tcmalloc +sqlite static-libs"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Don't ever use --enable-assert since configure.ac is broken, and
-	# only does --disable-assert correctly.
-	 if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-flags -DDEBUG
-
-	# Right now disabling asserts break the code, so never disable
-	# them as it is.
-	#else
-	#	myconf="${myconf} --disable-assert"
-	fi
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		$(use_enable tcmalloc) \
-		$(use_enable libsqlite3)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS PROTOCOL README || die
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/libdrizzle/libdrizzle-0.8.ebuild b/dev-db/libdrizzle/libdrizzle-0.8-r1.ebuild
index 77bc49c09dee..872b9112083b 100644
--- a/dev-db/libdrizzle/libdrizzle-0.8.ebuild
+++ b/dev-db/libdrizzle/libdrizzle-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdrizzle/libdrizzle-0.8.ebuild,v 1.2 2010/04/19 06:04:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdrizzle/libdrizzle-0.8-r1.ebuild,v 1.1 2010/05/12 10:04:51 flameeyes Exp $
 
 EAPI=2
 
@@ -37,7 +37,7 @@ src_configure() {
 		--disable-dependency-tracking \
 		--disable-mtmalloc \
 		$(use_enable tcmalloc) \
-		$(use_enable libsqlite3)
+		$(use_enable sqlite libsqlite3)
 }
 
 src_install() {