summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2010-01-08 19:47:59 +0000
committerFabian Groffen <grobian@gentoo.org>2010-01-08 19:47:59 +0000
commit8ffb5a758534f1194337b94ac014f3fb78586904 (patch)
tree0994bfaa9da4575e0f437b20edfb3d6df65d9ec2 /dev-db
parentAdd a mask for CUDA 3.0 packages. (diff)
downloadhistorical-8ffb5a758534f1194337b94ac014f3fb78586904.tar.gz
historical-8ffb5a758534f1194337b94ac014f3fb78586904.tar.bz2
historical-8ffb5a758534f1194337b94ac014f3fb78586904.zip
Transfer Prefix keywords, make ebuild Prefix aware, fix compilation on static-only platforms (bug #299294)
Package-Manager: portage-2.2.00.15178-prefix/cvs/Darwin powerpc
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/sqlite/ChangeLog6
-rw-r--r--dev-db/sqlite/Manifest4
-rw-r--r--dev-db/sqlite/sqlite-3.6.22.ebuild14
3 files changed, 15 insertions, 9 deletions
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 1181850e97d1..ea45a8a15e35 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/sqlite
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.312 2010/01/07 18:15:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.313 2010/01/08 19:47:59 grobian Exp $
+
+ 08 Jan 2010; Fabian Groffen <grobian@gentoo.org> sqlite-3.6.22.ebuild:
+ Transfer Prefix keywords, make ebuild Prefix aware, fix compilation on
+ static-only platforms (bug #299294)
*sqlite-3.6.22 (07 Jan 2010)
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index d4392e0c630d..e134ec495ad5 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -22,6 +22,6 @@ EBUILD sqlite-3.6.19.ebuild 2968 RMD160 8d6939e082cca47993fa9d0794dcca8ae1271579
EBUILD sqlite-3.6.20-r1.ebuild 3264 RMD160 5b307fd1d81f02fad1b29aa86b9cd57287a27492 SHA1 9974c58b76e002da9e225db1bffa4d1e61b8f383 SHA256 fa93f73e495b803aff8525db5a2fc7a2b4a0040eaaacd3a1cca7f5ef8679c09e
EBUILD sqlite-3.6.20.ebuild 2934 RMD160 c9b77defb3974599eb40056dbdc4c4512d943f62 SHA1 3693dbd197e3bdcb28fd8d97b335247200e357ef SHA256 b909bb05a61eff9961a16f0572ff3c607ee2486a48d1bd332effeb24300bc4bb
EBUILD sqlite-3.6.21.ebuild 2922 RMD160 45504b045e5b667ac98b2232814d8446b1c831bf SHA1 c1e3b2dff93e05747a5d0b88d041d744d59bace0 SHA256 a6282e27791d3a9673093623029b9b54e7693404e8d2cf5ccda0c4ac8ec33836
-EBUILD sqlite-3.6.22.ebuild 2920 RMD160 5f3b553057547784fcd0b56e661c86f2a2f49fb4 SHA1 7395b176701f76aa7c6f140072586a0c1798bf92 SHA256 5ad4b188e5d9da0731b7541586784050ddccbe531ab7379438fae7721ee84dd4
-MISC ChangeLog 42578 RMD160 b03853ada9958166d8e92f5e5675c60a94c3df38 SHA1 92b7722924430ea99fac13c0faf7e53640c0d85c SHA256 56530664533058c2b72cdc6989c71feba8e40297c18eae6abf7d95844de108ab
+EBUILD sqlite-3.6.22.ebuild 3249 RMD160 697826a84c7985412f8c9fe5882ee25dbe9a24cf SHA1 fef58a17263c043df5919ac8d1b9b7be36a34716 SHA256 18308e8a36c483c4af3bcacd4a7174f7b18781f6bfbf5ce1b1b1d2d571e5daa0
+MISC ChangeLog 42762 RMD160 4ddceb619c769b2ae3ddf7b1ba613b0a25cebfe7 SHA1 e47e8b68fdc7eaf5a4c28e2f36801351ec14d8f6 SHA256 aac96353c2e74a838ce422b55cfacf10fc54ecf9a2316605f3fdd6af590ab95b
MISC metadata.xml 643 RMD160 ea04328f1133181b162ab919c6c221fbbf85c808 SHA1 76bc55999b5481e28cfe13c97eac54f039e0ea0c SHA256 edbc4a70b6504db4a408c5081439ab5055af567e1f222216bd52560fe92487de
diff --git a/dev-db/sqlite/sqlite-3.6.22.ebuild b/dev-db/sqlite/sqlite-3.6.22.ebuild
index 34f0a2b661fe..f429e4d42add 100644
--- a/dev-db/sqlite/sqlite-3.6.22.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.22.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.1 2010/01/07 18:15:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.22.ebuild,v 1.2 2010/01/08 19:47:59 grobian Exp $
EAPI="2"
-inherit eutils flag-o-matic multilib versionator
+inherit eutils flag-o-matic multilib versionator toolchain-funcs
DESCRIPTION="an SQL Database Engine in a C Library"
HOMEPAGE="http://www.sqlite.org/"
@@ -21,7 +21,7 @@ SRC_URI="
LICENSE="as-is"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc +fts3 icu +readline soundex tcl +threadsafe test"
RDEPEND="icu? ( dev-libs/icu )
@@ -77,13 +77,15 @@ src_configure() {
# amalgamation doesn't have tcl
econf \
$(use_enable readline) \
+ --with-readline-inc=-I"${EPREFIX}"/usr/include/readline \
$(use_enable threadsafe) \
$(use tcl && echo --enable-tcl) \
- $(use !tcl && use test && echo --disable-tcl)
+ $(use !tcl && use test && echo --disable-tcl) \
+ $(tc-is-static-only && echo --enable-dynamic-extensions=no)
}
src_compile() {
- emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
+ emake TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" || die "emake failed"
}
src_test() {
@@ -100,7 +102,7 @@ src_test() {
src_install() {
emake \
DESTDIR="${D}" \
- TCLLIBDIR="/usr/$(get_libdir)/${P}" \
+ TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" \
install \
|| die "emake install failed"