commit: 3de4f1ab68f29c0aba5e0b264efd89f5ea7a952b
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 20 17:23:32 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Feb 20 17:23:32 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de4f1ab
dev-db/sqlite: Drop masked for removal version (#249418)
Package-Manager: portage-2.2.27
dev-db/sqlite/Manifest | 1 -
.../files/sqlite-2.8.15-alignement-fix.patch | 12 --
dev-db/sqlite/files/sqlite-2.8.16-exit.patch | 12 --
dev-db/sqlite/files/sqlite-2.8.16-multilib.patch | 108 ------------------
dev-db/sqlite/sqlite-2.8.16-r5.ebuild | 127 ---------------------
5 files changed, 260 deletions(-)
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 8d3eb63..c1e7536 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,4 +1,3 @@
-DIST sqlite-2.8.16.tar.gz 981834 SHA256
d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512
262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a
WHIRLPOOL
78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff
DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256
5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512
8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30
WHIRLPOOL
83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5
DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256
8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512
afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65
WHIRLPOOL
f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8
DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256
fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512
b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6
WHIRLPOOL
2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b
diff --git a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
b/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
deleted file mode 100644
index 7081ffd..0000000
--- a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h
---- sqlite.orig/src/vdbeInt.h 2004-10-16 01:33:02.779442000 +0200
-+++ sqlite/src/vdbeInt.h 2004-10-16 01:35:01.139442000 +0200
-@@ -115,7 +115,7 @@
- int flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc.
*/
- double r; /* Real value */
- char *z; /* String value */
-- char zShort[NBFS]; /* Space for short strings */
-+ char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short
strings */
- };
- typedef struct Mem Mem;
-
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
b/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
deleted file mode 100644
index aaccb57..0000000
--- a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-temp.c:4:1: warning: incompatible implicit declaration of built-in function
‘exit’
-
---- Makefile.in
-+++ Makefile.in
-@@ -269,6 +269,7 @@
- #
- config.h:
- echo '#include <stdio.h>' >temp.c
-+ echo '#include <stdlib.h>' >>temp.c
- echo 'int main(){printf(' >>temp.c
- echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c
- echo 'exit(0);}' >>temp.c
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
b/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
deleted file mode 100644
index 3211187..0000000
--- a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -Naurp sqlite-2.8.16.orig/Makefile.in sqlite-2.8.16/Makefile.in
---- sqlite-2.8.16.orig/Makefile.in 2005-02-14 00:22:04.000000000 +0000
-+++ sqlite-2.8.16/Makefile.in 2005-02-17 18:22:50.174537727 +0000
-@@ -187,12 +187,12 @@ last_change: $(SRC)
- | awk '{print $$5,$$6}' >last_change
-
- libsqlite.la: $(LIBOBJ)
-- $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib
\
-+ $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @libdir@ \
- -version-info "8:6:8"
-
- libtclsqlite.la: tclsqlite.lo libsqlite.la
- $(LTLINK) -o libtclsqlite.la tclsqlite.lo \
-- libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
-+ libsqlite.la $(LIBTCL) -rpath @libdir@/sqlite \
- -version-info "8:6:8"
-
- sqlite@TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h
-@@ -465,14 +465,14 @@ doc: $(DOC)
- mv $(DOC) doc
-
- install: sqlite libsqlite.la sqlite.h
-- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
-- $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
-+ $(INSTALL) -d $(DESTDIR)@libdir@
-+ $(LTINSTALL) libsqlite.la $(DESTDIR)@libdir@
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
- $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
- $(INSTALL) -d $(DESTDIR)$(prefix)/include
- $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
-- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
-- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
-+ $(INSTALL) -d $(DESTDIR)@libdir@/pkgconfig;
-+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)@libdir@/pkgconfig;
-
- clean:
- rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h
opcodes.*
-diff -Naurp sqlite-2.8.16.orig/Makefile.linux-gcc
sqlite-2.8.16/Makefile.linux-gcc
---- sqlite-2.8.16.orig/Makefile.linux-gcc 2005-02-14 00:22:04.000000000
+0000
-+++ sqlite-2.8.16/Makefile.linux-gcc 2005-02-17 18:21:47.654969648 +0000
-@@ -14,7 +14,7 @@
- #### The toplevel directory of the source tree. This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = ../sqlite
-+TOP = @@S@@
-
- #### C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
- #### Specify any extra linker options needed to make the library
- # thread safe
- #
--#THREADLIB = -lpthread
--THREADLIB =
-+THREADLIB = -lpthread
-+#THREADLIB =
-
- #### Leave MEMORY_DEBUG undefined for maximum speed. Use MEMORY_DEBUG=1
- # to check for memory leaks. Use MEMORY_DEBUG=2 to print a log of all
-@@ -64,7 +64,7 @@ EXE =
- # will run on the target platform. This is usually the same
- # as BCC, unless you are cross-compiling.
- #
--TCC = gcc -O6
-+TCC = @@CC@@ @@CFLAGS@@
- #TCC = gcc -g -O0 -Wall
- #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
- #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
-@@ -72,23 +72,23 @@ TCC = gcc -O6
-
- #### Tools used to build a static library.
- #
--AR = ar cr
-+AR = @@AR@@ cr
- #AR = /opt/mingw/bin/i386-mingw32-ar cr
--RANLIB = ranlib
-+RANLIB = @@RANLIB@@
- #RANLIB = /opt/mingw/bin/i386-mingw32-ranlib
-
- #### Extra compiler options needed for programs that use the TCL library.
- #
--#TCL_FLAGS =
-+#TCL_FLAGS = @@TCL_FLAGS@@
- #TCL_FLAGS = -DSTATIC_BUILD=1
--TCL_FLAGS = -I/home/drh/tcltk/8.4linux
-+#TCL_FLAGS = -I/home/drh/tcltk/8.4linux
- #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1
- #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux
-
- #### Linker options needed to link against the TCL library.
- #
--#LIBTCL = -ltcl -lm -ldl
--LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
-+LIBTCL = -ltcl -lm -ldl
-+#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl
- #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt
- #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc
-
-@@ -100,7 +100,7 @@ READLINE_FLAGS = -DHAVE_READLINE=1 -I/us
- #### Linker options needed by programs using readline() must link against.
- #
- #LIBREADLINE =
--LIBREADLINE = -static -lreadline -ltermcap
-+LIBREADLINE = -static -lreadline -lncurses
-
- #### Should the database engine assume text is coded as UTF-8 or iso8859?
- #
diff --git a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
deleted file mode 100644
index 2cb8a32..0000000
--- a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils alternatives multilib toolchain-funcs
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-fbsd ~sparc-fbsd ~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="public-domain"
-SLOT="0"
-IUSE="doc nls tcl"
-
-DEPEND="doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-
-SOURCE="/usr/bin/lemon"
-ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
-
-RESTRICT="!tcl? ( test )"
-
-src_unpack() {
- # test
- if has test ${FEATURES}; then
- if ! has userpriv ${FEATURES}; then
- ewarn "The userpriv feature must be enabled to run
tests."
- eerror "Testsuite will not be run."
- fi
- if ! use tcl; then
- ewarn "You must enable the tcl use flag if you want to
run the test"
- ewarn "suite."
- eerror "Testsuite will not be run."
- fi
- fi
-
- unpack ${A}
- cd "${S}"
-
- use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch
-
- epatch \
- "${FILESDIR}"/${P}-multilib.patch \
- "${FILESDIR}"/${P}-exit.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
-
- sed -i \
- -e '/^LTLINK/s:$(TCC):& $(LDFLAGS):' \
- -e '/lemon/s:-o:$(LDFLAGS) &:' \
- "${S}"/{main.mk,Makefile.in}
-}
-
-src_compile() {
- local myconf="--enable-incore-db --enable-tempdb-in-ram"
-
- if ! use tcl ; then
- myconf="${myconf} --without-tcl"
- fi
-
- econf ${myconf} \
- --disable-static \
- $(use_enable nls utf8)
-
- emake all || die "emake all failed"
-
- if use doc ; then
- emake doc || die "emake doc failed"
- fi
-
- if use tcl ; then
- cp -P "${FILESDIR}"/maketcllib.sh "${S}"
- chmod +x ./maketcllib.sh
- ./maketcllib.sh
- fi
-}
-
-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!"
-
- cd "${S}"
- emake test || die "some test failed"
- fi
- fi
-}
-
-src_install () {
- dodir /usr/{bin,include,$(get_libdir)}
-
- make DESTDIR="${D}" install || die "make install failed"
-
- find "${D}" -name '*.la' -exec rm -f {} +
-
- newbin lemon lemon-${SLOT}
-
- dodoc README VERSION
- doman sqlite.1
-
- 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}/
- fi
-}
