version bump; remove old

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

3 files changed, 16 insertions, 72 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index e891506b240b..b0307a9b7728 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2014/11/25 13:29:56 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.24 2015/01/31 09:42:30 yngwin Exp $
+
+*nikola-7.3.0 (31 Jan 2015)
+
+  31 Jan 2015; Ben de Groot <yngwin@gentoo.org> +nikola-7.3.0.ebuild,
+  -nikola-6.4.0-r1.ebuild, -nikola-7.1.0.ebuild:
+  version bump; remove old
 
   25 Nov 2014; Pacho Ramos <pacho@gentoo.org> nikola-7.2.0.ebuild:
   Support python 3.4
diff --git a/www-apps/nikola/nikola-6.4.0-r1.ebuild b/www-apps/nikola/nikola-6.4.0-r1.ebuild
deleted file mode 100644
index bf92b91360af..000000000000
--- a/www-apps/nikola/nikola-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,63 +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.4.0-r1.ebuild,v 1.1 2014/09/30 05:49:59 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 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[python_targets_python2_7] )
-	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-1.1[${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/webassets[${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/*
-}
diff --git a/www-apps/nikola/nikola-7.1.0.ebuild b/www-apps/nikola/nikola-7.3.0.ebuild
index de07038520bf..00445e658ddd 100644
--- a/www-apps/nikola/nikola-7.1.0.ebuild
+++ b/www-apps/nikola/nikola-7.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.1.0.ebuild,v 1.2 2014/11/24 08:56:24 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-7.3.0.ebuild,v 1.1 2015/01/31 09:42:30 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit distutils-r1
 
 DESCRIPTION="A static website and blog generator"
@@ -32,22 +32,23 @@ RDEPEND="${DEPEND}
 	>=dev-python/logbook-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
 	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
-	>=dev-python/natsort-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
 	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
 	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.4[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-5.4.1[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
 	>=dev-python/yapsy-1.10.423[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]
 	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
-	charts? ( >=dev-python/pygal-1.4.6[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-1.6.1[${PYTHON_USEDEP}] )
 	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
 	ipython? ( >=dev-python/ipython-1.2.1[${PYTHON_USEDEP}] )
 	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
 	markdown? ( >=dev-python/markdown-2.4.0[${PYTHON_USEDEP}] )"
 # more options as packages will be added:
-#	livereload? ( =dev-python/livereload-2.2.1[${PYTHON_USEDEP}] )
+#	livereload? ( =dev-python/livereload-2.3.2[${PYTHON_USEDEP}] )
 #	micawber? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
 #	typogrify? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] )