Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2008-01-08 00:34:50 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2008-01-08 00:34:50 +0000
commit1cdd7ad79803e2e3dd43d669ca58aaab01c63183 (patch)
tree5951c559b5933bc2bae979e3cb55fbaa2bcf15cc /dev-db
parentVersion bump. (diff)
downloadhistorical-1cdd7ad79803e2e3dd43d669ca58aaab01c63183.tar.gz
historical-1cdd7ad79803e2e3dd43d669ca58aaab01c63183.tar.bz2
historical-1cdd7ad79803e2e3dd43d669ca58aaab01c63183.zip
Fix doc use flag. The documentation comes in a separate tarball since 3.5. Fixes bug #203107.
Package-Manager: portage-2.1.4_rc14
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/sqlite/ChangeLog7
-rw-r--r--dev-db/sqlite/Manifest44
-rw-r--r--dev-db/sqlite/files/digest-sqlite-3.5.33
-rw-r--r--dev-db/sqlite/files/digest-sqlite-3.5.43
-rw-r--r--dev-db/sqlite/sqlite-3.5.3.ebuild27
-rw-r--r--dev-db/sqlite/sqlite-3.5.4.ebuild27
6 files changed, 63 insertions, 48 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index d5f1a62dbf8c..4706844fa511 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-db/sqlite
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.171 2008/01/08 00:21:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.172 2008/01/08 00:34:49 betelgeuse Exp $
+
+ 08 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> sqlite-3.5.3.ebuild,
+ sqlite-3.5.4.ebuild:
+ Fix doc use flag. The documentation comes in a separate tarball since 3.5.
+ Fixes bug #203107.
08 Jan 2008; Petteri Räty <betelgeuse@gentoo.org> -sqlite-3.3.12.ebuild,
-sqlite-3.4.2.ebuild:
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index be514a7cb815..34b93ab80ad1 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -42,6 +42,8 @@ DIST sqlite-3.3.17.tar.gz 2111281 RMD160 a948306fc45f7baa8cb241a6cf7e4a57c9c6468
DIST sqlite-3.4.1.tar.gz 2237515 RMD160 6577af52d850354eec9bb58ff289ca12ebdd0ff7 SHA1 73cdeed7b01e107203ddddc75c02ef113564d5ce SHA256 d604a4db7781db3d8dda0bb30c4a35bbee184d48e72d9c0de855cf55170ee1be
DIST sqlite-3.5.3.tar.gz 2072419 RMD160 0abfd80499f8facc71596aa1a0915620f6522288 SHA1 f0ff257f2f20bd756d62ec1470821fbc933ffd6c SHA256 92aa1ebbbbaef542f9416e7bfd3ba266e4436bb5514f8833915459e888205cb1
DIST sqlite-3.5.4.tar.gz 2092372 RMD160 d11b535676e6d54c0d03adcb74c7dbfa1f12c064 SHA1 9c0ddb2f9b154e8a036e40f3cea92b58c77a59ef SHA256 47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f
+DIST sqlite_docs_3_5_3.zip 1143797 RMD160 d897e2b5f4018e53db5b0403b64d0216f6a7a0c5 SHA1 0a0f9dec76dadf16edc57eaf4ce7b5a3bd5d5c20 SHA256 cf50b1cb67db10c5efedecfb930124d554ec29775e19643c9e991334c15c48b1
+DIST sqlite_docs_3_5_4.zip 1206247 RMD160 80aa850fb09dde404da3526fd444a3f107c63881 SHA1 0c5b82788809c80b79f5e3bf20fd408850e21975 SHA256 9962f53ce4c0e7557a4229edc78d62c95b4d43ed4c02267f86eeb8e18cb7f18a
EBUILD sqlite-2.8.16-r4.ebuild 2690 RMD160 ff04948d5eedf4f039aadcfc7478a7d26473f566 SHA1 466c3736e0924f2bcb76254f593347c41e85d80f SHA256 1723fd6791f2b31aa428bba3ac7d6c8a08e5097ecea3ba4ad0a45eca4c7d021c
MD5 b48dccc514183ff7fd6106bf6e729b1a sqlite-2.8.16-r4.ebuild 2690
RMD160 ff04948d5eedf4f039aadcfc7478a7d26473f566 sqlite-2.8.16-r4.ebuild 2690
@@ -54,18 +56,18 @@ EBUILD sqlite-3.4.1.ebuild 2161 RMD160 cda61af8cb6a624aefed350181451ecd66038c73
MD5 b209f01bdd4801e5a4e8aeb616a9c6ee sqlite-3.4.1.ebuild 2161
RMD160 cda61af8cb6a624aefed350181451ecd66038c73 sqlite-3.4.1.ebuild 2161
SHA256 0ab74e747c16887e40d2c89d7ecc04d889a022581723eb38cba96e9d9752a02d sqlite-3.4.1.ebuild 2161
-EBUILD sqlite-3.5.3.ebuild 2041 RMD160 9aec987beeb7022c6c2f27be61809eb92c74cbff SHA1 3d8a71bb59a28bc4891f5e87efca2196530fa224 SHA256 f7fefb87a1e2ee081806d80f9a73c233da4b3a8c5c98c2d6ca9215bb48a43ced
-MD5 cd2d7b2e318cec2f9416085607b67f2c sqlite-3.5.3.ebuild 2041
-RMD160 9aec987beeb7022c6c2f27be61809eb92c74cbff sqlite-3.5.3.ebuild 2041
-SHA256 f7fefb87a1e2ee081806d80f9a73c233da4b3a8c5c98c2d6ca9215bb48a43ced sqlite-3.5.3.ebuild 2041
-EBUILD sqlite-3.5.4.ebuild 2041 RMD160 ff9266a6d80dfd0a9d0b70fe950467d72d310861 SHA1 54423d2bc05e7bad1917ed3aaf71d153e3567465 SHA256 2e6a4687f4ac805906af070dce1314159f498af596bdf43bfde36d9ea283b343
-MD5 ba8c58bdcbf3150d31669be481758db0 sqlite-3.5.4.ebuild 2041
-RMD160 ff9266a6d80dfd0a9d0b70fe950467d72d310861 sqlite-3.5.4.ebuild 2041
-SHA256 2e6a4687f4ac805906af070dce1314159f498af596bdf43bfde36d9ea283b343 sqlite-3.5.4.ebuild 2041
-MISC ChangeLog 24258 RMD160 57492d4558b515051ae25da96392b00cb058cafe SHA1 dfbc7078c9cfd1e003b87f0f22b81f2ad3bfbf46 SHA256 125d0e39ab00f813b7644a013a3824a7c2bbb9b736ca6d4eacb64797d5a24735
-MD5 a44e5bcf3d28b7f95083ac3dc5b90bc8 ChangeLog 24258
-RMD160 57492d4558b515051ae25da96392b00cb058cafe ChangeLog 24258
-SHA256 125d0e39ab00f813b7644a013a3824a7c2bbb9b736ca6d4eacb64797d5a24735 ChangeLog 24258
+EBUILD sqlite-3.5.3.ebuild 2131 RMD160 33378e9804452e37f8ef03e987b193e26211db87 SHA1 6c5b99a3a77171fa53a481153c7994fcffd75f67 SHA256 992e066decf408bc5695eefe422670178b11308dd1338cd1597f49e9faede0ea
+MD5 5ec1ea5b96b52c39d218a115ffc9aa59 sqlite-3.5.3.ebuild 2131
+RMD160 33378e9804452e37f8ef03e987b193e26211db87 sqlite-3.5.3.ebuild 2131
+SHA256 992e066decf408bc5695eefe422670178b11308dd1338cd1597f49e9faede0ea sqlite-3.5.3.ebuild 2131
+EBUILD sqlite-3.5.4.ebuild 2131 RMD160 b33c69c2cf01d051f5f4b338dc5eee54e8dd3dd9 SHA1 df0d91a0a11e9aa85857f27f6f016773fa5de684 SHA256 7729056cc0a3e17091d3c0271691237fbd7604921e122d7b46d60366c1b39d30
+MD5 2b4210a638f376038e285f256977160e sqlite-3.5.4.ebuild 2131
+RMD160 b33c69c2cf01d051f5f4b338dc5eee54e8dd3dd9 sqlite-3.5.4.ebuild 2131
+SHA256 7729056cc0a3e17091d3c0271691237fbd7604921e122d7b46d60366c1b39d30 sqlite-3.5.4.ebuild 2131
+MISC ChangeLog 24454 RMD160 dc04b46f0c748ec2f315108d53632d9c89452db6 SHA1 6745def5070162e45329c44b0516af03aa5efe47 SHA256 d4437b834b98de80b5fb07dbc6e18b08aa2a113cca38aee7bc9849998c589af0
+MD5 44853e7eb34ac39b69d488b2695749fd ChangeLog 24454
+RMD160 dc04b46f0c748ec2f315108d53632d9c89452db6 ChangeLog 24454
+SHA256 d4437b834b98de80b5fb07dbc6e18b08aa2a113cca38aee7bc9849998c589af0 ChangeLog 24454
MISC metadata.xml 278 RMD160 cb266116d64b539a40af5efb4f6734dd0d506b6a SHA1 3eb088ba0a7736d19ca4dbe560de06a5e2b0bd3a SHA256 143dace3d40b3fe072c2f845bc932a6578944b42df26a6da3febfd1746f05617
MD5 43d326b37dc346b7efedf7a2fc7127d5 metadata.xml 278
RMD160 cb266116d64b539a40af5efb4f6734dd0d506b6a metadata.xml 278
@@ -79,16 +81,16 @@ SHA256 8cce0ca265d5db8d56688710fcf81a532479ee4bc41946603f8b75bbdcb5a9b1 files/di
MD5 ddd4276171f72cc9a6bcd760f05ae993 files/digest-sqlite-3.4.1 241
RMD160 1d6cdd5ac73e64ca1118c1cc472a8c539f6d5346 files/digest-sqlite-3.4.1 241
SHA256 4a978372680c8a83a68d2ba372945da694c61bd72825e4c9c9944f8e5cd34e9c files/digest-sqlite-3.4.1 241
-MD5 ded500f18cc75471cad11136e5dde3af files/digest-sqlite-3.5.3 241
-RMD160 7ba9caacdd3b23b6105610b6add5e63ff1c3bc80 files/digest-sqlite-3.5.3 241
-SHA256 b1b8536ebeecfd24ecf370cb01b6f2ff99ec2e8e62a097673b9438c22d4d18ab files/digest-sqlite-3.5.3 241
-MD5 788607e470358796743467588e2eb935 files/digest-sqlite-3.5.4 241
-RMD160 d3ab87767296ab67218abf17d4ce363c1f79b303 files/digest-sqlite-3.5.4 241
-SHA256 ddd6976a9ee642b6f751861d6c5e3d6ffd20820e330a3bbf0c34569e262fa324 files/digest-sqlite-3.5.4 241
+MD5 8505fd139ba28d7f86bc39f2677f3970 files/digest-sqlite-3.5.3 488
+RMD160 bcd5e8a8878f3ba3a917519860ef696efad8b4d9 files/digest-sqlite-3.5.3 488
+SHA256 a943bf48251264a56481d8063464736ea2630013ba931b97cd4332f0361002ff files/digest-sqlite-3.5.3 488
+MD5 03387952bb527158a5e2ada2f5df955b files/digest-sqlite-3.5.4 488
+RMD160 878ed80103accbe27f91d8d3bb091f86cd79d8fb files/digest-sqlite-3.5.4 488
+SHA256 32f7f0e15edf94a4a4b5c49889e00f7d807c68c5f63367d1d57810992bc2d6d2 files/digest-sqlite-3.5.4 488
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.8 (GNU/Linux)
-iEYEARECAAYFAkeCwh8ACgkQcxLzpIGCsLRu/QCfTQFnC0/Q0Sx7KfFwEjllHJz0
-AA8An2yeE5UlIFQ49iO2gT8QpWlyytJK
-=mvcN
+iEYEARECAAYFAkeCxS0ACgkQcxLzpIGCsLSdMgCdGZpeRTVHqIPBe1/ZkX5opDxP
+GaAAn1c6lgldakt3ezjngUevPxyRI2HF
+=aSO7
-----END PGP SIGNATURE-----
diff --git a/dev-db/sqlite/files/digest-sqlite-3.5.3 b/dev-db/sqlite/files/digest-sqlite-3.5.3
index 8ec15f5f55db..1216743aa4de 100644
--- a/dev-db/sqlite/files/digest-sqlite-3.5.3
+++ b/dev-db/sqlite/files/digest-sqlite-3.5.3
@@ -1,3 +1,6 @@
MD5 dadd617ebb08ef61e725f374ba2993c1 sqlite-3.5.3.tar.gz 2072419
RMD160 0abfd80499f8facc71596aa1a0915620f6522288 sqlite-3.5.3.tar.gz 2072419
SHA256 92aa1ebbbbaef542f9416e7bfd3ba266e4436bb5514f8833915459e888205cb1 sqlite-3.5.3.tar.gz 2072419
+MD5 15acede0434e529c65f67d9c59d5c402 sqlite_docs_3_5_3.zip 1143797
+RMD160 d897e2b5f4018e53db5b0403b64d0216f6a7a0c5 sqlite_docs_3_5_3.zip 1143797
+SHA256 cf50b1cb67db10c5efedecfb930124d554ec29775e19643c9e991334c15c48b1 sqlite_docs_3_5_3.zip 1143797
diff --git a/dev-db/sqlite/files/digest-sqlite-3.5.4 b/dev-db/sqlite/files/digest-sqlite-3.5.4
index afac75dfaeee..eb5af7b4f0da 100644
--- a/dev-db/sqlite/files/digest-sqlite-3.5.4
+++ b/dev-db/sqlite/files/digest-sqlite-3.5.4
@@ -1,3 +1,6 @@
MD5 f17da840eed792e896c3408d0ce97718 sqlite-3.5.4.tar.gz 2092372
RMD160 d11b535676e6d54c0d03adcb74c7dbfa1f12c064 sqlite-3.5.4.tar.gz 2092372
SHA256 47daba209bd3bcffa1c5fcd5fdfc4f524eae619b4fa855aeeb1bbbc8bd2bb04f sqlite-3.5.4.tar.gz 2092372
+MD5 60270f9764015dc8796810f194270659 sqlite_docs_3_5_4.zip 1206247
+RMD160 80aa850fb09dde404da3526fd444a3f107c63881 sqlite_docs_3_5_4.zip 1206247
+SHA256 9962f53ce4c0e7557a4229edc78d62c95b4d43ed4c02267f86eeb8e18cb7f18a sqlite_docs_3_5_4.zip 1206247
diff --git a/dev-db/sqlite/sqlite-3.5.3.ebuild b/dev-db/sqlite/sqlite-3.5.3.ebuild
index b7c995b3bcb6..54bc592a649b 100644
--- a/dev-db/sqlite/sqlite-3.5.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.5.3.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild,v 1.1 2007/12/07 18:14:18 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.3.ebuild,v 1.2 2008/01/08 00:34:49 betelgeuse Exp $
EAPI="1"
-inherit alternatives eutils flag-o-matic libtool
+inherit versionator alternatives eutils flag-o-matic libtool
DESCRIPTION="an SQL Database Engine in a C Library"
HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+DOC_PV=$(replace_all_version_separators _)
+SRC_URI="http://www.sqlite.org/${P}.tar.gz
+ doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
LICENSE="as-is"
SLOT="3"
@@ -16,9 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
IUSE="debug doc soundex tcl +threadsafe"
RESTRICT="!tcl? ( test )"
-DEPEND="doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
-RDEPEND="tcl? ( dev-lang/tcl )"
+DEPEND="tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
SOURCE="/usr/bin/lemon"
ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -57,10 +58,6 @@ src_compile() {
$(use_enable tcl)
emake all || die "emake all failed"
-
- if use doc ; then
- emake doc || die "emake doc failed"
- fi
}
src_test() {
@@ -80,12 +77,16 @@ src_install () {
DESTDIR="${D}" \
TCLLIBDIR="/usr/$(get_libdir)" \
install \
- || die "make install failed"
+ || die "emake install failed"
newbin lemon lemon-${SLOT} || die
dodoc README VERSION || die
doman sqlite3.1 || die
- use doc && dohtml doc/* art/*.gif
+ dohtml doc/*.html art/*.gif || die
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/* || die
+ fi
}
diff --git a/dev-db/sqlite/sqlite-3.5.4.ebuild b/dev-db/sqlite/sqlite-3.5.4.ebuild
index 2d5420fce295..58985df08df5 100644
--- a/dev-db/sqlite/sqlite-3.5.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.5.4.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v 1.1 2007/12/17 19:05:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.5.4.ebuild,v 1.2 2008/01/08 00:34:49 betelgeuse Exp $
EAPI="1"
-inherit alternatives eutils flag-o-matic libtool
+inherit versionator alternatives eutils flag-o-matic libtool
DESCRIPTION="an SQL Database Engine in a C Library"
HOMEPAGE="http://www.sqlite.org/"
-SRC_URI="http://www.sqlite.org/${P}.tar.gz"
+DOC_PV=$(replace_all_version_separators _)
+SRC_URI="http://www.sqlite.org/${P}.tar.gz
+ doc? ( http://www.sqlite.org/${PN}_docs_${DOC_PV}.zip )"
LICENSE="as-is"
SLOT="3"
@@ -16,9 +18,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~spa
IUSE="debug doc soundex tcl +threadsafe"
RESTRICT="!tcl? ( test )"
-DEPEND="doc? ( dev-lang/tcl )
- tcl? ( dev-lang/tcl )"
-RDEPEND="tcl? ( dev-lang/tcl )"
+DEPEND="tcl? ( dev-lang/tcl )"
+RDEPEND="${DEPEND}"
SOURCE="/usr/bin/lemon"
ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
@@ -57,10 +58,6 @@ src_compile() {
$(use_enable tcl)
emake all || die "emake all failed"
-
- if use doc ; then
- emake doc || die "emake doc failed"
- fi
}
src_test() {
@@ -80,12 +77,16 @@ src_install () {
DESTDIR="${D}" \
TCLLIBDIR="/usr/$(get_libdir)" \
install \
- || die "make install failed"
+ || die "emake install failed"
newbin lemon lemon-${SLOT} || die
dodoc README VERSION || die
doman sqlite3.1 || die
- use doc && dohtml doc/* art/*.gif
+ dohtml doc/*.html art/*.gif || die
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/${PN}-docs-${PV}/* || die
+ fi
}