Version bump, with some ebuild improvements thanks to eroen. Fixes bug #503620.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

4 files changed, 95 insertions, 17 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index 6891763a9c98..41194a5da434 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/nikola
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.16 2014/02/23 06:50:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.17 2014/03/21 10:13:50 yngwin Exp $
+
+*nikola-6.4.0 (21 Mar 2014)
+
+  21 Mar 2014; Ben de Groot <yngwin@gentoo.org> +nikola-6.4.0.ebuild,
+  metadata.xml:
+  Version bump, with some ebuild improvements thanks to eroen. Fixes bug
+  #503620.
 
 *nikola-6.3.0 (23 Feb 2014)
 
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 84d71b14b6d4..67f5da6bb5a3 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 DIST nikola-6.2.1.tar.gz 900104 SHA256 89401d321f769cc35b0a5ca92323d1655f6dedd2e6bd84ec3fc03b464f065691 SHA512 26ade8b11dc348f20404045b02cfa0f316e364f93e88f91f44a5291d74207891ac684fc5858e04eabd48c3504e22fbdcd608df4bfb57b06ebf1c58d3bf8aeed4 WHIRLPOOL 5fbd37c080ffc53b1f995b64d1b0b8939e9c495ddefcf6f5e394cd4ae75388a69f1d928955499092846f7e85b58e91ee0c8dfea1123bbecc247830628f871151
 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
 EBUILD nikola-6.2.1.ebuild 1429 SHA256 4f87c32d575f754daa2151848e7c6e199fc660eb19194bb150a1b34016022367 SHA512 7b54105e6a4fba6a75e0522e80c2496d6ef9b9a8916c9769e12e26e52c4e47ff0271d4668d0d2f3dcceec9005bbdca1913c4f827087abb3f531a8856feba29b3 WHIRLPOOL be6837eb48a0fe5ff2bb71e2b9fd871bb7fdfb5bbcaf1fee5e070040e62b38bac985b88b2947e1e3f7dafbd1bcd136acc10217e19d1d39f23e0cd1b11fc1f2b8
 EBUILD nikola-6.3.0.ebuild 1429 SHA256 793ec615da133eb9e9b148d340c4e5647843a8b1707412667b13c0cca4612d10 SHA512 85f0b5b3d01dec0cb09ce679568a628bc6d417de6f9d9b4fedfca56e7f9b323068c38f176e689e6a1c9041874589405df038ccf3d7165f9611277f23c4a9918e WHIRLPOOL 01347375731707d6a4ebab3b993060c9e87ca752e29fb6581df210f8fc9eac252003b4887fb94d41004998f6fdc52cdb548ad34096cc31da93d502c512596560
-MISC ChangeLog 2185 SHA256 36b6978335e0b1e7f4a976ec6138925fdc07826f37f4673217cad6bb7aafa233 SHA512 c4ecbe41960d8cee3e11d17a22ca004a9b510da89258c4d80df98512ceee7c4934bea34e97c36e2ba9942158eea71ee5376fe60ac758854798d91e26837a1bac WHIRLPOOL 55805a29c898069bc462efeca3545c585bdd9bbeb1046ed1c05272ae10d507b0dc80b0810b6aace38fda1947f2cf365264263bcaaab8e37022173812f587c54c
-MISC metadata.xml 737 SHA256 c42aa6f06d922dd4b4e1e904cde06b69f3b7ffb206927951403b66f0bb18ccf7 SHA512 906afff92fa645fa4785724cec475551ea780d5abc3cddfe63e6c2c387ffb27737936f93f8bf5d15b354a584822355895054066af2bbda25a7364355010093a4 WHIRLPOOL 6267a8c8d9aeaa612c60c4e41660d8aca3abc476ea492a0be82dc4f1ad2034a35f85c61b1abbc407e8c82aa275cf26605dc690504b3ab5cfbf8537f4504549dc
+EBUILD nikola-6.4.0.ebuild 2282 SHA256 0eddd15cf26416a668619240843d8fba65d554cb3812683036f3f938cb969b81 SHA512 3779576ec4d1265a63a3926cd170f8b4207617fac3c389bfd015f833aaf1a81da8a9a0421b6942cdc60fb968c7d0a0df27667c49266d9270aa88d023274e33b4 WHIRLPOOL 394c082e4461cd4de1e4918f11e4ad90b3756bf7a4348c0a04f6216fac6f4a3651acc8e007a8d3eaabe64a1241f0afaf49300e483edaa6a103d7f203107d89e1
+MISC ChangeLog 2385 SHA256 4b97d7c7d28f9b26adbe2ec69d1bb988b85547160dee721aaee2fcc924ca9940 SHA512 21e47ee28d9b603f0b0298e4bcd3b5c78de3e66bb4dde6f2647e781a993ce003ac16fa176f48571de48cb649f39f6cd9fb9bf99334ed16854da2a910c584c30e WHIRLPOOL f444bb099662628e066fca657ef1c067816dccf26a3324b927bdf01d5f10840187563f679a3199cfde1e0087376e34b11ef2e98cb34f7abaf024ab16bb02f3a4
+MISC metadata.xml 934 SHA256 8220938b114b0295cff48365b909ddd2f935d29730e90e724d8cd317d8f40890 SHA512 30accf22f63e03718eef2187048e6a9ac275e5618e38b2b65e8721e382ca774ec83120f943280a9538f62eb5caa3906ec0a89ec428d2ac28e0b565a142518ab5 WHIRLPOOL d79411c07fd16b34cd86258437a7b79627c9dae0a55ce3441905ccece979028099e6115c22ee8959462b3b1f9223b3151e29c91f41dfc0ce2c3e25949e00e877
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTCZpTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTLBDkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2jL4P/1qyiL5j8rYaaCFz+/7oJGf6
-xf6fcbSPbZGCiyeeOAiB9dLXeNQb/ZcEzUjrOYQ2/GNw9cHQdwzJA8uqdYIx9wuX
-i2f0YBs6F96U9kcK9YhV9F9rW66dH9Wh26Xayawg4dTyQGdB4JdaXqZKAcTx/QlB
-ET4Cp/DzbpHLKhScI7esq3/XjAsqYItfUitN6iWnCiryXZTZ5Ec/qXPkbdqq5N7W
-EatvQUv62FHj0Vqi+1IiX/oNTXLJDI6KwNLuJiZt3i8/6kmtxxfNWq6MzEC8pPjZ
-2P7M4+EKSZrTDx9oUuHG/hwuoIyOFUHzyMGFFIdVczAKGMAyptK4cbL5ln9tVrc5
-q8gMEDfzMAE9cClmr7qFLVA9NF/T5HQe2X/j8TfJ4R0PRgQRg/jNXLcBso7eVHbe
-csNpXHjIUSKvfylwG8ytYt4O/bCJYg5veJWdHCIw/53OXIgT7l6A7UPV2O7L7G1K
-lO3Nd3bR4YbumY0aEjOlHBjce4MOqK+gMgwvezeH+BEz0jDirisFIcEFm4HWRt/y
-c1bF+mlz74ndrkRts+UOYhIY8fFkFdfUd0eQolPAdKxZIGdagfyghQD+5/2XJaxT
-jphRiIBvfCp5m7j2demOjzdHdzCy/BH/aH1pClQebCgqiXYW9f5BPy37upDm8aGe
-NbRVgDy2/FufsPrlXjzi
-=VVCi
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2liIP/idhUxR1ikcx9TwsZEwNLFIq
+cWq5Pieo3bm8j24C7MVVp70HO3EbH1tQl5fxwzBFBzCQgbHqPklYR1Cl3asObiZs
+Jo10dObivvlhFwDquTLPUWAQHJ/oK7p5aUlW24VFlgrocHeGTry1gIESwNTxqBQz
+D95UURT0eO4FcqUrEWrluK9IhRVZmBckGNCM6WzEn6v3uxBqEpA5uXKc4kWWAEWS
+ATdV+ljlF7zUmmZ4+IXPVC9jeyf01P2Pw4phPVQ/MncqLWuj4u/TqLpXdu/IPgjA
+1yPr4nNL1QMCkEo6/TH7YzTGhTonnsWv1cnD2qJ9GbtW6U3awOcXvsJOLw/pUQ2Y
+tDUPgSVJ9r8urfqG4VivbcdpRpcIa+H7Ve9dPc00nH3pav0To5PEWNx9LqA+vmL2
+DT10EAz+fDgpK2SAVvMYstqhTRAaN6xSG2q7840IgQei1aU6BKXBB/9uLtcg+U65
+fRqUX8ArvO3r9bLCa9xWTNfWKTlB603guwUAiq4Vkoj8gl1JpzBhIqPFEkqE7iKR
+W9S9AL4lNNTd8zgzIUaCr6+lGMCnpC6UQmZteXI+woAi2fImkDM+m8z2v+p8Zvqm
+JeoZzz0jYNkas72XmlxqOkM8DyvcS06ktfSgtlx6NnfaoxjC1sONBWI7pZXJh6LZ
+IFPfpVTKuZ9KyQTD5Ubm
+=bUfd
 -----END PGP SIGNATURE-----
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 5fec1d47ec47..2dc8b630af15 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.4.0.ebuild b/www-apps/nikola/nikola-6.4.0.ebuild
new file mode 100644
index 000000000000..d5927d4846b7
--- /dev/null
+++ b/www-apps/nikola/nikola-6.4.0.ebuild
@@ -0,0 +1,63 @@
+# 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.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
+
+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 Apache-2.0" # Gutenberg
+SLOT="0"
+IUSE="assets charts hyphenation ipython jinja markdown"
+RESTRICT="test" # needs freezegun, coveralls, and phpserialize
+
+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}] )
+	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/pygments[${PYTHON_USEDEP}]
+	dev-python/PyRSS2Gen[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013d[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.10.2[${PYTHON_USEDEP}]
+	virtual/python-imaging[${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}] )"
+# more options as packages will be added:
+#	livereload? ( dev-python/livereload[${PYTHON_USEDEP}] )
+#	micawber? ( dev-python/micawber[${PYTHON_USEDEP}] )
+#	typogrify? ( dev-python/typogrify[${PYTHON_USEDEP}] )
+
+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/*
+}