version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!

3 files changed, 77 insertions, 16 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index ca3738517a55..efacefc04b6c 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2013/10/21 04:45:08 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.13 2013/10/25 16:38:39 yngwin Exp $
+
+*nikola-6.2.0 (25 Oct 2013)
+
+  25 Oct 2013; Ben de Groot <yngwin@gentoo.org> +nikola-6.2.0.ebuild:
+  version bump
 
 *nikola-6.1.1 (21 Oct 2013)
 
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index e8cf240a84db..b84b12592662 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -2,25 +2,27 @@
 Hash: SHA256
 
 DIST nikola-6.1.1.tar.gz 878296 SHA256 9555f6d9ec6f6db63bae10e79886167f01dd2723a89325897550f6ed773cba7a SHA512 1bd26aa1e41dad293d616a530b4ec116c360d60bfd16ec44d31b4c3f6f1aab3a3ebc341f77a308cdd4f55a7ecfd5a6499865746f7dbae97a9cf6efdf32fbaae7 WHIRLPOOL 657b0f24b03935e506eb5fd035c273b3fd72417286017a4843919cda281b8921145c41c6288409984b09c3fc2a945489ace66331bd820ff0b67483ed7ef50e4f
+DIST nikola-6.2.0.tar.gz 897034 SHA256 7aa7f91ccd9e7c33a52e523b21f4982dc40181e156cc8d9a603c0831344f57d6 SHA512 b5388ce1cbda37bbb3f4180f93471466e3eafc43c7de8b20892d9a4a827898ac4530847dd8226fb12e5323dbf8cc80ad5631434bf63078c407221426d1840472 WHIRLPOOL 982ca9f277d2f55403995bed4df255fab9af887e236b1e4c523a91d348df0c161b5b873d4299d33ace961bbfc6c52ceb690db6948d29a66d01ec9d32ccf96576
 EBUILD nikola-6.1.1.ebuild 1437 SHA256 2ec2b48291cd36044e717f2ed4cc01179035fa324372b61588e07f9ab553ef24 SHA512 4faf020291309891d1f89e5085c1aa4765affc90dc8e9df2e20d11504ddd9ff44d5316ccc148a0b0121f8cb1829b60e3c0604e4a45db5256002b5fae5fd39ebc WHIRLPOOL 8c6b1bdd7c583b19771281fca8b559c83a1fb09ad8f6dad26cf198f38391f30dc17f9889132bb406699d450c84e1a059640bcbbd05248cfacececfbfe36e4bbd
-MISC ChangeLog 1680 SHA256 2c63db15a7b1d3c0f8b01836c003793170ef95229f5f903d09a01f9988506a40 SHA512 5721ba1ae4a5a291ec6709999b9102297fe66bbc36c135c8e86e367175cd88f09c8d9f0e2ec0a41376cb29d3aacc8308e14069865092f9b5814f9929b92e2e1f WHIRLPOOL e1aa62a27a4a41ba2d038be52586816b4c77ef41d7794ae01615bc3be628bfec3a60f4a3e3f0b3203115e83f4da93ada0b895403b4f49ac3a312ca9b5b478948
+EBUILD nikola-6.2.0.ebuild 1437 SHA256 624b8ddea70318c33ed2f16c9584f3474405b1e1325b576a512aa819d72e518c SHA512 763bc4121a8a598b8caa14b415ef822c3edcda6c3482c00cbf56bbc91a3c4fc5884b1f390b0442393608cc4045fbf18ac0dc288d70800cb6b4d86f3ed031bc49 WHIRLPOOL f3c726c5f3edda41b7542ab23814fc7fe04becea30398ee7bb13bb6160a7331f50869f1089ea3f4ecb971ca9b7a4faa70d528b7a77cfedbb217c92709bee19d1
+MISC ChangeLog 1795 SHA256 e01378052b03a33fc90c73d593ec3a15d955c8af42c6cb2945ecff969a4fb3c7 SHA512 11b84d531d6dc6865de350e9c49b8aa2537b046d97ab004d9e32380b2772144fe8aa9ecd6238a9b646cf708d961866b96fe612086e3beb5c372f788b143f7532 WHIRLPOOL 2acc47d446ced80153d19c2e56d3ef54d6de3b15ae0bd2ec4013d3861d55db06efb338e5154ca5a37fd0dfa5f7bf1984833584e860978a797f9c5a80984a1a00
 MISC metadata.xml 737 SHA256 c42aa6f06d922dd4b4e1e904cde06b69f3b7ffb206927951403b66f0bb18ccf7 SHA512 906afff92fa645fa4785724cec475551ea780d5abc3cddfe63e6c2c387ffb27737936f93f8bf5d15b354a584822355895054066af2bbda25a7364355010093a4 WHIRLPOOL 6267a8c8d9aeaa612c60c4e41660d8aca3abc476ea492a0be82dc4f1ad2034a35f85c61b1abbc407e8c82aa275cf26605dc690504b3ab5cfbf8537f4504549dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSZLFaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSap6RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dziluw1UP/1FAFTLwvPjDXmpMABL26m6z
-PlfS0pctuTs0hT4rXoetXClaYLdl9GLxXb7i+/s9jryxHbuDrh1T5AktM+c4+G/V
-GQpp3vIbxUYVzXJJcQnDZsvmzHTqc4RfPqtYTXZpQEyalfTyqyfwyna3yZxXWKz9
-O6mByfE5huUlmiWYFOqp9xBTGN7kOrR4LKSOXpeNbSkNQueTue+J05WTT7luopno
-Utxi/Gxkbj09+sNSJTFz5fPN0zhH3dIn7or08ttTFSDGPX1yknAYh5OXD31kFr07
-vMomxkRQNhNJyfUHdaaGnnw3WFEVRwgE3irMjQ7SB6lIu/YuSjmkNBsXJWGMyi1d
-hDeMi45vd75MN+Nb9oF1LTae/pS6ogay4R7fNKNEaNHjMHVXs0tt83K+lN6PHv1h
-JJWIfWrI4IqMM3AKckKDG01kJ23vW1kNZv4AxJdqrbNblTg6FZw/7pSXT8uDfLuT
-qnD8yyr4LjYs2QDDu/6z64RWqkuzTYgbzQvoA5c5NAi1fUgk+O/Lp30S7/kNnvPR
-rY1K1uPR0kcyvQ8UauSkA//wD1EfkJ+fCbj6uZhd3d1mhk/kPZAjmoKS0jTgH00M
-E9begHXIhuJybZF6hT+ZpdEmf3qFVuut20aFVSo5rW2nfMHhD6CmJuig9GvdQ5Nu
-sBnFS8tXL1Y0xL2e+cXK
-=5efs
+QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu6MQP/j99HD5HU2Vs91O+9KXZqA8J
+rGfdlzXfgjnvEUXup2M3kADIN+3XskiZsgN9ymeFowo/Y+fT4+Ql7eRGzvx9EjTn
+yU5ZCrMW6awm1EaRm4sGI/j62Ghw1PcmnLCBe8ofClguZ17EP5iwz+7e3ASVu7k3
+VI2E0LYtzIcG7ARSu15HVnicXFlQbS+rX7u+wgh8vmM5H/y0c4M6AxqZnk1jX6U0
++JgCYpzEtnYBUyQXydQlVC3osMFsESL1rKS2u5AkbU7b/SVBVtNlrGCR3jtrUPgq
+nex5XuhQ+ldI4Eem5ojD65gggqcfiAA88uPGdY63XJuib6VcyvauXr4DH0n0AkJ4
+BUA0CsgLFCp+2hh62x2m1goesmKsB2vy1hgi68TQXdIKqdJCXL84q6s3XIssj26T
+mqhfW+kgIZnDTKoWF3emy+yOtc5vNzOXegzTsPnEbdjL5IVPBmWoIhTZC2/9SfX0
+HqtD10BqhWwrHExyh4IEOM/aoIYxgle/y1jtn0LJc4C2YYuFdmcmG+1jXaAPtTxc
+BFA/XXfjuxfA3AefvT7KJJF/C4r2FLoyedrzBGQM6COXf5/Wpn55Vsep3StBnC9C
+cAeyF7HkLA9qT9Nths9aRyfnPnVYmLq5jWCRJgw1za+xkG4vE8mGxCatz7HMvLdh
+rNUyR5iyUhMUPsbhcQJJ
+=D15j
 -----END PGP SIGNATURE-----
diff --git a/www-apps/nikola/nikola-6.2.0.ebuild b/www-apps/nikola/nikola-6.2.0.ebuild
new file mode 100644
index 000000000000..d260b6de7204
--- /dev/null
+++ b/www-apps/nikola/nikola-6.2.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.2.0.ebuild,v 1.1 2013/10/25 16:38:39 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/*
+}