Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-db/sqlite
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/sqlite')
-rw-r--r--dev-db/sqlite/ChangeLog10
-rw-r--r--dev-db/sqlite/files/digest-sqlite-2.8.16-r13
-rw-r--r--dev-db/sqlite/files/digest-sqlite-3.2.1-r33
-rw-r--r--dev-db/sqlite/files/digest-sqlite-3.3.63
-rw-r--r--dev-db/sqlite/files/sqlite-3-test-fix.patch30
-rw-r--r--dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch415
-rw-r--r--dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch20
-rw-r--r--dev-db/sqlite/files/sqlite3-configure-debug.patch11
-rw-r--r--dev-db/sqlite/metadata.xml2
-rw-r--r--dev-db/sqlite/sqlite-2.8.16-r1.ebuild82
-rw-r--r--dev-db/sqlite/sqlite-2.8.16-r4.ebuild84
-rw-r--r--dev-db/sqlite/sqlite-3.2.1-r3.ebuild65
-rw-r--r--dev-db/sqlite/sqlite-3.3.12.ebuild74
-rw-r--r--dev-db/sqlite/sqlite-3.3.5-r1.ebuild89
-rw-r--r--dev-db/sqlite/sqlite-3.3.6.ebuild108
15 files changed, 132 insertions, 867 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index cd5c75ba439c..7039e7412641 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-db/sqlite
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.135 2007/02/02 18:23:20 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.136 2007/03/10 18:18:52 chtekk Exp $
+
+ 10 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+ -files/sqlite-3.2.1-data-corruption.patch,
+ -files/sqlite3-configure-debug.patch, -files/sqlite-3.2.1-tcl-fix.patch,
+ -files/sqlite-3-test-fix.patch, metadata.xml, -sqlite-2.8.16-r1.ebuild,
+ sqlite-2.8.16-r4.ebuild, -sqlite-3.2.1-r3.ebuild, sqlite-3.3.5-r1.ebuild,
+ -sqlite-3.3.6.ebuild, sqlite-3.3.12.ebuild:
+ Cleanup/fixup ebuilds, remove old ebuilds and patches, fix bug #156299.
02 Feb 2007; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.3.12.ebuild:
The optional tcl support in sqlite must be enabled in sqlite to run tests.
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r1 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
deleted file mode 100644
index c2747e58df9b..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz 981834
-RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 sqlite-2.8.16.tar.gz 981834
-SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e sqlite-2.8.16.tar.gz 981834
diff --git a/dev-db/sqlite/files/digest-sqlite-3.2.1-r3 b/dev-db/sqlite/files/digest-sqlite-3.2.1-r3
deleted file mode 100644
index 693a7560b0dc..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.2.1-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ccf3831c2f67452d444c5e5e2c7ca6f0 sqlite-3.2.1.tar.gz 1351842
-RMD160 3b4cfc1fca27d4df369220d15eb5e28777bd99da sqlite-3.2.1.tar.gz 1351842
-SHA256 daba70d5d7666ff8091a7a9322a1a2d88889043d50e136ed7d3e726d751001a7 sqlite-3.2.1.tar.gz 1351842
diff --git a/dev-db/sqlite/files/digest-sqlite-3.3.6 b/dev-db/sqlite/files/digest-sqlite-3.3.6
deleted file mode 100644
index 4e900e49e778..000000000000
--- a/dev-db/sqlite/files/digest-sqlite-3.3.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2cb1fafad5c2587e513dcbd18ace097 sqlite-3.3.6.tar.gz 1671437
-RMD160 37d140d5670b39a7da79f9f3d2ac31c521d90676 sqlite-3.3.6.tar.gz 1671437
-SHA256 32be612f762338fa61ec41a566ca56fb989416df99380acadbf37a5e16a05796 sqlite-3.3.6.tar.gz 1671437
diff --git a/dev-db/sqlite/files/sqlite-3-test-fix.patch b/dev-db/sqlite/files/sqlite-3-test-fix.patch
deleted file mode 100644
index 2f07b2ab8bb5..000000000000
--- a/dev-db/sqlite/files/sqlite-3-test-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-=== modified file 'Makefile.in'
---- Makefile.in
-+++ Makefile.in
-@@ -186,6 +186,7 @@
- $(TOP)/src/btree.c \
- $(TOP)/src/date.c \
- $(TOP)/src/func.c \
-+ $(TOP)/src/os.c \
- $(TOP)/src/os_unix.c \
- $(TOP)/src/os_win.c \
- $(TOP)/src/pager.c \
-@@ -237,7 +238,7 @@
- # of the most recently modified source code file
- #
- last_change: $(SRC)
-- cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
-+ cat $(SRC) | grep '$$Id: ' | sort -k 5 | tail -1 \
- | $(NAWK) '{print $$5,$$6}' >last_change
-
- libsqlite3.la: $(LIBOBJ)
-@@ -333,7 +334,7 @@
- $(LTCOMPILE) -c opcodes.c
-
- opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
-- sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
-+ sort -n -b -k 3 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
-
- opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
- cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
-
diff --git a/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch b/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
deleted file mode 100644
index 1bfd859c9421..000000000000
--- a/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-diff -uNr sqlite-3.2.1/src/vdbeaux.c sqlite-3.2.1-data-fix/src/vdbeaux.c
---- sqlite-3.2.1/src/vdbeaux.c 2005-03-29 15:14:03.000000000 +0200
-+++ sqlite-3.2.1-data-fix/src/vdbeaux.c 2005-04-24 12:13:52.000000000 +0200
-@@ -1604,7 +1604,7 @@
- }
- if( flags&MEM_Int ){
- /* Figure out whether to use 1, 2, 4, 6 or 8 bytes. */
--# define MAX_6BYTE ((((i64)0x00010000)<<32)-1)
-+# define MAX_6BYTE ((((i64)0x00001000)<<32)-1)
- i64 i = pMem->i;
- u64 u = i<0 ? -i : i;
- if( u<=127 ) return 1;
-diff -uNr sqlite-3.2.1/test/misc5.test sqlite-3.2.1-data-fix/test/misc5.test
---- sqlite-3.2.1/test/misc5.test 2005-03-17 04:15:40.000000000 +0100
-+++ sqlite-3.2.1-data-fix/test/misc5.test 2005-04-24 16:45:07.000000000 +0200
-@@ -41,4 +41,399 @@
- } {}
- }
-
-+# Make sure large integers are stored correctly.
-+#
-+do_test misc5-2.1 {
-+ execsql {
-+ create table t2(x unique);
-+ insert into t2 values(1);
-+ insert or ignore into t2 select x*2 from t2;
-+ insert or ignore into t2 select x*4 from t2;
-+ insert or ignore into t2 select x*16 from t2;
-+ insert or ignore into t2 select x*256 from t2;
-+ insert or ignore into t2 select x*65536 from t2;
-+ insert or ignore into t2 select x*2147483648 from t2;
-+ insert or ignore into t2 select x-1 from t2;
-+ insert or ignore into t2 select x+1 from t2;
-+ insert or ignore into t2 select -x from t2;
-+ select count(*) from t2;
-+ }
-+} 371
-+do_test misc5-2.2 {
-+ execsql {
-+ select x from t2 order by x;
-+ }
-+} \
-+"-4611686018427387905\
-+-4611686018427387904\
-+-4611686018427387903\
-+-2305843009213693953\
-+-2305843009213693952\
-+-2305843009213693951\
-+-1152921504606846977\
-+-1152921504606846976\
-+-1152921504606846975\
-+-576460752303423489\
-+-576460752303423488\
-+-576460752303423487\
-+-288230376151711745\
-+-288230376151711744\
-+-288230376151711743\
-+-144115188075855873\
-+-144115188075855872\
-+-144115188075855871\
-+-72057594037927937\
-+-72057594037927936\
-+-72057594037927935\
-+-36028797018963969\
-+-36028797018963968\
-+-36028797018963967\
-+-18014398509481985\
-+-18014398509481984\
-+-18014398509481983\
-+-9007199254740993\
-+-9007199254740992\
-+-9007199254740991\
-+-4503599627370497\
-+-4503599627370496\
-+-4503599627370495\
-+-2251799813685249\
-+-2251799813685248\
-+-2251799813685247\
-+-1125899906842625\
-+-1125899906842624\
-+-1125899906842623\
-+-562949953421313\
-+-562949953421312\
-+-562949953421311\
-+-281474976710657\
-+-281474976710656\
-+-281474976710655\
-+-140737488355329\
-+-140737488355328\
-+-140737488355327\
-+-70368744177665\
-+-70368744177664\
-+-70368744177663\
-+-35184372088833\
-+-35184372088832\
-+-35184372088831\
-+-17592186044417\
-+-17592186044416\
-+-17592186044415\
-+-8796093022209\
-+-8796093022208\
-+-8796093022207\
-+-4398046511105\
-+-4398046511104\
-+-4398046511103\
-+-2199023255553\
-+-2199023255552\
-+-2199023255551\
-+-1099511627777\
-+-1099511627776\
-+-1099511627775\
-+-549755813889\
-+-549755813888\
-+-549755813887\
-+-274877906945\
-+-274877906944\
-+-274877906943\
-+-137438953473\
-+-137438953472\
-+-137438953471\
-+-68719476737\
-+-68719476736\
-+-68719476735\
-+-34359738369\
-+-34359738368\
-+-34359738367\
-+-17179869185\
-+-17179869184\
-+-17179869183\
-+-8589934593\
-+-8589934592\
-+-8589934591\
-+-4294967297\
-+-4294967296\
-+-4294967295\
-+-2147483649\
-+-2147483648\
-+-2147483647\
-+-1073741825\
-+-1073741824\
-+-1073741823\
-+-536870913\
-+-536870912\
-+-536870911\
-+-268435457\
-+-268435456\
-+-268435455\
-+-134217729\
-+-134217728\
-+-134217727\
-+-67108865\
-+-67108864\
-+-67108863\
-+-33554433\
-+-33554432\
-+-33554431\
-+-16777217\
-+-16777216\
-+-16777215\
-+-8388609\
-+-8388608\
-+-8388607\
-+-4194305\
-+-4194304\
-+-4194303\
-+-2097153\
-+-2097152\
-+-2097151\
-+-1048577\
-+-1048576\
-+-1048575\
-+-524289\
-+-524288\
-+-524287\
-+-262145\
-+-262144\
-+-262143\
-+-131073\
-+-131072\
-+-131071\
-+-65537\
-+-65536\
-+-65535\
-+-32769\
-+-32768\
-+-32767\
-+-16385\
-+-16384\
-+-16383\
-+-8193\
-+-8192\
-+-8191\
-+-4097\
-+-4096\
-+-4095\
-+-2049\
-+-2048\
-+-2047\
-+-1025\
-+-1024\
-+-1023\
-+-513\
-+-512\
-+-511\
-+-257\
-+-256\
-+-255\
-+-129\
-+-128\
-+-127\
-+-65\
-+-64\
-+-63\
-+-33\
-+-32\
-+-31\
-+-17\
-+-16\
-+-15\
-+-9\
-+-8\
-+-7\
-+-5\
-+-4\
-+-3\
-+-2\
-+-1\
-+0\
-+1\
-+2\
-+3\
-+4\
-+5\
-+7\
-+8\
-+9\
-+15\
-+16\
-+17\
-+31\
-+32\
-+33\
-+63\
-+64\
-+65\
-+127\
-+128\
-+129\
-+255\
-+256\
-+257\
-+511\
-+512\
-+513\
-+1023\
-+1024\
-+1025\
-+2047\
-+2048\
-+2049\
-+4095\
-+4096\
-+4097\
-+8191\
-+8192\
-+8193\
-+16383\
-+16384\
-+16385\
-+32767\
-+32768\
-+32769\
-+65535\
-+65536\
-+65537\
-+131071\
-+131072\
-+131073\
-+262143\
-+262144\
-+262145\
-+524287\
-+524288\
-+524289\
-+1048575\
-+1048576\
-+1048577\
-+2097151\
-+2097152\
-+2097153\
-+4194303\
-+4194304\
-+4194305\
-+8388607\
-+8388608\
-+8388609\
-+16777215\
-+16777216\
-+16777217\
-+33554431\
-+33554432\
-+33554433\
-+67108863\
-+67108864\
-+67108865\
-+134217727\
-+134217728\
-+134217729\
-+268435455\
-+268435456\
-+268435457\
-+536870911\
-+536870912\
-+536870913\
-+1073741823\
-+1073741824\
-+1073741825\
-+2147483647\
-+2147483648\
-+2147483649\
-+4294967295\
-+4294967296\
-+4294967297\
-+8589934591\
-+8589934592\
-+8589934593\
-+17179869183\
-+17179869184\
-+17179869185\
-+34359738367\
-+34359738368\
-+34359738369\
-+68719476735\
-+68719476736\
-+68719476737\
-+137438953471\
-+137438953472\
-+137438953473\
-+274877906943\
-+274877906944\
-+274877906945\
-+549755813887\
-+549755813888\
-+549755813889\
-+1099511627775\
-+1099511627776\
-+1099511627777\
-+2199023255551\
-+2199023255552\
-+2199023255553\
-+4398046511103\
-+4398046511104\
-+4398046511105\
-+8796093022207\
-+8796093022208\
-+8796093022209\
-+17592186044415\
-+17592186044416\
-+17592186044417\
-+35184372088831\
-+35184372088832\
-+35184372088833\
-+70368744177663\
-+70368744177664\
-+70368744177665\
-+140737488355327\
-+140737488355328\
-+140737488355329\
-+281474976710655\
-+281474976710656\
-+281474976710657\
-+562949953421311\
-+562949953421312\
-+562949953421313\
-+1125899906842623\
-+1125899906842624\
-+1125899906842625\
-+2251799813685247\
-+2251799813685248\
-+2251799813685249\
-+4503599627370495\
-+4503599627370496\
-+4503599627370497\
-+9007199254740991\
-+9007199254740992\
-+9007199254740993\
-+18014398509481983\
-+18014398509481984\
-+18014398509481985\
-+36028797018963967\
-+36028797018963968\
-+36028797018963969\
-+72057594037927935\
-+72057594037927936\
-+72057594037927937\
-+144115188075855871\
-+144115188075855872\
-+144115188075855873\
-+288230376151711743\
-+288230376151711744\
-+288230376151711745\
-+576460752303423487\
-+576460752303423488\
-+576460752303423489\
-+1152921504606846975\
-+1152921504606846976\
-+1152921504606846977\
-+2305843009213693951\
-+2305843009213693952\
-+2305843009213693953\
-+4611686018427387903\
-+4611686018427387904\
-+4611686018427387905"
-+
- finish_test
diff --git a/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch b/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch
deleted file mode 100644
index 6b724fe0495f..000000000000
--- a/dev-db/sqlite/files/sqlite-3.2.1-tcl-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -uNr sqlite-3.2.1/tclinstaller.tcl sqlite-3.2.1-tcl-fix/tclinstaller.tcl
---- sqlite-3.2.1/tclinstaller.tcl 2005-03-23 17:08:39.000000000 +0100
-+++ sqlite-3.2.1-tcl-fix/tclinstaller.tcl 2005-04-24 22:48:12.000000000 +0200
-@@ -8,13 +8,15 @@
- set LIBFILE .libs/libtclsqlite3[info sharedlibextension]
- if { ![info exists env(DESTDIR)] } { set env(DESTDIR) "" }
- set LIBDIR $env(DESTDIR)[lindex $auto_path 0]
-+set LIBDIR_INSTALL [lindex $auto_path 0]
- set LIBNAME [file tail $LIBFILE]
- set LIB $LIBDIR/sqlite3/$LIBNAME
-+set LIB_INSTALL $LIBDIR_INSTALL/sqlite3/$LIBNAME
-
- file delete -force $LIBDIR/sqlite3
- file mkdir $LIBDIR/sqlite3
- set fd [open $LIBDIR/sqlite3/pkgIndex.tcl w]
--puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB sqlite3\]"
-+puts $fd "package ifneeded sqlite3 $VERSION \[list load $LIB_INSTALL sqlite3\]"
- close $fd
-
- # We cannot use [file copy] because that will just make a copy of
diff --git a/dev-db/sqlite/files/sqlite3-configure-debug.patch b/dev-db/sqlite/files/sqlite3-configure-debug.patch
deleted file mode 100644
index 3cbeca0691bb..000000000000
--- a/dev-db/sqlite/files/sqlite3-configure-debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure~ 2006-01-23 19:06:53.000000000 +0100
-+++ configure 2006-02-05 20:51:01.000000000 +0100
-@@ -20440,7 +20440,7 @@
- use_debug=no
- fi;
- if test "${use_debug}" = "yes" ; then
-- TARGET_DEBUG=""
-+ TARGET_DEBUG="-DSQLITE_DEBUG"
- else
- TARGET_DEBUG="-DNDEBUG"
- fi
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index 20ce219711a2..9fe616d38dec 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>no-herd</herd>
+ <herd>no-herd</herd>
</pkgmetadata>
diff --git a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
deleted file mode 100644
index a43af8d4ebb2..000000000000
--- a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.15 2007/02/28 22:03:11 genstef Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="nls doc tcl"
-
-DEPEND="doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
-
-src_unpack() {
- unpack ${A}
-
- cd ${S}
-
- use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
-
- epatch ${FILESDIR}/${P}-multilib.patch
-
- epunt_cxx
-
- if use nls; then
- ENCODING=${ENCODING-"UTF8"}
- else
- ENCODING="ISO8859"
- fi
-
- sed -i -e "s:@@S@@:${S}:g" \
- -e "s:@@CC@@:$(tc-getCC):g" \
- -e "s:@@CFLAGS@@:${CFLAGS}:g" \
- -e "s:@@AR@@:$(tc-getAR):g" \
- -e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
- -e "s:@@ENCODING@@:${ENCODING}:g" \
- ${S}/Makefile.linux-gcc
-}
-
-src_compile() {
- local myconf
- myconf="--enable-incore-db --enable-tempdb-in-ram"
- myconf="${myconf} `use_enable nls utf8`"
- econf ${myconf} || die
- emake all || die
-
- if use doc; then
- emake doc || die
- fi
-
- if use tcl; then
- cp -P ${FILESDIR}/maketcllib.sh ${S}
- chmod +x ./maketcllib.sh
- ./maketcllib.sh
- fi
-}
-
-src_install () {
- dodir /usr/{bin,include,$(get_libdir)}
-
- make DESTDIR="${D}" install || die
-
- dobin lemon
- dodoc README VERSION
- doman sqlite.1
-
- if use doc; then
- docinto html
- dohtml doc/*.html doc/*.txt doc/*.png
- fi
-
- if use tcl; then
- mkdir ${D}/usr/lib/tclsqlite${PV}
- cp ${S}/tclsqlite.so ${D}/usr/lib/tclsqlite${PV}/
- cp ${S}/pkgIndex.tcl ${D}/usr/lib/tclsqlite${PV}/
- fi
-}
diff --git a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild b/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
index 0df1b9af7f4d..eb13cebec680 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r4.ebuild
@@ -1,47 +1,51 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.15 2007/02/28 22:03:11 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r4.ebuild,v 1.16 2007/03/10 18:18:52 chtekk Exp $
-inherit eutils toolchain-funcs alternatives
+inherit eutils alternatives toolchain-funcs
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+DESCRIPTION="SQLite: an SQL Database Engine in a C Library."
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
LICENSE="as-is"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="nls doc tcl"
+IUSE="doc nls tcl"
DEPEND="doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
+ tcl? ( dev-lang/tcl )"
+
+RDEPEND="tcl? ( dev-lang/tcl )"
SOURCE="/usr/bin/lemon"
ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
src_unpack() {
# test
- if has test ${FEATURES}; then
- if ! has userpriv ${FEATURES}; then
+ if has test ${FEATURES} ; then
+ if ! has userpriv ${FEATURES} ; then
ewarn "The userpriv feature must be enabled to run tests."
- ewarn "The testsuite will be skipped."
- fi
- if ! use tcl; then
- ewarn "The tcl useflag must be enabled to run tests."
- ewarn "The testsuite will be skipped."
+ eerror "Testsuite will not be run."
+ fi
+ if ! use tcl ; then
+ eerror "The tcl USE flag must be enabled to run tests."
+ ewarn "Please note that turning on tcl installs runtime"
+ ewarn "support too."
+ eerror "Testsuite will not be run."
fi
fi
- unpack ${A} ; cd ${S}
+ unpack ${A}
+ cd "${S}"
- use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
+ use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch
- epatch ${FILESDIR}/${P}-multilib.patch
+ epatch "${FILESDIR}"/${P}-multilib.patch
epunt_cxx
- if use nls; then
+ if use nls ; then
ENCODING=${ENCODING-"UTF8"}
else
ENCODING="ISO8859"
@@ -53,27 +57,28 @@ src_unpack() {
-e "s:@@AR@@:$(tc-getAR):g" \
-e "s:@@RANLIB@@:$(tc-getRANLIB):g" \
-e "s:@@ENCODING@@:${ENCODING}:g" \
- ${S}/Makefile.linux-gcc
+ "${S}"/Makefile.linux-gcc
}
src_compile() {
- local myconf
- myconf="--enable-incore-db --enable-tempdb-in-ram"
- myconf="${myconf} `use_enable nls utf8`"
+ local myconf="--enable-incore-db --enable-tempdb-in-ram"
- if ! use tcl; then
+ if ! use tcl ; then
myconf="${myconf} --without-tcl"
fi
- econf ${myconf} || die
- emake all || die
+ econf ${myconf} \
+ $(use_enable nls utf8) \
+ || die "econf failed"
+
+ emake all || die "emake all failed"
- if use doc; then
- emake doc || die
+ if use doc ; then
+ emake doc || die "emake doc failed"
fi
- if use tcl; then
- cp -P ${FILESDIR}/maketcllib.sh ${S}
+ if use tcl ; then
+ cp -P "${FILESDIR}"/maketcllib.sh "${S}"
chmod +x ./maketcllib.sh
./maketcllib.sh
fi
@@ -82,10 +87,10 @@ src_compile() {
src_test() {
if use tcl ; then
if has userpriv ${FEATURES} ; then
- elog "sqlite 2.x is known to have problems on 64 bit architectures"
- elog "if you observe segmentation faults please use 3.x instead"
+ elog "SQLite 2.x is known to have problems on 64 bit architectures."
+ elog "If you observe segmentation faults please use 3.x instead!"
- cd ${S}
+ cd "${S}"
emake test || die "some test failed"
fi
fi
@@ -94,21 +99,18 @@ src_test() {
src_install () {
dodir /usr/{bin,include,$(get_libdir)}
- make DESTDIR="${D}" install || die
+ make DESTDIR="${D}" install || die "make install failed"
newbin lemon lemon-${SLOT}
dodoc README VERSION
doman sqlite.1
- if use doc; then
- docinto html
- dohtml doc/*.html doc/*.txt doc/*.png
- fi
+ use doc && dohtml doc/*.html doc/*.txt doc/*.png
- if use tcl; then
- mkdir ${D}/usr/$(get_libdir)/tclsqlite${PV}
- cp ${S}/tclsqlite.so ${D}/usr/$(get_libdir)/tclsqlite${PV}/
- cp ${S}/pkgIndex.tcl ${D}/usr/$(get_libdir)/tclsqlite${PV}/
+ if use tcl ; then
+ mkdir "${D}"/usr/$(get_libdir)/tclsqlite${PV}
+ cp "${S}"/tclsqlite.so "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
+ cp "${S}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/tclsqlite${PV}/
fi
}
diff --git a/dev-db/sqlite/sqlite-3.2.1-r3.ebuild b/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
deleted file mode 100644
index 538ddf14e0da..000000000000
--- a/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r3.ebuild,v 1.13 2007/02/28 22:03:11 genstef Exp $
-
-inherit eutils
-
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
-IUSE="nothreadsafe doc"
-
-DEPEND="
- doc? ( dev-lang/tcl )"
-
-src_unpack() {
- unpack ${A}
-
- epatch ${FILESDIR}/${P}-data-corruption.patch
- epatch ${FILESDIR}/${P}-tcl-fix.patch
- epunt_cxx
-}
-
-src_compile() {
- local myconf
- myconf="--enable-incore-db --enable-tempdb-in-ram"
- # Yes, this is ridiculous, but I'm not the maintainer for this ebuild,
- # and yet it's broken w/o thread support, so this has to do for now
- # - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
- if ! use nothreadsafe; then
- myconf="${myconf} --enable-threadsafe"
- else
- myconf="${myconf} --disable-threadsafe"
- fi
- econf ${myconf} || die
- emake all || die
-
- if use doc; then
- emake doc
- fi
-}
-
-# In case we ever want testing support; note: this needs more work, as
-# as it causes some sandbox issues.
-# - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
-#src_test() {
-# cd ${S}
-# emake fulltest || die "some test failed"
-#}
-
-src_install () {
- make DESTDIR="${D}" install || die
-
- dobin lemon
- dodoc README VERSION
- doman sqlite3.1
-
- if use doc; then
- docinto html
- dohtml doc/*.html doc/*.txt doc/*.png
- fi
-}
diff --git a/dev-db/sqlite/sqlite-3.3.12.ebuild b/dev-db/sqlite/sqlite-3.3.12.ebuild
index 4e4e73700598..2bf31c816443 100644
--- a/dev-db/sqlite/sqlite-3.3.12.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.12.ebuild
@@ -1,22 +1,20 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.12.ebuild,v 1.3 2007/02/28 22:03:11 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.12.ebuild,v 1.4 2007/03/10 18:18:52 chtekk Exp $
inherit eutils alternatives libtool
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+DESCRIPTION="SQLite: an SQL Database Engine in a C Library."
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
LICENSE="as-is"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nothreadsafe doc tcl test debug"
+IUSE="debug doc nothreadsafe tcl"
-DEPEND="
- doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )
- test? ( dev-lang/tcl )"
+DEPEND="doc? ( dev-lang/tcl )
+ tcl? ( dev-lang/tcl )"
RDEPEND="tcl? ( dev-lang/tcl )"
@@ -25,30 +23,34 @@ ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
src_unpack() {
# test
- if has test ${FEATURES}; then
- if ! has userpriv ${FEATURES}; then
+ if has test ${FEATURES} ; then
+ if ! has userpriv ${FEATURES} ; then
ewarn "The userpriv feature must be enabled to run tests."
- ewarn "Testsuite will not be run."
+ eerror "Testsuite will not be run."
fi
- if ! use test || ! use tcl; then
- eerror "The test and tcl useflags must be enabled to run tests."
- ewarn "Please note that turning on tcl installs runtime support"
- ewarn "too."
- die "test or tcl use flag disabled"
+ if ! use tcl ; then
+ eerror "The tcl USE flag must be enabled to run tests."
+ ewarn "Please note that turning on tcl installs runtime"
+ ewarn "support too."
+ eerror "Testsuite will not be run."
fi
fi
unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/sqlite-3.3.3-tcl-fix.patch
+ #epatch "${FILESDIR}"/sqlite-3-test-fix-3.3.4.patch
- cd ${P}
- epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch
- #epatch ${FILESDIR}/sqlite-3-test-fix-3.3.4.patch
+ #epatch "${FILESDIR}"/sandbox-fix1.patch
+ epatch "${FILESDIR}"/sandbox-fix2.patch
- epatch ${FILESDIR}/sandbox-fix2.patch
+ # Fix broken tests that are not portable to 64bit arches
+ epatch "${FILESDIR}"/sqlite-64bit-test-fix.patch
+ epatch "${FILESDIR}"/sqlite-64bit-test-fix2.patch
- # Fix broken tests that are not portable to 64 arches
- epatch ${FILESDIR}/sqlite-64bit-test-fix.patch
- epatch ${FILESDIR}/sqlite-64bit-test-fix2.patch
+ # Respect LDFLAGS wrt bug #156299
+ sed -i -e 's/^LTLINK = .*/& $(LDFLAGS)/' Makefile.in
elibtoolize
epunt_cxx
@@ -58,22 +60,23 @@ src_compile() {
local myconf="--enable-incore-db --enable-tempdb-in-ram --enable-cross-thread-connections"
econf ${myconf} \
+ $(use_enable debug) \
$(use_enable !nothreadsafe threadsafe) \
$(use_enable tcl) \
- $(use_enable debug) || die
+ || die "econf failed"
- emake all || die
+ emake all || die "emake all failed"
- if use doc; then
- emake doc || die
+ if use doc ; then
+ emake doc || die "emake doc failed"
fi
}
src_test() {
- if use test ; then
+ if use tcl ; then
if has userpriv ${FEATURES} ; then
- cd ${S}
- if use debug; then
+ cd "${S}"
+ if use debug ; then
emake fulltest || die "some test failed"
else
emake test || die "some test failed"
@@ -86,12 +89,13 @@ src_install () {
make \
DESTDIR="${D}" \
TCLLIBDIR="/usr/$(get_libdir)" \
- install || die
+ install \
+ || die "make install failed"
newbin lemon lemon-${SLOT}
- dodoc README VERSION || die
- doman sqlite3.1 || die
+ dodoc README VERSION
+ doman sqlite3.1
- use doc && dohtml doc/* art/*.gif
+ use doc && dohtml doc/* art/*.gif
}
diff --git a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
index 2704fe7cc395..ec10a4873843 100644
--- a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
@@ -1,85 +1,78 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5-r1.ebuild,v 1.16 2007/02/28 22:03:11 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5-r1.ebuild,v 1.17 2007/03/10 18:18:52 chtekk Exp $
inherit eutils alternatives
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
+
+DESCRIPTION="SQLite: an SQL Database Engine in a C Library."
HOMEPAGE="http://www.sqlite.org/"
SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
LICENSE="as-is"
SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="nothreadsafe doc tcl debug"
+IUSE="debug doc nothreadsafe tcl"
-DEPEND="
- doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
+DEPEND="doc? ( dev-lang/tcl )
+ tcl? ( dev-lang/tcl )"
+
+RDEPEND="tcl? ( dev-lang/tcl )"
SOURCE="/usr/bin/lemon"
ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
src_unpack() {
# test
- if has test ${FEATURES}; then
- if ! has userpriv ${FEATURES}; then
+ if has test ${FEATURES} ; then
+ if ! has userpriv ${FEATURES} ; then
ewarn "The userpriv feature must be enabled to run tests."
- ewarn "Testsuite will not be run."
+ eerror "Testsuite will not be run."
fi
- if ! use tcl; then
- ewarn "The tcl useflag must be enabled to run tests."
- ewarn "Testsuite will not be run."
+ if ! use tcl ; then
+ eerror "The tcl USE flag must be enabled to run tests."
+ ewarn "Please note that turning on tcl installs runtime"
+ ewarn "support too."
+ eerror "Testsuite will not be run."
fi
fi
unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/sqlite-3.3.3-tcl-fix.patch
+ epatch "${FILESDIR}"/sqlite-3-test-fix-3.3.4.patch
- cd ${P}
- epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch
- epatch ${FILESDIR}/sqlite-3-test-fix-3.3.4.patch
+ epatch "${FILESDIR}"/sandbox-fix1.patch
+ epatch "${FILESDIR}"/sandbox-fix2.patch
- epatch ${FILESDIR}/sandbox-fix1.patch
- epatch ${FILESDIR}/sandbox-fix2.patch
+ # Fix broken tests that are not portable to 64bit arches
+ epatch "${FILESDIR}"/sqlite-64bit-test-fix.patch
+ epatch "${FILESDIR}"/sqlite-64bit-test-fix2.patch
- # Fix broken tests that are not portable to 64 arches
- epatch ${FILESDIR}/sqlite-64bit-test-fix.patch
- epatch ${FILESDIR}/sqlite-64bit-test-fix2.patch
epunt_cxx
}
src_compile() {
- local myconf
+ local myconf="--enable-incore-db --enable-tempdb-in-ram --enable-cross-thread-connections"
- myconf="--enable-incore-db --enable-tempdb-in-ram --enable-cross-thread-connections"
+ econf ${myconf} \
+ $(use_enable debug) \
+ $(use_enable !nothreadsafe threadsafe) \
+ $(use_enable tcl) \
+ || die "econf failed"
- if ! use nothreadsafe; then
- myconf="${myconf} --enable-threadsafe"
- else
- myconf="${myconf} --disable-threadsafe"
- fi
+ emake all || die "emake all failed"
- if ! use tcl; then
- myconf="${myconf} --disable-tcl"
- fi
-
- if use debug; then
- myconf="${myconf} --enable-debug"
- fi
-
- econf ${myconf} || die
- emake all || die
-
- if use doc; then
- emake doc
+ if use doc ; then
+ emake doc || die "emake doc failed"
fi
}
src_test() {
if use tcl ; then
if has userpriv ${FEATURES} ; then
- cd ${S}
- if use debug; then
+ cd "${S}"
+ if use debug ; then
emake fulltest || die "some test failed"
else
emake test || die "some test failed"
@@ -92,15 +85,13 @@ src_install () {
make \
DESTDIR="${D}" \
TCLLIBDIR="/usr/$(get_libdir)" \
- install || die
+ install \
+ || die "make install failed"
newbin lemon lemon-${SLOT}
dodoc README VERSION
doman sqlite3.1
- if use doc; then
- docinto html
- dohtml doc/*.html doc/*.txt doc/*.png
- fi
+ use doc && dohtml doc/*.html doc/*.txt doc/*.png
}
diff --git a/dev-db/sqlite/sqlite-3.3.6.ebuild b/dev-db/sqlite/sqlite-3.3.6.ebuild
deleted file mode 100644
index a317281a6c43..000000000000
--- a/dev-db/sqlite/sqlite-3.3.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.6.ebuild,v 1.9 2007/02/28 22:03:11 genstef Exp $
-
-inherit eutils alternatives libtool
-
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
-HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nothreadsafe doc tcl debug"
-
-DEPEND="
- doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
-
-SOURCE="/usr/bin/lemon"
-ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
-
-src_unpack() {
- # test
- if has test ${FEATURES}; then
- if ! has userpriv ${FEATURES}; then
- ewarn "The userpriv feature must be enabled to run tests."
- ewarn "Testsuite will not be run."
- fi
- if ! use tcl; then
- ewarn "The tcl useflag must be enabled to run tests."
- ewarn "Testsuite will not be run."
- fi
- fi
-
- unpack ${A}
-
- cd ${P}
- epatch ${FILESDIR}/sqlite-3.3.3-tcl-fix.patch
- epatch ${FILESDIR}/sqlite-3-test-fix-3.3.4.patch
-
- epatch ${FILESDIR}/sandbox-fix1.patch
- epatch ${FILESDIR}/sandbox-fix2.patch
-
- # Fix broken tests that are not portable to 64 arches
- epatch ${FILESDIR}/sqlite-64bit-test-fix.patch
- epatch ${FILESDIR}/sqlite-64bit-test-fix2.patch
-
- elibtoolize
- epunt_cxx
-}
-
-src_compile() {
- local myconf
-
- myconf="--enable-incore-db --enable-tempdb-in-ram --enable-cross-thread-connections"
-
- if ! use nothreadsafe; then
- myconf="${myconf} --enable-threadsafe"
- else
- myconf="${myconf} --disable-threadsafe"
- fi
-
- if ! use tcl; then
- myconf="${myconf} --disable-tcl"
- fi
-
- if use debug; then
- myconf="${myconf} --enable-debug"
- fi
-
- econf ${myconf} || die
- emake all || die
-
- if use doc; then
- emake doc
- fi
-}
-
-src_test() {
- if use tcl ; then
- if has userpriv ${FEATURES} ; then
- cd ${S}
- if use debug; then
- emake fulltest || die "some test failed"
- else
- emake test || die "some test failed"
- fi
- fi
- fi
-}
-
-src_install () {
- make \
- DESTDIR="${D}" \
- TCLLIBDIR="/usr/$(get_libdir)" \
- install || die
-
- newbin lemon lemon-${SLOT}
-
- dodoc README VERSION
- doman sqlite3.1
-
- if use doc; then
- docinto html
- dohtml doc/*.html doc/*.txt doc/*.png
- fi
-}