nikola - merge changes from gentoo, drop 6.3.0

4 files changed, 13 insertions, 61 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index a52d027..40760d6 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,2 +1 @@
-DIST nikola-6.3.0.tar.gz 932981 SHA256 92680bf745eefe9778b002d487e32721c35a1b997582981944a0bb64e249a2c6 SHA512 10909f3d615df71b751c96f408ed07c4d8f1000024a12c806b61bc7c931efb60b3e09060cd6b92aa0d613e21e6b0fdd96671bddea84614d586a804749ec3b7b8 WHIRLPOOL 86ccd29abb5f8ca770a043e67be5ab30977329a78821808f3d75917cd7438543f81a2e380d9bec0ac58e0ba07e2934e2a6a3df2b505021496e1a60eef9d19f13
 DIST nikola-6.4.0.tar.gz 1006412 SHA256 b1057645ddffc99ae9cb8d29edbe9ed51a9b6a066ba5512564787d39ac3f59dc SHA512 37b94d996dbc1d6b60d48a6d8d7483e8aa81dff0f4f928518c4823827b02571e8414780ba61137ac4bf5c6563fe5e3a11d56b58e04dae4329d1b6624d94f201a WHIRLPOOL e05fba4413a74aaad26ae55af464a031d4376c7b65a16523e5d50adb8e695af229ee41a0ae80d2d0758396688cbf9c53047b48f0b8512844eb220f45590ffcb8
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 5fec1d4..2dc8b63 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -13,6 +13,12 @@
     <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
diff --git a/www-apps/nikola/nikola-6.3.0.ebuild b/www-apps/nikola/nikola-6.3.0.ebuild
deleted file mode 100644
index 05f1ee3..0000000
--- a/www-apps/nikola/nikola-6.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-6.3.0.ebuild,v 1.1 2014/02/23 06:50:54 yngwin Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="A static website and blog generator"
-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="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="assets charts jinja markdown"
-
-DEPEND="dev-python/docutils" # needs rst2man to build manpage
-RDEPEND="${DEPEND}
-	python_targets_python2_7? ( >=dev-python/configparser-3.2.0 )
-	>=dev-python/doit-0.23.0
-	dev-python/logbook
-	dev-python/lxml
-	>=dev-python/mako-0.6
-	dev-python/pygments
-	dev-python/PyRSS2Gen
-	dev-python/python-dateutil
-	>=dev-python/pytz-2013d
-	>=dev-python/requests-1.0
-	dev-python/unidecode
-	>=dev-python/yapsy-1.10.2
-	virtual/python-imaging
-	assets? ( dev-python/assets )
-	charts? ( dev-python/pygal )
-	jinja? ( >=dev-python/jinja-2.7 )
-	markdown? ( dev-python/markdown )"
-
-src_install() {
-	distutils-r1_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.rst docs/*.txt
-	doman docs/man/*
-}
diff --git a/www-apps/nikola/nikola-6.4.0.ebuild b/www-apps/nikola/nikola-6.4.0.ebuild
index da34627..8e75b54 100644
--- a/www-apps/nikola/nikola-6.4.0.ebuild
+++ b/www-apps/nikola/nikola-6.4.0.ebuild
@@ -3,9 +3,7 @@
 # $Header: $
 
 EAPI=5
-# >=2.7 >=3.3
-# PyRSS2Gen, assets -3.3
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 ) # 3_3 needs PyRSS2Gen update
 inherit distutils-r1
 
 DESCRIPTION="A static website and blog generator"
@@ -25,15 +23,15 @@ fi
 # CC-BY-NC-SA-2.5: conf.py.in
 LICENSE="MIT-with-advertising Apache-2.0 CC-BY-NC-SA-2.5"
 SLOT="0"
-IUSE="assets charts jinja markdown minimal"
+IUSE="assets charts hyphenation ipython jinja markdown minimal"
 RESTRICT=test
 
 # needs rst2man to build manpage
 DEPEND="dev-python/docutils
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="app-arch/gzip
-	dev-python/blinker[${PYTHON_USEDEP}]
 	python_targets_python2_7? ( >=dev-python/configparser-3.2.0[python_targets_python2_7] )
+	dev-python/blinker[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	>=dev-python/doit-0.23.0[${PYTHON_USEDEP}]
 	dev-python/logbook[${PYTHON_USEDEP}]
@@ -47,9 +45,12 @@ RDEPEND="app-arch/gzip
 	>=virtual/python-imaging-2[${PYTHON_USEDEP}]
 	assets? ( dev-python/assets[${PYTHON_USEDEP}] )
 	charts? ( dev-python/pygal[${PYTHON_USEDEP}] )
+	hyphenation? ( dev-python/pyphen[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-1.0.0[${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7[${PYTHON_USEDEP}] )
 	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	!minimal? ( dev-python/python-dateutil[${PYTHON_USEDEP}]
+	!minimal? ( dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.0[${PYTHON_USEDEP}] )"
 ### test:
 # dev-python/coverage