Version bump and major overhaul of the ebuild

3 files changed, 67 insertions, 1 deletions

diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index 469230b2ed09..596e7cc0dd21 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -1,6 +1,8 @@
 DIST nikola-4.0.1.zip 512242 SHA256 e54c14c884334c764751cce36ca3fc65e8427b8caec883a24d0c255552dfee48 SHA512 cab2da13aad9d0bd05445cd06ae9fc63a5a5ad62e6d098ca01a1efd8ffc5e975e9c6cc9432d732a2acf333d86051ab0d2bbf4fa9061a108ae18cde56b6cf63ae WHIRLPOOL 431f81d9fcb71dc8bb96edb133b7e314ac3421ce704f7cfe58d978a05f52a204e5d0e4387a47adc154ff962a5a330185bf0384fb2bdf736186eb5e944dc7f642
 DIST nikola-4.0.3.zip 546911 SHA256 462d6f298b905a06cb1196d98c75f1fd5c295522c25714eb483227283b54e6eb SHA512 2bd32ca355f718444124af372d3ca11a5781f4dca32151926180d642fb4a144245b07692c5aef2366fe6103394bb55beadef3a353f11b8a154c916d801c03b03 WHIRLPOOL 7eb240aaed02e0177968011c7d2df11506c3c2c8264a609bdf8ef104ca6536a4f83c52f165600868a66e28c88db967664718154935d8b120c19c353bf0c0936b
+DIST nikola-5.1.zip 636751 SHA256 4103fb1bcddfbfa569290528000c3166acad92b810878a4aa720735489782652 SHA512 af3fe7faed4e56f0eca76a89eae5addc91a77d1c0f37702fc5605a6245c2ec9e644c96a70d5d208958d32cd5c654c52a1a9c50fc2132fd33c2f24a5de7969c72 WHIRLPOOL e2b67f56069d3b87fd8245d51b443fe71fc9e228c2c4de514be958447817e56c1e447ea2de1d92b786d0117d53d240651ba7fce402949845e10981bd71f0c94f
 EBUILD nikola-4.0.1.ebuild 821 SHA256 ab58c377e0d593c13c968cb797b2b6c5ab78d674e40d3581e8c8e1ba3b51b96e SHA512 a5072e3780b6cb568b3dd26c49f2f9adea1db06c5c5e3a3af15cd19e907465b52c6a1bf1a227a056be52efa119ee7025720ffe5eb06e2d68e5cf16ce24b2e5e9 WHIRLPOOL 008b3cef1716355b0ef7958a5805191ba4d2e7c87546c767df0bb63e6b6601026288d630cf0caba33709ec400d68437420548b7042b0494b49c252e2705ec2e1
 EBUILD nikola-4.0.3.ebuild 821 SHA256 b5c6e7fa9c161de1207ac210d99c73ffcea04fbed7313b928b9785b1d1b0b521 SHA512 d070a9b8ebd6c66719be87c376d5cc79ac5860a3f510ca629e386a2666cedbdae763df45c1c7d85519bd1b8536ab4421c7bbb1a02beebe7cdcb7e4e4518dcff7 WHIRLPOOL 480e380a6637cd1f0081cda36c2b1c75538de4bc9916d66c185283946a74e32b50f65c72a94d05e5b6fda88f0153adaf089a8aa2cce328ee306aa36939e6201e
+EBUILD nikola-5.1.ebuild 1454 SHA256 7394002ff28fc0959fe07dc41ae870a35caeda49fec5ebcc6690cadc087c32d1 SHA512 afb18a3003fe96ffd652887487cd4fc70a8bf4f6f311249098cfaa959c388b073c26b369b0c64b3204e68feb9642aad1a4ce56e1f3e5a834687c4d00ca37de48 WHIRLPOOL 57cc9e330687175fe8ad12c3c54f1e1b6e3afdb78f84b97558c8f20f0d1ea53f904262a964b4f933f55445229cb5848938ffb341e8d1fa38123484cbb1abfdbb
 MISC ChangeLog 841 SHA256 d18308a8fcbfa384aba552fb58691fa83908f8e5f7775c8bd4c14bea01611c7c SHA512 9fdd1b1bfd04208ed44fa8e40c01ec3d44d5335c3721cac3420d9fbae75060bc090ee946af480568f4394d1331bd95af28b4c078a41c0af45e5522ca62868801 WHIRLPOOL 39674a3b4ed136c6bcc9e8b6c0d4af8ad979cc2ab9f794c39570fe35997b1291faaa398729939d07456f6364806feb76a451fe6f94e5af92e5c4a7008630a98b
-MISC metadata.xml 259 SHA256 3d6cf397ee3ffe54da22c27a1cc87794c6e81e4939bb95facd7a0cfb344d6c8f SHA512 8267c7aecd866ea7616a48a4ea006a8eac7b134c02ae996a7e9f690f465ac3a330984fb97f55bcc72f792faaaee4dff2178c7bd38fb8fb3796329c508899d900 WHIRLPOOL 1701b88f3ed993eaa67a14d457a7587c1a3dff0e750e2e897a0961c9618f09c5b49ed9e418b78e885bccdf1c83b03e2706133c7d624ff189e32b9834769217cf
+MISC metadata.xml 524 SHA256 57a417f10209eed54e414ef7003d03e37f16fcd8d40fa5605dedf4cf884bf336 SHA512 a48e4a2f2537f721134828c17b60776fde5113d75c19ef4f68a51af4fbf67b92a63f230edab2a5a030bc6f1495f74b91db4b295078930f26bfced4dd3151b693 WHIRLPOOL eb08decce756be7fb210543dfb9ddd26126d482930fe3a6825f6d12722b6b2646b5950cdcbdb1d52b1752059eaddb6dc0d8617759bd0e70ca133c951399980d7
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 9e2b2f1d253a..274957c9043e 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -6,4 +6,13 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
+  <use>
+    <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-5.1.ebuild b/www-apps/nikola/nikola-5.1.ebuild
new file mode 100644
index 000000000000..4f2fada22360
--- /dev/null
+++ b/www-apps/nikola/nikola-5.1.ebuild
@@ -0,0 +1,55 @@
+# 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-5.1.ebuild,v 1.1 2013/02/02 11:13:28 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} ) # 3_2 should be possible now, but untested
+inherit distutils-r1
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="http://nikola.ralsina.com.ar/"
+
+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"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="jinja markdown"
+
+DEPEND="dev-python/docutils" # 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 )"
+
+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 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
+}