--- a/dev-vcs/kallithea/Manifest	Mon Mar 28 15:56:07 2016 +0200
+++ b/dev-vcs/kallithea/Manifest	Mon Mar 28 16:03:11 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 13420 SHA256 a99204fe079e45babd42b51fedb806829828c830c3716635e9e9ccff1c322fef SHA512 4ec19057d3aa7fefe189f7e05bf0fddc0bbc64c889471f13120e3d8708642020b114b12f02d441492bf1f8fd47cf5e8df8eac080b034c2b8685583588b76ce8e WHIRLPOOL c83dbb591a710d995253ca5e0d17cda66923bae9ce611a9fdabdde86b5e30e083c86dde566c19dc24d3233e13617d0875b31a6a11e77aa8a4b2969fb6066695a
+EBUILD kallithea-0.3.1.ebuild 13579 SHA256 7b86ff3a5299a2d5ed749545670fef60b6603192ae8a316a57975ef1941175b8 SHA512 7db9ca17b8389cf86b2bb68e360ec542aa87167d9c748ae987883f9726d5ade0a7dc1f8ac43c23f86b458c150f0461fdfa080aca8efe331fd5326978a5c3d314 WHIRLPOOL 710b594e0fa059d4a0ecad40b189eb50f3430844591279650f263f83e9f974e2426bddb018d215022e79ddfdce582e15f0b161a307342d94336aa310a56df126
 EBUILD kallithea-9999.ebuild 8413 SHA256 0455764589e04a214f885831587ab57a823994f9e57bda1b969f2ff746b59d03 SHA512 3e6b0a1ef1f2c1316f8690336a7d1516ac80cce301d8ac85f8b4adcb7b86780fd56328338c7c271dee0de505f54c324c1339b2b619ecc1a7169e67aac3cd4eae WHIRLPOOL 97827448c10e7ec8bd94ff129a5a9b3b2f94dde815d8a357c28b0e8e6f3c1a0768381133e730f0b0472750920cc55f9276aa0822bddc0581be0f3b2ec76eccfa

--- a/dev-vcs/kallithea/kallithea-0.3.1.ebuild	Mon Mar 28 15:56:07 2016 +0200
+++ b/dev-vcs/kallithea/kallithea-0.3.1.ebuild	Mon Mar 28 16:03:11 2016 +0200
@@ -66,20 +66,20 @@
 	
 	# WORKAROUND:
 	# we need to make sure we have a current version of setuptools to install Kallithea's dependencies
-	pip install 'setuptools>=17.1'
+	pip2.7 install 'setuptools>=17.1' || die "Failed to install setuptools, aborting!"
 
 	# WORKAROUND:
 	# _after_ installation on --config we need a certain version of paster to create the initial config file...
-	pip install 'PasteScript==2.0.2'
+	pip2.7 install 'PasteScript==2.0.2' || die "Failed to install PasteScript, aborting!"
 	
 	# WORKAROUND:
 	# Kallithea's attempt to install Mercurial fails, so we do it first
-	pip install 'mercurial>=2.9,<3.8'
+	pip2.7 install 'mercurial>=2.9,<3.8' || die "Failed to install Mercurial, aborting!"
 	
 	# perform automatic installation, includes dependencies
 	echo
 	echo "===> output by Kallithea's setup.py"
-	python setup.py install
+	python2.7 setup.py install
 	retval=$?
 	echo "<=== Kallithea's setup.py is done, resuming ebuild code"
 	echo