Enable sqlite per default. Fixes bug #498486. Cleanup old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 9 insertions, 62 deletions

diff --git a/dev-lua/luadbi/ChangeLog b/dev-lua/luadbi/ChangeLog
index c8a49c77e0dc..958f573e391c 100644
--- a/dev-lua/luadbi/ChangeLog
+++ b/dev-lua/luadbi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/luadbi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.20 2014/01/18 18:41:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/ChangeLog,v 1.21 2014/01/21 02:48:27 mrueg Exp $
+
+*luadbi-0.5-r5 (21 Jan 2014)
+
+  21 Jan 2014; Manuel Rüger <mrueg@gentoo.org> +luadbi-0.5-r5.ebuild,
+  -luadbi-0.5-r2.ebuild, -luadbi-0.5-r4.ebuild:
+  Enable sqlite per default. Fixes bug #498486. Cleanup old.
 
   18 Jan 2014; Pacho Ramos <pacho@gentoo.org> luadbi-0.5-r3.ebuild:
   amd64 stable, bug #488410
diff --git a/dev-lua/luadbi/luadbi-0.5-r2.ebuild b/dev-lua/luadbi/luadbi-0.5-r2.ebuild
deleted file mode 100644
index e81093b5d31c..000000000000
--- a/dev-lua/luadbi/luadbi-0.5-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r2.ebuild,v 1.4 2013/08/08 19:25:05 maekke Exp $
-
-EAPI=5
-
-inherit multilib toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="DBI module for Lua"
-HOMEPAGE="http://code.google.com/p/luadbi/"
-SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="mysql postgres sqlite"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND=">=dev-lang/lua-5.1
-		mysql? ( virtual/mysql )
-		postgres? ( dev-db/postgresql-base )
-		sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PVR}-Makefile.patch"
-	epatch "${FILESDIR}/${PV}-postgres-path.patch"
-	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/Makefile"
-	sed -i -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/Makefile"
-	sed -i -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" "${S}/Makefile"
-	sed -i -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" "${S}/Makefile"
-	sed -i -e "s#^LUA_LIB =.*#LUA_LIB=lua#" "${S}/Makefile"
-}
-
-src_compile() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} psql"
-	use sqlite && drivers="${drivers} sqlite3"
-
-	append-flags -fPIC
-	for driver in "${drivers}" ; do
-		emake CC="$(tc-getCC)" COMMON_LDFLAGS="${LDFLAGS}" ${driver}
-	done
-}
-
-src_install() {
-	local drivers=""
-	use mysql && drivers="${drivers} mysql"
-	use postgres && drivers="${drivers} psql"
-	use sqlite && drivers="${drivers} sqlite3"
-
-	for driver in ${drivers} ; do
-		emake DESTDIR="${D}" "install_${driver// /}"
-	done
-}
diff --git a/dev-lua/luadbi/luadbi-0.5-r4.ebuild b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
index a30a56191a69..3f1286c94136 100644
--- a/dev-lua/luadbi/luadbi-0.5-r4.ebuild
+++ b/dev-lua/luadbi/luadbi-0.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r4.ebuild,v 1.1 2014/01/13 03:48:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luadbi/luadbi-0.5-r5.ebuild,v 1.1 2014/01/21 02:48:27 mrueg Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mysql postgres sqlite"
+IUSE="mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 RDEPEND=">=dev-lang/lua-5.1