--- a/dev-vcs/kallithea/Manifest	Mon Mar 28 20:27:26 2016 +0200
+++ b/dev-vcs/kallithea/Manifest	Mon Mar 28 20:50:27 2016 +0200
@@ -1,5 +1,5 @@
 AUX production.wsgi 448 SHA256 34aa607585b8526356d0a4e7103689a4c353e333bfd7dbd9316dea1601403af6 SHA512 f1d6310626ce5687317d856e4be2ea37d4d39dea5402846c64195d77cef1454ef96d3c6d23832a9a0c8ecdc6645582bc86b138cc7fbb7dc78226f45279d44f7a WHIRLPOOL cfee76d169facea538b00fdd9683a9ecefe58cd49f3c2f3f46e49025af459e5a8bdd236ea55252d5488ee52212f2f57423f3d8e21ddb2251e25851bffc93d243
 AUX start-virtualenv.sh 463 SHA256 2f5def6c4840b94b78055fcc3f3e37aa42dd709e4e71dfa16d1fc63966274456 SHA512 0912644b3806b9c04d301f5f2f59c9b212549e73dec848a324fb0dd8bc9410e60750a571a3438ccc4b9dd940020986b67a9f3bb29a7fd27945daa2ae4c24139d WHIRLPOOL f4cbb8e583ec907baaa0801c6c2f73a9832689422654661079d420002a6c55ff872f8af1b4a2b78e50085f90e2c8d5876e93a436c443ac75f9d589510d8f615c
 DIST Kallithea-0.3.1.tar.bz2 5320317 SHA256 9c6cac42d99da475af63012265f986c4d743a07e81c18f4744b3bf8be84aad7d SHA512 09bf8552d00176258dc2f00fc8a186bb95e0f12b535db836bf6a404bc41821805c144056af76f69eec66926ce3226ba0a6b3776abb8d717f5bbe5b33faa81beb WHIRLPOOL d05b0cbf7f9613571116efc10a0d99b1944c2c2ae4ede37dfde074120839bd40c2c0708f5028e2018f9d1fb4a24a7ef42b84f211c1fdef13200b2b7ee765f85f
-EBUILD kallithea-0.3.1.ebuild 15119 SHA256 885caad596dbc64e83c83ff2e1d6bac525b894ed388f8c9dbcd5184ad880b2cd SHA512 125e82fd56db7e594604549b870780d974296898baac3deb6b9d8cc4eab90c5cdf91bad0abbfc4709c39ee5178914301360cb4ee45a2a5a7e3f12fe4dc62529b WHIRLPOOL 70fa420fe420f9e3725084010761f88f2263ddac633192a26837cfd8b695fa3db355c120077f72f2b025eece84a577fc6eef55d9ea750d9c272d47657323c60b
+EBUILD kallithea-0.3.1.ebuild 15526 SHA256 9c64b0c91c1631a61207f78aae7ba4c78f806b1c9127aa18d921655871cb7815 SHA512 8c3a0867552651f8e0257a685ddaa8c9dde02adb335a395a8daf282a35a11bd51f031ef7f7890756daa877a4cabcbc73c5f7157699d90f1c9ec27e3bb691a40c WHIRLPOOL d479eec505d49136e0f40f9678e23498ef37dbecc9359961bab7b45cb9c751aac55ddfde35fbb73e27e8a2139106d41cb0e18de7bb1a0b0373524c5c2ce475ad
 EBUILD kallithea-9999.ebuild 8413 SHA256 0455764589e04a214f885831587ab57a823994f9e57bda1b969f2ff746b59d03 SHA512 3e6b0a1ef1f2c1316f8690336a7d1516ac80cce301d8ac85f8b4adcb7b86780fd56328338c7c271dee0de505f54c324c1339b2b619ecc1a7169e67aac3cd4eae WHIRLPOOL 97827448c10e7ec8bd94ff129a5a9b3b2f94dde815d8a357c28b0e8e6f3c1a0768381133e730f0b0472750920cc55f9276aa0822bddc0581be0f3b2ec76eccfa

--- a/dev-vcs/kallithea/kallithea-0.3.1.ebuild	Mon Mar 28 20:27:26 2016 +0200
+++ b/dev-vcs/kallithea/kallithea-0.3.1.ebuild	Mon Mar 28 20:50:27 2016 +0200
@@ -177,6 +177,9 @@
 	sed -i -e "s/^\(\s*app_instance_uuid\s*=\).*/#\1 (run uuidgen and insert the returned UUID here)/" production.ini
 	sed -i -e "s/^\(\s*beaker\.session\.secret\s*=\).*/#\1 (run uuidgen and insert the returned UUID here)/" production.ini
 	
+	# comment out sqlite DB as we don't want users to use it by accident
+	sed -i -e 's/^\(\s*\)\(sqlalchemy\.db1\.url\s*=\s*sqlite:.*\)/\1#\2/' production.ini
+	
 	# rename production.ini as it requires more configuration and is hard to read
 	mv production.ini production.ini.example
 	
@@ -231,41 +234,48 @@
 pkg_postinst() {
 	#               1         2         3         4         5         6         7         8
 	#      12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	einfo "An example configuration file has already been created so you don't need to run"
-	einfo "make-config again; please copy and edit carefully on first setup:"
-	einfo "    cp -a ${installConfigPath}/production.ini.example ${installConfigPath}/production.ini"
-	einfo "    \$EDITOR ${installConfigPath}/production.ini"
-	einfo ""
-	einfo "After updates, please compare what has changed and copy any necessary changes:"
-	einfo "    diff -u ${installConfigPath}/production.ini ${installConfigPath}/production.ini.example"
-	einfo ""
-	einfo "You still need to follow Kallithea's other setup steps according to the"
-	einfo "instructions at:"
-	einfo "    ${urlDocumentationSetup}"
-	einfo ""
-	einfo "When doing so, please mind that Kallithea was installed into a Python virtual"
-	einfo "environment that has to be \"activated\" before it can be used. To do so,"
-	einfo "you will have to run a dedicated shell and initialize the environment by running"
-	einfo ""
-	einfo "    source ${installBasePath}/${virtualenvActivationPath}"
-	einfo ""
-	einfo "We altered the default config slightly. It may be best to have a look at our"
-	einfo "short example on how to setup hosting with Apache and mod_wsgi, even if you"
-	einfo "prefer another method of hosting Kallithea:"
-	einfo "    ${urlDocumentationMegacoffee}"
-	einfo ""
-	#einfo "We can wrap those commands for you if you run (no prior activation needed):"
-	#einfo "    emerge --config =${CATEGORY}/${PF}"
-	#einfo ""
-	einfo "Kallithea also provides a way to migrate your database if you are coming from"
-	einfo "RhodeCode 2.2 or below. Instructions can be found at:"
-	einfo "${urlDocumentationRhodeCode}"
-	einfo ""
+	elog  "An example configuration file has already been created so you don't need to run"
+	elog  "make-config again; please copy and edit carefully on first setup:"
+	elog  "    cp -a ${installConfigPath}/production.ini.example ${installConfigPath}/production.ini"
+	elog  "    \$EDITOR ${installConfigPath}/production.ini"
+	elog  ""
+	elog  "After updates, please compare what has changed and copy any necessary changes:"
+	elog  "    diff -u ${installConfigPath}/production.ini ${installConfigPath}/production.ini.example"
+	elog  ""
+	elog  "You still need to follow Kallithea's other setup steps according to the"
+	elog  "instructions at:"
+	elog  "    ${urlDocumentationSetup}"
+	elog  ""
+	elog  "When doing so, please mind that Kallithea was installed into a Python virtual"
+	elog  "environment that has to be \"activated\" before it can be used. To do so,"
+	elog  "you will have to run a dedicated shell and initialize the environment by running"
+	elog  ""
+	elog  "    source ${installBasePath}/${virtualenvActivationPath}"
+	elog  ""
+	elog  "We altered the default config slightly. It may be best to have a look at our"
+	elog  "short example on how to setup hosting with Apache and mod_wsgi, even if you"
+	elog  "prefer another method of hosting Kallithea:"
+	elog  "    ${urlDocumentationMegacoffee}"
+	elog  ""
+	#elog  "We can wrap those commands for you if you run (no prior activation needed):"
+	#elog  "    emerge --config =${CATEGORY}/${PF}"
+	#elog  ""
+	elog  "Kallithea also provides a way to migrate your database if you are coming from"
+	elog  "RhodeCode 2.2 or below. Instructions can be found at:"
+	elog  "${urlDocumentationRhodeCode}"
+	elog  ""
 	ewarn "Bear in mind that the whole purpose of a Python virtual environment is to"
 	ewarn "isolate complex dependency installations from other instances installed on the"
 	ewarn "same system so you will have to remember to re-emerge this ebuild when"
 	ewarn "Kallithea's dependencies received bug and in particular security fixes (assuming"
 	ewarn "it allows any more recent versions to be installed)."
+	
+	if use sqlite ; then
+		ewarn ""
+		ewarn "You chose to use SQLite for Kallithea. Please be advised that this is *ONLY* for"
+		ewarn "testing purposes, please avoid using SQLite in production and choose a different"
+		ewarn "database instead."
+	fi
 }