diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2009-12-19 12:05:13 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2009-12-19 12:05:13 +0000 |
| commit | b503b30e664f272a009ed5cc5dc63b7fa0f6d751 (patch) | |
| tree | 37e9fc318531f044a0678e6ad027c83eb784b49c /dev-db/sqlite | |
| parent | Make building work without tcl installed using the amalgamation tarball from ... (diff) | |
| download | historical-b503b30e664f272a009ed5cc5dc63b7fa0f6d751.tar.gz historical-b503b30e664f272a009ed5cc5dc63b7fa0f6d751.tar.bz2 historical-b503b30e664f272a009ed5cc5dc63b7fa0f6d751.zip | |
Fix a couple QA issues with the last commit.
Package-Manager: portage-2.2_rc54/cvs/Linux i686
Diffstat (limited to 'dev-db/sqlite')
| -rw-r--r-- | dev-db/sqlite/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-db/sqlite/Manifest | 10 | ||||
| -rw-r--r-- | dev-db/sqlite/sqlite-3.6.21.ebuild | 15 |
3 files changed, 17 insertions, 13 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog index 40a5179171b8..7a8900c58c6f 100644 --- a/dev-db/sqlite/ChangeLog +++ b/dev-db/sqlite/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-db/sqlite # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.300 2009/12/19 11:57:01 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.301 2009/12/19 12:05:13 betelgeuse Exp $ + + 19 Dec 2009; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.6.21.ebuild: + Fix a couple QA issues with the last commit. 19 Dec 2009; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.6.21.ebuild: Make building work without tcl installed using the amalgamation tarball diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index 251256ee2297..995401b75cbe 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -21,13 +21,13 @@ EBUILD sqlite-2.8.16-r4.ebuild 2691 RMD160 84aeeda2955daa547583a9d995b1baf0de601 EBUILD sqlite-3.6.19.ebuild 2968 RMD160 8d6939e082cca47993fa9d0794dcca8ae1271579 SHA1 cef5f063436522cc9bc73de30f77b9c20ea14109 SHA256 2b5b3b9e76bbe1c0de8c88fd110c61c96a7b965cdb234087d830e31da43b491c EBUILD sqlite-3.6.20-r1.ebuild 3276 RMD160 60be12a735688fd47b052a1a7290c1e5e8c087d8 SHA1 aac8dd9c6793e792d7a31608c685d67429700b63 SHA256 b169b1fb8bf10f8426cd732d2e7f501e7185e717caef71cb472f75df774b01bf EBUILD sqlite-3.6.20.ebuild 2937 RMD160 479da23a696b1d2048fbe58db687198c5806bcf2 SHA1 a17d2a7f25ec11f0192cf970ed90cbab182c3f6f SHA256 723397d073859ca4027a22175d8d16c8789d9275797b444fc966e7267d59617b -EBUILD sqlite-3.6.21.ebuild 2704 RMD160 b3aefd7af40f3b098446c6f3c0ae1b4c60ae5897 SHA1 93275bf7f090131624fea8a1a07b1e1aa354acdb SHA256 c860b793847accb2032d28ea9f3c0c98897a11bed44e00c9fdb43726f515be8f -MISC ChangeLog 41179 RMD160 6b31ca9cbe43118cbe15f1e41bd08d9ae443483b SHA1 330361a91e60d82a67fba86712a78a5c010dfd67 SHA256 c4e3a4832213b25892c162a2de1109a1f57057fb6cf261b5611fa25c6deb63b0 +EBUILD sqlite-3.6.21.ebuild 2745 RMD160 bcf75523c29fe7d5060770211fbe26cd7eccf167 SHA1 69d1de185abc0dc5406c77f8987d01436e168944 SHA256 860ede7fe89d04c6bac7529b802843429c2d2de3787d0e1785d3d3a34049ac1a +MISC ChangeLog 41302 RMD160 002722c8de9294e16bfea303c644e34ee1e9a2be SHA1 ce9c9f9bd97d2c12dddbe5269d6911fa4f47fb04 SHA256 8eb5ab4371b72217265ae5db3b5ce95a1b38028ecb44af38368fe89808d84e85 MISC metadata.xml 643 RMD160 ea04328f1133181b162ab919c6c221fbbf85c808 SHA1 76bc55999b5481e28cfe13c97eac54f039e0ea0c SHA256 edbc4a70b6504db4a408c5081439ab5055af567e1f222216bd52560fe92487de -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkssv5gACgkQcxLzpIGCsLT54gCdFBKk0pqLMYGEcg1Yv9mtLbPB -iKIAn0xiN9X2B7+dhS0IYL4wkKekKam+ -=Ge9u +iEYEARECAAYFAksswX8ACgkQcxLzpIGCsLSiPgCfafyhAZCXpK12JLyOfIqsamqA +il0AniUeLxTc32xM4z5K/1vxaQn985SS +=Cc/r -----END PGP SIGNATURE----- diff --git a/dev-db/sqlite/sqlite-3.6.21.ebuild b/dev-db/sqlite/sqlite-3.6.21.ebuild index 77459a339b8e..efd1e1c834aa 100644 --- a/dev-db/sqlite/sqlite-3.6.21.ebuild +++ b/dev-db/sqlite/sqlite-3.6.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.3 2009/12/19 11:57:01 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.21.ebuild,v 1.4 2009/12/19 12:05:13 betelgeuse Exp $ EAPI="2" @@ -12,11 +12,11 @@ DOC_BASE="$(get_version_component_range 1-3)" DOC_PV="$(replace_all_version_separators _ ${DOC_BASE})" SRC_URI=" - tcl? ( http://www.sqlite.org/${P}.tar.gz ) - !tcl? ( + tcl? ( http://www.sqlite.org/${P}.tar.gz ) + !tcl? ( test? ( http://www.sqlite.org/${P}.tar.gz ) !test? ( http://www.sqlite.org/${PN}-amalgamation-${PV}.tar.gz ) - ) + ) doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )" LICENSE="as-is" @@ -26,9 +26,9 @@ IUSE="debug doc fts3 icu +readline soundex tcl +threadsafe test" RDEPEND="icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) - tcl? ( dev-lang/tcl ) - test? ( dev-lang/tcl )" + tcl? ( dev-lang/tcl )" DEPEND="${RDEPEND} + test? ( dev-lang/tcl ) doc? ( app-arch/unzip )" src_prepare() { @@ -72,7 +72,8 @@ src_configure() { econf \ $(use_enable readline) \ $(use_enable threadsafe) \ - $(use tcl && echo --enable-tcl) + $(use tcl && echo --enable-tcl) \ + $(use !tcl && use test && echo --disable-tcl) } src_compile() { |