--- /var/cache/portage/gentoo/www-apps/nikola/nikola-6.4.0.ebuild	2014-03-21 11:13:50.000000000 +0100
+++ /var/cache/portage/local/www-apps/nikola/nikola-7.0.0.ebuild	2014-05-08 16:09:21.000000000 +0200
@@ -3,19 +3,21 @@
 # $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-6.4.0.ebuild,v 1.1 2014/03/21 10:13:50 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 ) # 3_3 needs PyRSS2Gen update
-inherit distutils-r1
+PYTHON_COMPAT=( python{2_7,3_3} )
+inherit distutils-r1 versionator
 
 DESCRIPTION="A static website and blog generator"
 HOMEPAGE="http://getnikola.com/"
 MY_PN="Nikola"
+MY_PV=$(replace_version_separator '_' '-')
+MY_P="${PN}-${MY_PV}"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -26,13 +28,14 @@
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]" # needs rst2man to build manpage
 RDEPEND="${DEPEND}
-	python_targets_python2_7? ( =dev-python/configparser-3.2.0*[${PYTHON_USEDEP}] )
+	python_targets_python2_7? ( =dev-python/configparser-3.2.0*[python_targets_python2_7] )
 	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	>=dev-python/doit-0.23.0[${PYTHON_USEDEP}]
 	dev-python/logbook[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	>=dev-python/mako-0.6[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.2[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyRSS2Gen[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
@@ -41,7 +44,7 @@
 	dev-python/unidecode[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.10.2[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]
-	assets? ( dev-python/assets[${PYTHON_USEDEP}] )
+	assets? ( dev-python/webassets[${PYTHON_USEDEP}] )
 	charts? ( dev-python/pygal[${PYTHON_USEDEP}] )
 	hyphenation? ( dev-python/pyphen[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-1.0.0[${PYTHON_USEDEP}] )
@@ -52,6 +55,8 @@
 #	micawber? ( dev-python/micawber[${PYTHON_USEDEP}] )
 #	typogrify? ( dev-python/typogrify[${PYTHON_USEDEP}] )
 
+S="${WORKDIR}/${MY_P}"
+
 src_install() {
 	distutils-r1_src_install