www-apps/nikola: update live ebuild

2 files changed, 57 insertions, 29 deletions

diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 9e2b2f1..2dc8b63 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -6,4 +6,25 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <use>
+    <flag name='assets'>
+      Support web asset management through <pkg>dev-python/assets</pkg>
+    </flag>
+    <flag name='charts'>
+      Support chart generation through <pkg>dev-python/pygal</pkg>
+    </flag>
+	<flag name='hyphenation'>
+      Add hyphenation support through <pkg>dev-python/pyphen</pkg>
+    </flag>
+	<flag name='ipython'>
+      Add IPython notebook compilation and LESS support
+    </flag>
+    <flag name='jinja'>
+      Add support for <pkg>dev-python/jinja</pkg> as alternative templating
+	  engine to Mako
+    </flag>
+	<flag name='markdown'>
+      Add support for Markdown as alternative markup language to reStructuredText
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/www-apps/nikola/nikola-9999.ebuild b/www-apps/nikola/nikola-9999.ebuild
index b289cef..e6b81b7 100644
--- a/www-apps/nikola/nikola-9999.ebuild
+++ b/www-apps/nikola/nikola-9999.ebuild
@@ -1,42 +1,55 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.3.1.ebuild,v 1.1 2015/03/25 15:13:00 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} ) # 3_2 should be possible now, but untested
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A static website and blog generator"
-HOMEPAGE="http://nikola.ralsina.com.ar/"
+HOMEPAGE="http://getnikola.com/"
+MY_PN="Nikola"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-2
 	EGIT_REPO_URI="git://github.com/ralsina/${PN}.git"
 	KEYWORDS=""
 else
-	SRC_URI="http://nikola-generator.googlecode.com/files/${P}.zip"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="MIT-with-advertising"
+LICENSE="MIT-with-advertising Apache-2.0" # Gutenberg
 SLOT="0"
-IUSE="jinja markdown"
+IUSE="assets charts hyphenation ipython jinja markdown"
+RESTRICT="test" # needs freezegun, coveralls, and phpserialize
 
-DEPEND="dev-python/docutils" # needs rst2man to build manpage
+DEPEND=">=dev-python/docutils-0.12[${PYTHON_USEDEP}]" # needs rst2man to build manpage
 RDEPEND="${DEPEND}
-	=dev-python/configparser-3.2.0*
-	>=dev-python/doit-0.20.0
-	dev-python/imaging
-	dev-python/lxml
-	>=dev-python/mako-0.6
-	>=dev-python/mock-1.0.0
-	dev-python/pygments
-	dev-python/PyRSS2Gen
-	dev-python/requests
-	dev-python/unidecode
-	dev-python/yapsy
-	jinja? ( dev-python/jinja )
-	markdown? ( dev-python/markdown )"
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	~dev-python/doit-0.27.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	~dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( ~dev-python/pygal-1.7.0[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
+# more options as packages will be added:
+#	livereload? ( =dev-python/livereload-2.3.2[${PYTHON_USEDEP}] )
+#	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+#	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )
 
 src_install() {
 	distutils-r1_src_install
@@ -44,12 +57,6 @@ src_install() {
 	# hackish way to remove docs that ended up in the wrong place
 	rm -rf "${D}"/usr/share/doc/${PN}
 
-	dodoc AUTHORS.txt CHANGES.txt README.md docs/*.txt
-}
-
-pkg_postinst() {
-	if has_version '<www-apps/nikola-5.0'; then
-		elog 'Nikola has changed quite a lot since the previous major version.'
-		elog 'Please make sure to read the updated documentation.'
-	fi
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.txt
+	doman docs/man/*
 }