From: Luca Longinotti Date: Sat, 10 Mar 2007 18:18:53 +0000 (+0000) Subject: Cleanup/fixup ebuilds, remove old ebuilds and patches, fix bug #156299. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=87011dc2964740e617da7298a435a8fb7678df13;p=gentoo.git Cleanup/fixup ebuilds, remove old ebuilds and patches, fix bug #156299. Package-Manager: portage-2.1.2.2 --- 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 + -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 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/Manifest b/dev-db/sqlite/Manifest index 56c58d88ac29..230eb8bd3e15 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -22,18 +22,6 @@ AUX sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa23 MD5 47dbf777bcdf0cc3e5e97a60814b8469 files/sqlite-3-test-fix-3.3.4.patch 761 RMD160 5c1dc771d1dbe5dc0138145ddc169a8aa2305c3b files/sqlite-3-test-fix-3.3.4.patch 761 SHA256 f26cc9b97c6240f5e3f595b6be57309044be44e9f865f7596b4e85d77eef82d4 files/sqlite-3-test-fix-3.3.4.patch 761 -AUX sqlite-3-test-fix.patch 906 RMD160 f4d50412fd216de4c0395d79c754a98fe68da81b SHA1 42722b210ea5b22dee48103569c87d7f3a45f8f8 SHA256 0179442b96df50712ae51cac941050387f677dadf7284311a5aa95c9f4a75d09 -MD5 715d143591b5938b4bc0c3cb8cfe1ce1 files/sqlite-3-test-fix.patch 906 -RMD160 f4d50412fd216de4c0395d79c754a98fe68da81b files/sqlite-3-test-fix.patch 906 -SHA256 0179442b96df50712ae51cac941050387f677dadf7284311a5aa95c9f4a75d09 files/sqlite-3-test-fix.patch 906 -AUX sqlite-3.2.1-data-corruption.patch 6529 RMD160 06f79a07f5dfb12967ebc233544b0807ac8114af SHA1 73203e5145119b9ad070596271793ea36e0bd651 SHA256 7b42e48387045ab466a0d7f936099de0d1597b0cf593fb28705a46c1b6e76b81 -MD5 46cefa8dc3aa8a97c973f54cd08f0ace files/sqlite-3.2.1-data-corruption.patch 6529 -RMD160 06f79a07f5dfb12967ebc233544b0807ac8114af files/sqlite-3.2.1-data-corruption.patch 6529 -SHA256 7b42e48387045ab466a0d7f936099de0d1597b0cf593fb28705a46c1b6e76b81 files/sqlite-3.2.1-data-corruption.patch 6529 -AUX sqlite-3.2.1-tcl-fix.patch 915 RMD160 b83aa10e2b42ae92f5c1c41c36f872266fdd3a52 SHA1 7da1897426e8686d2f9d2ad929994149fba4d33b SHA256 5d7040c9c8532fddfef3a2e345124077bfb933f2b9d554f224690e3e54b35b8e -MD5 0473fa5a1fcc0a84af76122d016070e7 files/sqlite-3.2.1-tcl-fix.patch 915 -RMD160 b83aa10e2b42ae92f5c1c41c36f872266fdd3a52 files/sqlite-3.2.1-tcl-fix.patch 915 -SHA256 5d7040c9c8532fddfef3a2e345124077bfb933f2b9d554f224690e3e54b35b8e files/sqlite-3.2.1-tcl-fix.patch 915 AUX sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 SHA1 c15e2a86f476dcab72b8a38ff89d6535ec0bbfd0 SHA256 b36bbb78a7c35a0c457e4cbdbc1b925fc4ffa07e0c60eb2230f1aff874a45403 MD5 798bdd07506f713c72a1578b14bbd36d files/sqlite-3.3.3-tcl-fix.patch 955 RMD160 74965942daef0fe667bd866c9ebf5b2ff999c1d9 files/sqlite-3.3.3-tcl-fix.patch 955 @@ -46,62 +34,35 @@ AUX sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8 MD5 619a169ced11eef8b06756518cfc8a4f files/sqlite-64bit-test-fix2.patch 438 RMD160 83904019c277fdf24c8299b0e6aba7184cd8b56f files/sqlite-64bit-test-fix2.patch 438 SHA256 87c47559f891736006050f0a3a4e4393084cf314a7bc44cc0e09f57efc0de23b files/sqlite-64bit-test-fix2.patch 438 -AUX sqlite3-configure-debug.patch 274 RMD160 07c86b67c0da26868b9fd058f10a94c3f83afe82 SHA1 f075c25ef5e0ae100a637f3886fd583cf2346af8 SHA256 5006350e728787794ec4fe89b5772bbc068efb98f176abe93d83a9e9c5e5b5be -MD5 af95b217c2b3c2364e666a772a29be8a files/sqlite3-configure-debug.patch 274 -RMD160 07c86b67c0da26868b9fd058f10a94c3f83afe82 files/sqlite3-configure-debug.patch 274 -SHA256 5006350e728787794ec4fe89b5772bbc068efb98f176abe93d83a9e9c5e5b5be files/sqlite3-configure-debug.patch 274 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e -DIST sqlite-3.2.1.tar.gz 1351842 RMD160 3b4cfc1fca27d4df369220d15eb5e28777bd99da SHA1 df9b8a28bb64a29df8b2411b6b8b746b04d742eb SHA256 daba70d5d7666ff8091a7a9322a1a2d88889043d50e136ed7d3e726d751001a7 DIST sqlite-3.3.12.tar.gz 2021696 RMD160 98154b3e8663b6c7ec11a7094a51781ee8384317 SHA1 4c6e3cd29e4e1c49857033918b0e227926edd4bb SHA256 e005781cb0356f65200c05979c04fea533b9a7d873e0060672a4d384468b7186 DIST sqlite-3.3.5.tar.gz 1651536 RMD160 7dd7c1d2a2f10132a4ef0f6972ddca4d5767b9d6 SHA1 015fe7b3992c9db97bb40cfd9958b31d457f7c33 SHA256 e81d1176960a14459f9ff492b2c4fb1e2b55d0b2c82fd225dbc37afd02334256 -DIST sqlite-3.3.6.tar.gz 1671437 RMD160 37d140d5670b39a7da79f9f3d2ac31c521d90676 SHA1 0db38ab2df86946a5059f09b6a8758026d9eab59 SHA256 32be612f762338fa61ec41a566ca56fb989416df99380acadbf37a5e16a05796 -EBUILD sqlite-2.8.16-r1.ebuild 1776 RMD160 09a0533d0e5d865a873adad947839d49476af229 SHA1 0d9a92109e48608e63f88b6d71b17a40ef98d3e3 SHA256 67fa4d6f1c4f4752244783a3ae90229fb2d1d4101b93821169b663fe096945bb -MD5 0f63f5d250e353ff150be8dc455d8ce8 sqlite-2.8.16-r1.ebuild 1776 -RMD160 09a0533d0e5d865a873adad947839d49476af229 sqlite-2.8.16-r1.ebuild 1776 -SHA256 67fa4d6f1c4f4752244783a3ae90229fb2d1d4101b93821169b663fe096945bb sqlite-2.8.16-r1.ebuild 1776 -EBUILD sqlite-2.8.16-r4.ebuild 2526 RMD160 e229aadbac39d916ddcb17158fde46e57cd3b1f0 SHA1 c8556e3cf3d81559c5d710c1f32c08e5e736642c SHA256 fb7da63adad680c42876f310eb4592cc1cfbe183ae3644278d988ae51a20e535 -MD5 6d2aa27bc1d3e811f49c4e52254c4058 sqlite-2.8.16-r4.ebuild 2526 -RMD160 e229aadbac39d916ddcb17158fde46e57cd3b1f0 sqlite-2.8.16-r4.ebuild 2526 -SHA256 fb7da63adad680c42876f310eb4592cc1cfbe183ae3644278d988ae51a20e535 sqlite-2.8.16-r4.ebuild 2526 -EBUILD sqlite-3.2.1-r3.ebuild 1554 RMD160 179daee08029e06f8ce1681109d4e115ab3323ab SHA1 34bf697e7da76986b5cbf7aeef3c2fa8ce3ca7e0 SHA256 3571056e8a9047c8ee432eda0cbda261313f353560f698fad6b7dcebfcb4f31b -MD5 f25d52cc2a845572de68a97480bd6483 sqlite-3.2.1-r3.ebuild 1554 -RMD160 179daee08029e06f8ce1681109d4e115ab3323ab sqlite-3.2.1-r3.ebuild 1554 -SHA256 3571056e8a9047c8ee432eda0cbda261313f353560f698fad6b7dcebfcb4f31b sqlite-3.2.1-r3.ebuild 1554 -EBUILD sqlite-3.3.12.ebuild 2235 RMD160 848355ef68f52cb779c4d25aca9653eadef048f1 SHA1 bf5dc52eae289888a7969f35e85cfcaf336ba239 SHA256 8338508d693749010a3a1c7db32cde11a06750013c14950a5b90264a7f6e03da -MD5 6acc343dc51b0e199eacd28ffe8a6248 sqlite-3.3.12.ebuild 2235 -RMD160 848355ef68f52cb779c4d25aca9653eadef048f1 sqlite-3.3.12.ebuild 2235 -SHA256 8338508d693749010a3a1c7db32cde11a06750013c14950a5b90264a7f6e03da sqlite-3.3.12.ebuild 2235 -EBUILD sqlite-3.3.5-r1.ebuild 2230 RMD160 e82447eb13ea5286d6d6133f1677995cd8c13e19 SHA1 358de02471b3b26cbae7037cf26dc503b200e8f3 SHA256 ad15636d8810036e6d607451577f2e5600edc820106de7b18ae320132a1767f6 -MD5 94741e9d04e154694dc16ccabd9eafd9 sqlite-3.3.5-r1.ebuild 2230 -RMD160 e82447eb13ea5286d6d6133f1677995cd8c13e19 sqlite-3.3.5-r1.ebuild 2230 -SHA256 ad15636d8810036e6d607451577f2e5600edc820106de7b18ae320132a1767f6 sqlite-3.3.5-r1.ebuild 2230 -EBUILD sqlite-3.3.6.ebuild 2282 RMD160 b10e3ee4a54ac1233d35f7283afb6526dfa05a14 SHA1 13edfce203eafcff80d4036ffcec7bd2599f766b SHA256 217e004fbf92e3a2796de612aa924ee5939e8e0c15b52c5f8c7e3fa5038007ea -MD5 fa929babe5f3a7980706396823fee929 sqlite-3.3.6.ebuild 2282 -RMD160 b10e3ee4a54ac1233d35f7283afb6526dfa05a14 sqlite-3.3.6.ebuild 2282 -SHA256 217e004fbf92e3a2796de612aa924ee5939e8e0c15b52c5f8c7e3fa5038007ea sqlite-3.3.6.ebuild 2282 -MISC ChangeLog 19088 RMD160 9f73a371fc100fed238b9e89e7a3c1f9d498fe17 SHA1 b218b8dd03343af56d2f8814571b70ebb08b00ec SHA256 3926d2592be444b63263aef0b2e41d7124b40b7c3b8e1ea1bfaa77b2d410e908 -MD5 99a6aae732f45550a40c035f0edb81ee ChangeLog 19088 -RMD160 9f73a371fc100fed238b9e89e7a3c1f9d498fe17 ChangeLog 19088 -SHA256 3926d2592be444b63263aef0b2e41d7124b40b7c3b8e1ea1bfaa77b2d410e908 ChangeLog 19088 -MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e -MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160 -RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160 -SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e metadata.xml 160 -MD5 3adf161e5df25e78d19a7ceb61d8ccb9 files/digest-sqlite-2.8.16-r1 241 -RMD160 af022d4ad9393034898c94269d898ab99fb5316b files/digest-sqlite-2.8.16-r1 241 -SHA256 5073dba5b513e40436d3c61442c16ba361aae6386bd5246efee0b6a28652e27c files/digest-sqlite-2.8.16-r1 241 +EBUILD sqlite-2.8.16-r4.ebuild 2703 RMD160 9b4254e205392f8137d662b85af78ebd02f049bd SHA1 0dba3c26be921cfa56fda58566d660134546adf6 SHA256 74617a16b895542139d4eb7bf5b97189e8e8d6d7a50cf2f39a39d0fe8daeca37 +MD5 9d8f6d79fa599aab1562a3d4db25d224 sqlite-2.8.16-r4.ebuild 2703 +RMD160 9b4254e205392f8137d662b85af78ebd02f049bd sqlite-2.8.16-r4.ebuild 2703 +SHA256 74617a16b895542139d4eb7bf5b97189e8e8d6d7a50cf2f39a39d0fe8daeca37 sqlite-2.8.16-r4.ebuild 2703 +EBUILD sqlite-3.3.12.ebuild 2404 RMD160 8b1c6a857a878bcb239ba66555b9db80e54fc23f SHA1 991065861d2da119ca3ac0dc00c558658069923f SHA256 0312b06f35242ea10ea895b690fa94a0bfc0fdb1a4208e76279e8876e7d19f98 +MD5 9d442309f2acd18434192a161bc9e725 sqlite-3.3.12.ebuild 2404 +RMD160 8b1c6a857a878bcb239ba66555b9db80e54fc23f sqlite-3.3.12.ebuild 2404 +SHA256 0312b06f35242ea10ea895b690fa94a0bfc0fdb1a4208e76279e8876e7d19f98 sqlite-3.3.12.ebuild 2404 +EBUILD sqlite-3.3.5-r1.ebuild 2275 RMD160 e5600d34ac2225da32ad5f8791270f349cdf37da SHA1 e71ff3ec54745eca618d01192539d5e903264fc9 SHA256 a896db7c2987c9cafaa0711456a5ff8366b3af24a53db52536812194f0dad461 +MD5 7c3c650c2f9d51b555a0ce04cafa4f4a sqlite-3.3.5-r1.ebuild 2275 +RMD160 e5600d34ac2225da32ad5f8791270f349cdf37da sqlite-3.3.5-r1.ebuild 2275 +SHA256 a896db7c2987c9cafaa0711456a5ff8366b3af24a53db52536812194f0dad461 sqlite-3.3.5-r1.ebuild 2275 +MISC ChangeLog 19526 RMD160 0cf1f65a4d9efb37cbcf6b6bf1f499265f459e42 SHA1 6c491e5c6e078d2a34e300e1f6076af394577fad SHA256 a696b040b1ceffd747cce2d3a908c79bb7f25b254158f832c127b66110b6366c +MD5 1c07fbc39afd6899352879cada956f4f ChangeLog 19526 +RMD160 0cf1f65a4d9efb37cbcf6b6bf1f499265f459e42 ChangeLog 19526 +SHA256 a696b040b1ceffd747cce2d3a908c79bb7f25b254158f832c127b66110b6366c ChangeLog 19526 +MISC metadata.xml 161 RMD160 29c4fec0a58914d1d34dd6bac0d88e573c4de9db SHA1 a8687e0eba56fc3e972c85401678dd93359f24ca SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2 +MD5 21daf36958be9f716caff94e896c4453 metadata.xml 161 +RMD160 29c4fec0a58914d1d34dd6bac0d88e573c4de9db metadata.xml 161 +SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2 metadata.xml 161 MD5 3adf161e5df25e78d19a7ceb61d8ccb9 files/digest-sqlite-2.8.16-r4 241 RMD160 af022d4ad9393034898c94269d898ab99fb5316b files/digest-sqlite-2.8.16-r4 241 SHA256 5073dba5b513e40436d3c61442c16ba361aae6386bd5246efee0b6a28652e27c files/digest-sqlite-2.8.16-r4 241 -MD5 5aaf2a548b7675bdbec45cddf4572225 files/digest-sqlite-3.2.1-r3 241 -RMD160 274245c49b2105ea2c78b93b1666483db6fd9efa files/digest-sqlite-3.2.1-r3 241 -SHA256 52e6351c52d446e5c669e261a48b10610947bd8f14ffea64862bb3a603c0f902 files/digest-sqlite-3.2.1-r3 241 MD5 68dcdd4983bafe47aa366c2b920bc586 files/digest-sqlite-3.3.12 244 RMD160 e2d2997c723d035eee3114e55d5e30e9b9f8191a files/digest-sqlite-3.3.12 244 SHA256 21177acff18ca321e2b7285c1375fcdc734d6da7cafc3bdb048a9a09cada1cb1 files/digest-sqlite-3.3.12 244 MD5 13dd48aa4038e5b5f30fee8f04961702 files/digest-sqlite-3.3.5-r1 241 RMD160 11f2591a398d66b08427c15bb05e6c42bda11b2e files/digest-sqlite-3.3.5-r1 241 SHA256 7df838b716f888b046669bcdb56533c9015172b269212fd91fee98793d7e00aa files/digest-sqlite-3.3.5-r1 241 -MD5 437d569e894535b43c9eed5eee668444 files/digest-sqlite-3.3.6 241 -RMD160 6b998786ac54e02c6f7e4b55504f13fb1a80e9c5 files/digest-sqlite-3.3.6 241 -SHA256 e4e3789335cbaadda2de9ff7a82e3ae2c315245cafb377337c04fe30873bf587 files/digest-sqlite-3.3.6 241 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 @@ -no-herd + no-herd 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 - 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 -#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 -}