Fix error in sqlite USE flag; cleanup old versions.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/dev-db/libdrizzle/ChangeLog b/dev-db/libdrizzle/ChangeLog
index 0007cfe7156c796de299518b814227f0151d7193..75521e3b43ffe3dc1f2582758f7d2bc1735776a5 100644 (file)
--- 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/Manifest b/dev-db/libdrizzle/Manifest
index 8efbe74b1f5665a5dad6b4dd201d182a32b6c75e..60cb3b6033e4a0327355d813a539a56ce2b91f91 100644 (file)
--- a/dev-db/libdrizzle/Manifest
+++ b/dev-db/libdrizzle/Manifest
@@ -1,8 +1,14 @@
-DIST libdrizzle-0.6.tar.gz 444951 RMD160 58c9cba8e744e6c24fb1a27fee9e08f9946a5dd3 SHA1 23add69b8a28c835a89dd3a64bb6b798788cf284 SHA256 f8da4750058691a71af4aa26cc2d38edf95888ff815d4be1362c7bdd0bb1ca68
-DIST libdrizzle-0.7.tar.gz 446476 RMD160 1508a5353270339a80ade46ffeb3400c7c86848f SHA1 8c9f3bde5f770a495cd459abf636189ed3ea31a8 SHA256 3b11e368eb1e55be9b892c0d72e259a9ed30d180136ba1d84c765acfe98f0839
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libdrizzle-0.8.tar.gz 465875 RMD160 6db4fea88df57071019945e404969bf2b2be76d7 SHA1 04b0659557a40e87b820d405b3817b401a3164f0 SHA256 e2c5d1e7fa33a908dc35ce509e962c1f9afa69c4a838db6790ef1c060a011e46
-EBUILD libdrizzle-0.6.ebuild 1362 RMD160 07521a6097db746460f3828775ab18fedfb88827 SHA1 a609dcb856bdba0977805b4696eaa4c9eab0aba5 SHA256 0849b98bde101bcc40b6b31b3a8d0fcc2e3d1f31582f05e95ec94509377a0f07
-EBUILD libdrizzle-0.7.ebuild 1362 RMD160 535682513b6b6288943aa5e04186821aa0993004 SHA1 10a3c9e2290b7dd2a000c95e387cd3a5e3f56b7f SHA256 2fd67b3d67b7bc2790cf44c26294b6f0e84fd915de293462437af2c332520b8d
-EBUILD libdrizzle-0.8.ebuild 1365 RMD160 3c20f666a4a3d28b384497981ebfb182b584bd6e SHA1 d6029d3d090ff669023d27acbbe77239be60d95d SHA256 de4f30caeff1b268928cf0bb809fbdd5fb14ee48c3c3f1a0b3d3cdb7339a0745
-MISC ChangeLog 939 RMD160 fff004721a37a76c22f49ce4bd480ebbaac5574a SHA1 94d739a29ffb4df93462d19518a2b8527a27b1fe SHA256 281ad0ec56c7125a3fcebf32fb5bd3dd8d6419ad08263f32d5fb098a10dcab60
+EBUILD libdrizzle-0.8-r1.ebuild 1377 RMD160 826a3ae6ef0abfdab2e5abd0f0fe2157296c681d SHA1 ab82401eac95cabf232518af2199990e04eff5be SHA256 aac21f61c1a417df664affd72c99b3455b82716bbef4e9ae89e008b933afb9ba
+MISC ChangeLog 1189 RMD160 9f005b7158aee3569e882a69fa81713aeab4070a SHA1 0303f6b71d53caea227e5a26e2f5ffa1d8627a54 SHA256 02c289f9d63a4ecc54b0909f1b801d692377f03a75fda81e1b57d52aa2dee4f8
 MISC metadata.xml 570 RMD160 7aa34b382179e9d4b83b54f62463b225b89ff48e SHA1 492a4217382bd3207c355c1e9692bb92592433a2 SHA256 ffbf460ed512a632a07a532c374a3b6c835b90696bd95fff4015858ac6a3d63d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvqfEQACgkQAiZjviIA2Xg9xwCeJxIZdXQ9lKehmwzs2XIxPWty
+HHMAn1heEG+/gkVi9/UmOLjDdvtBIH9m
+=EXF2
+-----END PGP SIGNATURE-----

diff --git a/dev-db/libdrizzle/libdrizzle-0.6.ebuild b/dev-db/libdrizzle/libdrizzle-0.6.ebuild
deleted file mode 100644 (file)
index a75fa16..0000000
--- 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 (file)
index d51c0aa..0000000
--- 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
similarity index 93%
rename from dev-db/libdrizzle/libdrizzle-0.8.ebuild
rename to dev-db/libdrizzle/libdrizzle-0.8-r1.ebuild
index 77bc49c09deeedbe52244615960d7522d0761d06..872b9112083b2283b2d28b47d13f52ef27a9edfb 100644 (file)
--- 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() {