| 1 |
commit: 3de4f1ab68f29c0aba5e0b264efd89f5ea7a952b |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 20 17:23:32 2016 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 20 17:23:32 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de4f1ab |
| 7 |
|
| 8 |
dev-db/sqlite: Drop masked for removal version (#249418) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
dev-db/sqlite/Manifest | 1 - |
| 13 |
.../files/sqlite-2.8.15-alignement-fix.patch | 12 -- |
| 14 |
dev-db/sqlite/files/sqlite-2.8.16-exit.patch | 12 -- |
| 15 |
dev-db/sqlite/files/sqlite-2.8.16-multilib.patch | 108 ------------------ |
| 16 |
dev-db/sqlite/sqlite-2.8.16-r5.ebuild | 127 --------------------- |
| 17 |
5 files changed, 260 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest |
| 20 |
index 8d3eb63..c1e7536 100644 |
| 21 |
--- a/dev-db/sqlite/Manifest |
| 22 |
+++ b/dev-db/sqlite/Manifest |
| 23 |
@@ -1,4 +1,3 @@ |
| 24 |
-DIST sqlite-2.8.16.tar.gz 981834 SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e SHA512 262cacbb9a6e615cd6ce7c2992c4dd5b0cd59de096daa74925e81baef4c0e4b3d9a7e4ebf8f4ba949afac4fe2fbf2c627ead29fa72ff38dffe6446ae46c40d4a WHIRLPOOL 78c4dc05f94d97483c03b1f1eee67f86fd5d9499e82b082ba3951878867d10d18ecbb5cac9086ce509c0cb1cb47b57661709a28d2ee7e61038512d1c11c77bff |
| 25 |
DIST sqlite-autoconf-3081001.tar.gz 2049377 SHA256 5f8f2ae6461e637ff63e50fef10b6962764dfc3b81a8c0f80a19794b9d59f7ca SHA512 8e206952b351ef8a9cf523558574cba9630c8c07ef7ae90fb0712d2b99fea91742a26d0af1b01816593ea769fad343101fdbbab9c1626a4d712bb1a18b2b6b30 WHIRLPOOL 83fd822bd9eb6fedea29d968381726be24153375c06ad8c39d4ef34fd3d2e1001c8d5440880d6a880ba24242cd87782afa445ce145cdf7e75843419275136da5 |
| 26 |
DIST sqlite-autoconf-3081002.tar.gz 2049387 SHA256 8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626 SHA512 afdf11d5482a645c37cc0c4c5c2b3f8c56f26c95ee94658c92bfa0ffeb68981f67834215a45a658f733333c68f28231448e87995f9614a56f9f1672cedd13a65 WHIRLPOOL f3c7b1a11d63213a29f9dc6c04c02db9900b25dd0a8c0551bbf6d220493e7cc420d5775d99147d92c781b7f0068889e6dbeb32a10f447009341827908eee4ad8 |
| 27 |
DIST sqlite-autoconf-3081101.tar.gz 2101885 SHA256 fb99b0ac038c4a7e48b44b61836cb41d4eeba36b4d0ee757beeab59031a1d3b6 SHA512 b87e3a94462c26e875833c7f83dcc453146377a403d173169e2db7198bede2467f8c480645141da678e0fd3071764558f2dd2630086964431ead25ac43212ee6 WHIRLPOOL 2045496055b02151211080110dc8fc2c474337788704a0e4db8841a1928b82d6490afa682c8d8b1bb6b9e98808d7eabf0f763a41e4768b1c21629107895bb66b |
| 28 |
|
| 29 |
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 |
| 30 |
deleted file mode 100644 |
| 31 |
index 7081ffd..0000000 |
| 32 |
--- a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch |
| 33 |
+++ /dev/null |
| 34 |
@@ -1,12 +0,0 @@ |
| 35 |
-diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h |
| 36 |
---- sqlite.orig/src/vdbeInt.h 2004-10-16 01:33:02.779442000 +0200 |
| 37 |
-+++ sqlite/src/vdbeInt.h 2004-10-16 01:35:01.139442000 +0200 |
| 38 |
-@@ -115,7 +115,7 @@ |
| 39 |
- int flags; /* Some combination of MEM_Null, MEM_Str, MEM_Dyn, etc. */ |
| 40 |
- double r; /* Real value */ |
| 41 |
- char *z; /* String value */ |
| 42 |
-- char zShort[NBFS]; /* Space for short strings */ |
| 43 |
-+ char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short strings */ |
| 44 |
- }; |
| 45 |
- typedef struct Mem Mem; |
| 46 |
- |
| 47 |
|
| 48 |
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch b/dev-db/sqlite/files/sqlite-2.8.16-exit.patch |
| 49 |
deleted file mode 100644 |
| 50 |
index aaccb57..0000000 |
| 51 |
--- a/dev-db/sqlite/files/sqlite-2.8.16-exit.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,12 +0,0 @@ |
| 54 |
-temp.c:4:1: warning: incompatible implicit declaration of built-in function ‘exit’ |
| 55 |
- |
| 56 |
---- Makefile.in |
| 57 |
-+++ Makefile.in |
| 58 |
-@@ -269,6 +269,7 @@ |
| 59 |
- # |
| 60 |
- config.h: |
| 61 |
- echo '#include <stdio.h>' >temp.c |
| 62 |
-+ echo '#include <stdlib.h>' >>temp.c |
| 63 |
- echo 'int main(){printf(' >>temp.c |
| 64 |
- echo '"#define SQLITE_PTR_SZ %d",sizeof(char*));' >>temp.c |
| 65 |
- echo 'exit(0);}' >>temp.c |
| 66 |
|
| 67 |
diff --git a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch b/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch |
| 68 |
deleted file mode 100644 |
| 69 |
index 3211187..0000000 |
| 70 |
--- a/dev-db/sqlite/files/sqlite-2.8.16-multilib.patch |
| 71 |
+++ /dev/null |
| 72 |
@@ -1,108 +0,0 @@ |
| 73 |
-diff -Naurp sqlite-2.8.16.orig/Makefile.in sqlite-2.8.16/Makefile.in |
| 74 |
---- sqlite-2.8.16.orig/Makefile.in 2005-02-14 00:22:04.000000000 +0000 |
| 75 |
-+++ sqlite-2.8.16/Makefile.in 2005-02-17 18:22:50.174537727 +0000 |
| 76 |
-@@ -187,12 +187,12 @@ last_change: $(SRC) |
| 77 |
- | awk '{print $$5,$$6}' >last_change |
| 78 |
- |
| 79 |
- libsqlite.la: $(LIBOBJ) |
| 80 |
-- $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \ |
| 81 |
-+ $(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @libdir@ \ |
| 82 |
- -version-info "8:6:8" |
| 83 |
- |
| 84 |
- libtclsqlite.la: tclsqlite.lo libsqlite.la |
| 85 |
- $(LTLINK) -o libtclsqlite.la tclsqlite.lo \ |
| 86 |
-- libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \ |
| 87 |
-+ libsqlite.la $(LIBTCL) -rpath @libdir@/sqlite \ |
| 88 |
- -version-info "8:6:8" |
| 89 |
- |
| 90 |
- sqlite@TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h |
| 91 |
-@@ -465,14 +465,14 @@ doc: $(DOC) |
| 92 |
- mv $(DOC) doc |
| 93 |
- |
| 94 |
- install: sqlite libsqlite.la sqlite.h |
| 95 |
-- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib |
| 96 |
-- $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib |
| 97 |
-+ $(INSTALL) -d $(DESTDIR)@libdir@ |
| 98 |
-+ $(LTINSTALL) libsqlite.la $(DESTDIR)@libdir@ |
| 99 |
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin |
| 100 |
- $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin |
| 101 |
- $(INSTALL) -d $(DESTDIR)$(prefix)/include |
| 102 |
- $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include |
| 103 |
-- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; |
| 104 |
-- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; |
| 105 |
-+ $(INSTALL) -d $(DESTDIR)@libdir@/pkgconfig; |
| 106 |
-+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)@libdir@/pkgconfig; |
| 107 |
- |
| 108 |
- clean: |
| 109 |
- rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* |
| 110 |
-diff -Naurp sqlite-2.8.16.orig/Makefile.linux-gcc sqlite-2.8.16/Makefile.linux-gcc |
| 111 |
---- sqlite-2.8.16.orig/Makefile.linux-gcc 2005-02-14 00:22:04.000000000 +0000 |
| 112 |
-+++ sqlite-2.8.16/Makefile.linux-gcc 2005-02-17 18:21:47.654969648 +0000 |
| 113 |
-@@ -14,7 +14,7 @@ |
| 114 |
- #### The toplevel directory of the source tree. This is the directory |
| 115 |
- # that contains this "Makefile.in" and the "configure.in" script. |
| 116 |
- # |
| 117 |
--TOP = ../sqlite |
| 118 |
-+TOP = @@S@@ |
| 119 |
- |
| 120 |
- #### C Compiler and options for use in building executables that |
| 121 |
- # will run on the platform that is doing the build. |
| 122 |
-@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0 |
| 123 |
- #### Specify any extra linker options needed to make the library |
| 124 |
- # thread safe |
| 125 |
- # |
| 126 |
--#THREADLIB = -lpthread |
| 127 |
--THREADLIB = |
| 128 |
-+THREADLIB = -lpthread |
| 129 |
-+#THREADLIB = |
| 130 |
- |
| 131 |
- #### Leave MEMORY_DEBUG undefined for maximum speed. Use MEMORY_DEBUG=1 |
| 132 |
- # to check for memory leaks. Use MEMORY_DEBUG=2 to print a log of all |
| 133 |
-@@ -64,7 +64,7 @@ EXE = |
| 134 |
- # will run on the target platform. This is usually the same |
| 135 |
- # as BCC, unless you are cross-compiling. |
| 136 |
- # |
| 137 |
--TCC = gcc -O6 |
| 138 |
-+TCC = @@CC@@ @@CFLAGS@@ |
| 139 |
- #TCC = gcc -g -O0 -Wall |
| 140 |
- #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 141 |
- #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6 |
| 142 |
-@@ -72,23 +72,23 @@ TCC = gcc -O6 |
| 143 |
- |
| 144 |
- #### Tools used to build a static library. |
| 145 |
- # |
| 146 |
--AR = ar cr |
| 147 |
-+AR = @@AR@@ cr |
| 148 |
- #AR = /opt/mingw/bin/i386-mingw32-ar cr |
| 149 |
--RANLIB = ranlib |
| 150 |
-+RANLIB = @@RANLIB@@ |
| 151 |
- #RANLIB = /opt/mingw/bin/i386-mingw32-ranlib |
| 152 |
- |
| 153 |
- #### Extra compiler options needed for programs that use the TCL library. |
| 154 |
- # |
| 155 |
--#TCL_FLAGS = |
| 156 |
-+#TCL_FLAGS = @@TCL_FLAGS@@ |
| 157 |
- #TCL_FLAGS = -DSTATIC_BUILD=1 |
| 158 |
--TCL_FLAGS = -I/home/drh/tcltk/8.4linux |
| 159 |
-+#TCL_FLAGS = -I/home/drh/tcltk/8.4linux |
| 160 |
- #TCL_FLAGS = -I/home/drh/tcltk/8.4win -DSTATIC_BUILD=1 |
| 161 |
- #TCL_FLAGS = -I/home/drh/tcltk/8.3hpux |
| 162 |
- |
| 163 |
- #### Linker options needed to link against the TCL library. |
| 164 |
- # |
| 165 |
--#LIBTCL = -ltcl -lm -ldl |
| 166 |
--LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl |
| 167 |
-+LIBTCL = -ltcl -lm -ldl |
| 168 |
-+#LIBTCL = /home/drh/tcltk/8.4linux/libtcl8.4g.a -lm -ldl |
| 169 |
- #LIBTCL = /home/drh/tcltk/8.4win/libtcl84s.a -lmsvcrt |
| 170 |
- #LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc |
| 171 |
- |
| 172 |
-@@ -100,7 +100,7 @@ READLINE_FLAGS = -DHAVE_READLINE=1 -I/us |
| 173 |
- #### Linker options needed by programs using readline() must link against. |
| 174 |
- # |
| 175 |
- #LIBREADLINE = |
| 176 |
--LIBREADLINE = -static -lreadline -ltermcap |
| 177 |
-+LIBREADLINE = -static -lreadline -lncurses |
| 178 |
- |
| 179 |
- #### Should the database engine assume text is coded as UTF-8 or iso8859? |
| 180 |
- # |
| 181 |
|
| 182 |
diff --git a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild b/dev-db/sqlite/sqlite-2.8.16-r5.ebuild |
| 183 |
deleted file mode 100644 |
| 184 |
index 2cb8a32..0000000 |
| 185 |
--- a/dev-db/sqlite/sqlite-2.8.16-r5.ebuild |
| 186 |
+++ /dev/null |
| 187 |
@@ -1,127 +0,0 @@ |
| 188 |
-# Copyright 1999-2014 Gentoo Foundation |
| 189 |
-# Distributed under the terms of the GNU General Public License v2 |
| 190 |
-# $Id$ |
| 191 |
- |
| 192 |
-inherit eutils alternatives multilib toolchain-funcs |
| 193 |
- |
| 194 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" |
| 195 |
- |
| 196 |
-DESCRIPTION="SQLite: an SQL Database Engine in a C Library" |
| 197 |
-HOMEPAGE="http://www.sqlite.org/" |
| 198 |
-SRC_URI="http://www.sqlite.org/${P}.tar.gz" |
| 199 |
- |
| 200 |
-LICENSE="public-domain" |
| 201 |
-SLOT="0" |
| 202 |
-IUSE="doc nls tcl" |
| 203 |
- |
| 204 |
-DEPEND="doc? ( dev-lang/tcl ) |
| 205 |
- tcl? ( dev-lang/tcl )" |
| 206 |
- |
| 207 |
-RDEPEND="tcl? ( dev-lang/tcl )" |
| 208 |
- |
| 209 |
-SOURCE="/usr/bin/lemon" |
| 210 |
-ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0" |
| 211 |
- |
| 212 |
-RESTRICT="!tcl? ( test )" |
| 213 |
- |
| 214 |
-src_unpack() { |
| 215 |
- # test |
| 216 |
- if has test ${FEATURES}; then |
| 217 |
- if ! has userpriv ${FEATURES}; then |
| 218 |
- ewarn "The userpriv feature must be enabled to run tests." |
| 219 |
- eerror "Testsuite will not be run." |
| 220 |
- fi |
| 221 |
- if ! use tcl; then |
| 222 |
- ewarn "You must enable the tcl use flag if you want to run the test" |
| 223 |
- ewarn "suite." |
| 224 |
- eerror "Testsuite will not be run." |
| 225 |
- fi |
| 226 |
- fi |
| 227 |
- |
| 228 |
- unpack ${A} |
| 229 |
- cd "${S}" |
| 230 |
- |
| 231 |
- use hppa && epatch "${FILESDIR}"/${PN}-2.8.15-alignement-fix.patch |
| 232 |
- |
| 233 |
- epatch \ |
| 234 |
- "${FILESDIR}"/${P}-multilib.patch \ |
| 235 |
- "${FILESDIR}"/${P}-exit.patch |
| 236 |
- |
| 237 |
- epunt_cxx |
| 238 |
- |
| 239 |
- if use nls ; then |
| 240 |
- ENCODING=${ENCODING-"UTF8"} |
| 241 |
- else |
| 242 |
- ENCODING="ISO8859" |
| 243 |
- fi |
| 244 |
- |
| 245 |
- sed -i -e "s:@@S@@:${S}:g" \ |
| 246 |
- -e "s:@@CC@@:$(tc-getCC):g" \ |
| 247 |
- -e "s:@@CFLAGS@@:${CFLAGS}:g" \ |
| 248 |
- -e "s:@@AR@@:$(tc-getAR):g" \ |
| 249 |
- -e "s:@@RANLIB@@:$(tc-getRANLIB):g" \ |
| 250 |
- -e "s:@@ENCODING@@:${ENCODING}:g" \ |
| 251 |
- "${S}"/Makefile.linux-gcc |
| 252 |
- |
| 253 |
- sed -i \ |
| 254 |
- -e '/^LTLINK/s:$(TCC):& $(LDFLAGS):' \ |
| 255 |
- -e '/lemon/s:-o:$(LDFLAGS) &:' \ |
| 256 |
- "${S}"/{main.mk,Makefile.in} |
| 257 |
-} |
| 258 |
- |
| 259 |
-src_compile() { |
| 260 |
- local myconf="--enable-incore-db --enable-tempdb-in-ram" |
| 261 |
- |
| 262 |
- if ! use tcl ; then |
| 263 |
- myconf="${myconf} --without-tcl" |
| 264 |
- fi |
| 265 |
- |
| 266 |
- econf ${myconf} \ |
| 267 |
- --disable-static \ |
| 268 |
- $(use_enable nls utf8) |
| 269 |
- |
| 270 |
- emake all || die "emake all failed" |
| 271 |
- |
| 272 |
- if use doc ; then |
| 273 |
- emake doc || die "emake doc failed" |
| 274 |
- fi |
| 275 |
- |
| 276 |
- if use tcl ; then |
| 277 |
- cp -P "${FILESDIR}"/maketcllib.sh "${S}" |
| 278 |
- chmod +x ./maketcllib.sh |
| 279 |
- ./maketcllib.sh |
| 280 |
- fi |
| 281 |
-} |
| 282 |
- |
| 283 |
-src_test() { |
| 284 |
- if use tcl ; then |
| 285 |
- if has userpriv ${FEATURES} ; then |
| 286 |
- elog "SQLite 2.x is known to have problems on 64 bit architectures." |
| 287 |
- elog "If you observe segmentation faults please use 3.x instead!" |
| 288 |
- |
| 289 |
- cd "${S}" |
| 290 |
- emake test || die "some test failed" |
| 291 |
- fi |
| 292 |
- fi |
| 293 |
-} |
| 294 |
- |
| 295 |
-src_install () { |
| 296 |
- dodir /usr/{bin,include,$(get_libdir)} |
| 297 |
- |
| 298 |
- make DESTDIR="${D}" install || die "make install failed" |
| 299 |
- |
| 300 |
- find "${D}" -name '*.la' -exec rm -f {} + |
| 301 |
- |
| 302 |
- newbin lemon lemon-${SLOT} |
| 303 |
- |
| 304 |
- dodoc README VERSION |
| 305 |
- doman sqlite.1 |
| 306 |
- |
| 307 |
- use doc && dohtml doc/*.html doc/*.txt doc/*.png |
| 308 |
- |
| 309 |
- if use tcl ; then |
| 310 |
- mkdir "${D}"/usr/$(get_libdir)/tclsqlite${PV} |
| 311 |
- cp "${S}"/tclsqlite.so "${D}"/usr/$(get_libdir)/tclsqlite${PV}/ |
| 312 |
- cp "${S}"/pkgIndex.tcl "${D}"/usr/$(get_libdir)/tclsqlite${PV}/ |
| 313 |
- fi |
| 314 |
-} |
Archives