[gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/

[Mike Gilbert]

commit:     ab6604a68ee222119673d5b02f1c4c5b85438667
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Oct 23 19:18:51 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 19:22:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6604a6

dev-db/sqlite: Fix building with USE="-tcl -test tools".

 dev-db/sqlite/sqlite-3.9.1.ebuild | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-db/sqlite/sqlite-3.9.1.ebuild 
b/dev-db/sqlite/sqlite-3.9.1.ebuild
index 90bf609..235974d 100644
--- a/dev-db/sqlite/sqlite-3.9.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.9.1.ebuild
@@ -162,13 +162,9 @@ multilib_src_configure() {
        # static-libs USE flag.
        options+=($(use_enable static-libs static))
 
-       # tcl, test USE flags.
+       # tcl, test, tools USE flags.
        if full_tarball; then
-               if use tcl || use test; then
-                       options+=(--enable-tcl)
-               else
-                       options+=(--disable-tcl)
-               fi
+               options+=(--enable-tcl)
        fi
 
        if [[ "${CHOST}" == *-mint* ]]; then
@@ -189,7 +185,7 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
-       emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+       emake HAVE_TCL="$(usex tcl 1 "")" 
TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
 
        if use tools && multilib_is_native_abi; then
                emake showdb showjournal showstat4 showwal sqldiff 
sqlite3_analyzer
@@ -202,7 +198,7 @@ multilib_src_test() {
                return
        fi
 
-       emake $(use debug && echo fulltest || echo test)
+       emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo 
test)
 }
 
 multilib_src_install() {