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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

4 files changed, 11 insertions, 75 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/Manifest b/dev-lua/luadbi/Manifest
index 2e38a41dbaa1..0d6e8ac4eee3 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.5-postgres-path.patch 277 SHA256 09ab48339a671083ac18ac42248a380f92722bee35b21e1412dc27d669e27385 SHA512 4e4a23c065f868c0aeb9111118cca71b7d3f0edbdbed82654cd77871d5028d223f07623e6598b902f06c02803b6310a7bed5a7ce38504c1ad10d571b6121e43a WHIRLPOOL 54c16aa4c25613ad86b074af228e718a41b875ed8448b279b4d64bfdb23e73609e0656709b265ca98f3062a716e6be7a0f9c9e7aba29c086bc813a16bc04af67
 AUX 0.5-r2-Makefile.patch 1785 SHA256 b04eb65a09578c4a72344107881a09fcca56bd95d7a5d13a2c5e3d8e8c2841a0 SHA512 c9eca24aac386d34dff68a61e538dd2c736569b62e1afc9b0ff2bad14f26c42d402ec1e0eba2f7e974d6e689c70f880c31cfbc955a4e2afa8ca4bebcd351ae58 WHIRLPOOL 01ff9086e393173d567c713de1a04f50c2d4e705d85769dc5dd73c965b94aafeedc8067143480519818f05aa988e1ff3631ce56443590f7720d54a15d2461d23
 DIST luadbi.0.5.tar.gz 22454 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e SHA512 4ed641e113e90acc8a4f6b3b2d0f5d5044c0fbbef3b2fdfb84d15e17115e45c553a33b19bfb165e5af11a2adce501d66859963e3363d3ab1c6a39b0b2ae92e62 WHIRLPOOL 6f1384d562adb7f874b9df6d42ebbe689fbd200ca57881ab76847eae818ffbb85765bfdbeb810511e8cff05170ba104bfc029f9cc969e8799a6971207f4bce4e
-EBUILD luadbi-0.5-r2.ebuild 1855 SHA256 2d765ec816434df4ee265b47d3d11e3905a5316f21bf024cc95991f286930bc5 SHA512 6a5cf9bc9520989a6fe79c8c34d556316193a4ae6f82f760a51482ea87e22aa32d9066ab1d3f8214dfbf433049913196f119925eab626e8509c7d52bacee001f WHIRLPOOL eb12df7bdab061067a76350a25555dec5f212c464cef3f6106d53dc76402b05599c26f3745350acd641b375d93d4e788d23ab03c5f9efb3b3e4ce96964011340
 EBUILD luadbi-0.5-r3.ebuild 1926 SHA256 88f12a0e750ecb37ac04ec28d4a72d92f118b9b41c3b577145a90ce8eb437eb7 SHA512 577d311f210f75d0d4520315868f91ecaa16d93e14b0a1483d5c1485bf39d97f34c75a3f700b676419d69a6a709eccc40a7d2df3d0308c9443789d75bd8b9d34 WHIRLPOOL 680b10e761c2f67adfc6adae9ba57eee248b11d76de2f16173a45f4f6549e7fe0b003034e17a32abd941203cab29c4eab03412213478238a5466b8b187c0bd06
-EBUILD luadbi-0.5-r4.ebuild 1919 SHA256 9f7132d0c22736d9c1997d8a474e0edcab27e98c19ce61e3c4d8a0a230bdb988 SHA512 8122fff1e05c3b67f9577744e0409923a7bbf4354dd565d6c8eca7ab34dde11cefd4323f98b43147ce8756339b5499df874bc41ecebb12e71a8042b2e3d45f93 WHIRLPOOL df684e51b40403fda589564523b37152c1f48048f29c60893d0df173f5886e674394d0235d09693cf99c75d550dd772472693eee25bfde2a5499590c1235ec2e
-MISC ChangeLog 2840 SHA256 369f12933b3bf66b545d1e1255c0fc8da333fd8e5c0b87dd4ae77f77fa20f927 SHA512 44ba2f78653791446acade269d4dfb66b241821aa0a26d6d459acccae235ee22ef5625141b6c125e8ba183aa2af59a69ef4717efcae67eb4b7749f5875d59cd2 WHIRLPOOL 46983a00135eea546e4fbe47a2887b385a275cd1e2c0129a6f7d210bdabe5240074e7047f7fad8ccd697fb9e539c97d5f2ac34de87144b798c7dd4a75e5c0ae1
+EBUILD luadbi-0.5-r5.ebuild 1920 SHA256 429229b4c71c0f6d21363c22dc2018b2ecc359b043115e003dca6a6c429268cc SHA512 45e97bdb17998b55d64146bff6483266a34996de5ebc26f470b61735c3f3e6bbee849d376d2219aef9036715a838e640a39ff8939b09fcdf2fed364868160357 WHIRLPOOL 5f2c72dcbb62335a431a2162a08f57a84583e4ab23a4f6d77a1c16aa91034121481694789b65859209b5273f6c5dea6141c5f1f4975b027023c2ea6edf805770
+MISC ChangeLog 3051 SHA256 038b5668fa1d085b52942712166777ff090a248dbe8a9ac1ba30cd66645a9b0f SHA512 2f2bb2bf0a7b478f27ae820b512d088f1f445867e36b32dd06a4bd466abc86f1c5cc26037f80cf852950f2f68610b76b8ff7282ceb515c7adb7f32190153b930 WHIRLPOOL d1106df3fd3b73c82a1b577153d9cccd4ae6ddcef5db655dcacbffb0657dbfcb0a1812abab0580e42dd2f0d4565d2872dfc8414d7c5461788bd6c2c24599fce1
 MISC metadata.xml 307 SHA256 76edeecb335c2a89fc2a457c2dd71978f16f15e7c203fa3ae07fade5956d114b SHA512 da8073d11473a23fb0ac894ad2a195b8e3fd72a217b921a947489a51542e6e9f361cb4da15d9d8df91888d7ca2f97dc9618f2c5182262a0ca8d3d0ce2fc1e7c7 WHIRLPOOL acc78fe2c2e1109da77fa47de33d12878e88ebc3079b346ae2f30a71fc1c04f812867a4c8b8165c6143b37a2e0323b725d94bf6938927cfc20db5553494b75e6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iEYEAREIAAYFAlLayswACgkQCaWpQKGI+9QVOACfe69s5szvNl/zCDTRvL7kku0N
-NKkAnRfnNMIsg7SjU378HqmsVquR0GU3
-=Ms5y
------END PGP SIGNATURE-----
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