Version bump.

(Portage version: 13976-svn/cvs/Linux x86_64)

3 files changed, 30 insertions, 108 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 50400e32ac37..564aac98140c 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # 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.264 2009/07/27 22:08:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.265 2009/08/10 18:26:10 arfrever Exp $
+
+*sqlite-3.6.17 (10 Aug 2009)
+
+  10 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -sqlite-3.6.13.ebuild, -sqlite-3.6.15.ebuild, +sqlite-3.6.17.ebuild:
+  Version bump.
 
   27 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   sqlite-3.6.16.ebuild, +files/sqlite-3.6.16-tkt3922.test.patch:
diff --git a/dev-db/sqlite/sqlite-3.6.15.ebuild b/dev-db/sqlite/sqlite-3.6.15.ebuild
deleted file mode 100644
index 39e79143da62..000000000000
--- a/dev-db/sqlite/sqlite-3.6.15.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.15.ebuild,v 1.1 2009/06/21 00:33:56 arfrever Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="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="debug soundex tcl +threadsafe"
-RESTRICT="!tcl? ( test )"
-
-RDEPEND="tcl? ( dev-lang/tcl )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if has test ${FEATURES} ; then
-		if ! has userpriv ${FEATURES} ; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl ; then
-			ewarn "You must enable the tcl use flag if you want to run the testsuite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-}
-
-src_prepare() {
-	# note: this sandbox fix is no longer needed with sandbox-1.3+
-	epatch "${FILESDIR}"/sandbox-fix2.patch
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Enable column metadata, bug #266651
-	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
-
-	# not available via configure and requested in bug #143794
-	use soundex && append-cppflags -DSQLITE_SOUNDEX
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable threadsafe) \
-		$(use_enable threadsafe cross-thread-connections) \
-		$(use_enable tcl)
-}
-
-src_compile() {
-	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
-}
-
-src_test() {
-	if has userpriv ${FEATURES} ; then
-		local test=test
-		use debug && test=fulltest
-		emake ${test} || die "some test(s) failed"
-	fi
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		TCLLIBDIR="/usr/$(get_libdir)/${P}" \
-		install \
-		|| die "emake install failed"
-
-	doman sqlite3.1 || die "doman sqlite3.1 failed"
-}
diff --git a/dev-db/sqlite/sqlite-3.6.13.ebuild b/dev-db/sqlite/sqlite-3.6.17.ebuild
index 17e93ff738ee..778a5054e6d6 100644
--- a/dev-db/sqlite/sqlite-3.6.13.ebuild
+++ b/dev-db/sqlite/sqlite-3.6.17.ebuild
@@ -1,8 +1,8 @@
 # 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.13.ebuild,v 1.9 2009/05/24 17:41:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.6.17.ebuild,v 1.1 2009/08/10 18:26:10 arfrever Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit eutils flag-o-matic multilib versionator
 
@@ -15,7 +15,7 @@ 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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="debug doc soundex tcl +threadsafe"
 RESTRICT="!tcl? ( test )"
 
@@ -23,49 +23,46 @@ RDEPEND="tcl? ( dev-lang/tcl )"
 DEPEND="${RDEPEND}
 	doc? ( app-arch/unzip )"
 
-pkg_setup() {
-	if has test ${FEATURES} ; then
-		if ! has userpriv ${FEATURES} ; then
-			ewarn "The userpriv feature must be enabled to run tests."
-			eerror "Testsuite will not be run."
-		fi
-		if ! use tcl ; then
-			ewarn "You must enable the tcl use flag if you want to run the testsuite."
-			eerror "Testsuite will not be run."
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# note: this sandbox fix is no longer needed with sandbox-1.3+
 	epatch "${FILESDIR}"/sandbox-fix2.patch
 
+	epatch "${FILESDIR}"/${PN}-3.6.16-tkt3922.test.patch
+
 	epunt_cxx
 }
 
-src_compile() {
+src_configure() {
 	# Enable column metadata, bug #266651
 	append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
 
 	# not available via configure and requested in bug #143794
-	use soundex && append-cppflags -DSQLITE_SOUNDEX=1
+	use soundex && append-cppflags -DSQLITE_SOUNDEX
 
 	econf \
 		$(use_enable debug) \
 		$(use_enable threadsafe) \
 		$(use_enable threadsafe cross-thread-connections) \
 		$(use_enable tcl)
+}
+
+src_compile() {
 	emake TCLLIBDIR="/usr/$(get_libdir)/${P}" || die "emake failed"
 }
 
 src_test() {
-	if has userpriv ${FEATURES} ; then
+	if [[ "${EUID}" -ne "0" ]]; then
 		local test=test
 		use debug && test=fulltest
 		emake ${test} || die "some test(s) failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+
+	if ! use tcl; then
+		ewarn "You must enable the tcl USE flag if you want to run the testsuite."
+		eerror "Testsuite will not be run."
 	fi
 }
 
@@ -76,16 +73,11 @@ src_install() {
 		install \
 		|| die "emake install failed"
 
-	doman sqlite3.1 || die
+	doman sqlite3.1 || die "doman sqlite3.1 failed"
 
-	if use doc ; then
+	if use doc; then
 		# Naming scheme changes randomly between - and _ in releases
 		# http://www.sqlite.org/cvstrac/tktview?tn=3523
-		dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die
+		dohtml -r "${WORKDIR}"/${PN}-${DOC_PV}-docs/* || die "dohtml failed"
 	fi
 }
-
-pkg_postinst() {
-	elog "sqlite-3.6.X is not totally backwards compatible, see"
-	elog "http://www.sqlite.org/releaselog/3_6_0.html for full details."
-}