Version bump, with some ebuild improvements from Wicher Minnaard in bug 485688

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

3 files changed, 67 insertions, 1 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index be7eed37c82f..1b4074910002 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/nikola
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.10 2013/06/09 19:03:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.11 2013/10/06 06:36:28 yngwin Exp $
+
+*nikola-6.1.0 (06 Oct 2013)
+
+  06 Oct 2013; Ben de Groot <yngwin@gentoo.org> +nikola-6.1.0.ebuild,
+  metadata.xml:
+  Version bump, with some ebuild improvements from Wicher Minnaard in bug 485688
 
   09 Jun 2013; Mike Gilbert <floppym@gentoo.org> nikola-5.1.ebuild,
   nikola-5.2.ebuild:
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 274957c9043e..5fec1d47ec47 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -7,6 +7,12 @@
     <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='jinja'>
       Add support for <pkg>dev-python/jinja</pkg> as alternative templating
 	  engine to Mako
diff --git a/www-apps/nikola/nikola-6.1.0.ebuild b/www-apps/nikola/nikola-6.1.0.ebuild
new file mode 100644
index 000000000000..18cf4ed1c671
--- /dev/null
+++ b/www-apps/nikola/nikola-6.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-6.1.0.ebuild,v 1.1 2013/10/06 06:36:28 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+inherit distutils-r1
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="http://nikola.ralsina.com.ar/"
+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/*
+}