Two fixes: 1. no need to die, because a test can't run due to USE flag combinations. A warning will suffice. 2. Replaced spaces with tabs for indenting

(Portage version: 2.1_pre9-r5)

6 files changed, 46 insertions, 30 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 37e3eeb29edf..ee2560a99dda 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/sqlite
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.108 2006/05/04 00:30:05 arj Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.109 2006/05/04 13:00:38 seemant Exp $
+
+  04 May 2006; Seemant Kulleen <seemant@gentoo.org> sqlite-3.3.4.ebuild,
+  sqlite-3.3.5.ebuild, sqlite-3.3.5-r1.ebuild:
+  Two fixes: 1. no need to die, because a test can't run due to USE flag
+  combinations. A warning will suffice. 2. Replaced spaces with tabs for
+  indenting
 
   04 May 2006; Anders Rune Jensen <arj@gentoo.org>
   +sqlite-3.3.5-r1.ebuild, +sqlite-2.8.16-r4.ebuild:
diff --git a/dev-db/sqlite/files/digest-sqlite-2.8.16-r1 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
index f63e1aac46f1..c2747e58df9b 100644
--- a/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
+++ b/dev-db/sqlite/files/digest-sqlite-2.8.16-r1
@@ -1 +1,3 @@
 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-2.8.16-r3 b/dev-db/sqlite/files/digest-sqlite-2.8.16-r3
index f63e1aac46f1..c2747e58df9b 100644
--- a/dev-db/sqlite/files/digest-sqlite-2.8.16-r3
+++ b/dev-db/sqlite/files/digest-sqlite-2.8.16-r3
@@ -1 +1,3 @@
 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/sqlite-3.3.4.ebuild b/dev-db/sqlite/sqlite-3.3.4.ebuild
index 54fd16a2fd5a..bd213b021db4 100644
--- a/dev-db/sqlite/sqlite-3.3.4.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.4.ebuild,v 1.1 2006/02/13 18:56:56 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.4.ebuild,v 1.2 2006/05/04 13:00:38 seemant Exp $
 
 inherit eutils
 
@@ -20,12 +20,14 @@ DEPEND="virtual/libc
 src_unpack() {
 	# test
 	if has test ${FEATURES}; then
-	   if ! has userpriv ${FEATURES}; then
-	      die "The userpriv feature must be enabled to run tests"
-	fi
-	   if ! use tcltk; then
-	      die "The tcltk useflag must be enabled to run tests"
-	   fi
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			ewarn "The testsuite will not be run."
+		fi
+		if ! use tcltk; then
+			ewarn "The tcltk useflag must be enabled to run tests."
+			ewarn "The testsuite will not be run."
+		fi
 	fi
 
 	unpack ${A}
@@ -38,7 +40,7 @@ src_unpack() {
 	epatch ${FILESDIR}/sandbox-fix2.patch
 
 	if use debug; then
-	   epatch ${FILESDIR}/sqlite3-configure-debug.patch
+		epatch ${FILESDIR}/sqlite3-configure-debug.patch
 	fi
 
 	# Fix broken tests that are not portable to 64 arches
@@ -77,9 +79,9 @@ src_compile() {
 src_test() {
 	cd ${S}
 	if use debug; then
-	   emake fulltest || die "some test failed"
+		emake fulltest || die "some test failed"
 	else
-	   emake test || die "some test failed"
+		emake test || die "some test failed"
 	fi
 }
 
diff --git a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
index 69cae4a44d1c..7d8a2dd479ae 100644
--- a/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1 2006/05/04 00:30:05 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5-r1.ebuild,v 1.2 2006/05/04 13:00:38 seemant Exp $
 
 inherit eutils alternatives
 
@@ -23,12 +23,14 @@ ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
 src_unpack() {
 	# test
 	if has test ${FEATURES}; then
-	   if ! has userpriv ${FEATURES}; then
-	      die "The userpriv feature must be enabled to run tests"
-	fi
-	   if ! use tcltk; then
-	      die "The tcltk useflag must be enabled to run tests"
-	   fi
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			ewarn "Testsuite will not be run."
+		fi
+		if ! use tcltk; then
+			ewarn "The tcltk useflag must be enabled to run tests."
+			ewarn "Testsuite will not be run."
+		fi
 	fi
 
 	unpack ${A}
@@ -76,9 +78,9 @@ src_compile() {
 src_test() {
 	cd ${S}
 	if use debug; then
-	   emake fulltest || die "some test failed"
+		emake fulltest || die "some test failed"
 	else
-	   emake test || die "some test failed"
+		emake test || die "some test failed"
 	fi
 }
 
diff --git a/dev-db/sqlite/sqlite-3.3.5.ebuild b/dev-db/sqlite/sqlite-3.3.5.ebuild
index f37319ad5265..899860205217 100644
--- a/dev-db/sqlite/sqlite-3.3.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.3 2006/05/04 00:20:39 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.3.5.ebuild,v 1.4 2006/05/04 13:00:38 seemant Exp $
 
 inherit eutils alternatives
 
@@ -23,12 +23,14 @@ ALTERNATIVES="${SOURCE}-3 ${SOURCE}-0"
 src_unpack() {
 	# test
 	if has test ${FEATURES}; then
-	   if ! has userpriv ${FEATURES}; then
-	      die "The userpriv feature must be enabled to run tests"
-	fi
-	   if ! use tcltk; then
-	      die "The tcltk useflag must be enabled to run tests"
-	   fi
+		if ! has userpriv ${FEATURES}; then
+			ewarn "The userpriv feature must be enabled to run tests."
+			ewarn "The testsuite will not be run.
+		fi
+		if ! use tcltk; then
+			ewarn "The tcltk useflag must be enabled to run tests."
+			ewarn "The testsuite will not be run.
+		fi
 	fi
 
 	unpack ${A}
@@ -76,9 +78,9 @@ src_compile() {
 src_test() {
 	cd ${S}
 	if use debug; then
-	   emake fulltest || die "some test failed"
+		emake fulltest || die "some test failed"
 	else
-	   emake test || die "some test failed"
+		emake test || die "some test failed"
 	fi
 }