Update homepage (bug #497634); remove old

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

4 files changed, 9 insertions, 113 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index a0487c7ea954..d52cc4574bdc 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,10 @@
 # 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.14 2013/11/03 02:28:10 yngwin Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.15 2014/01/20 10:37:59 yngwin Exp $
+
+  20 Jan 2014; Ben de Groot <yngwin@gentoo.org> -nikola-6.1.1.ebuild,
+  -nikola-6.2.0.ebuild, nikola-6.2.1.ebuild:
+  Update homepage (bug #497634); remove old
 
 *nikola-6.2.1 (03 Nov 2013)
 
diff --git a/www-apps/nikola/nikola-6.1.1.ebuild b/www-apps/nikola/nikola-6.1.1.ebuild
deleted file mode 100644
index e50304357d0a..000000000000
--- a/www-apps/nikola/nikola-6.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.1.ebuild,v 1.1 2013/10/21 04:45:08 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/*
-}
diff --git a/www-apps/nikola/nikola-6.2.0.ebuild b/www-apps/nikola/nikola-6.2.0.ebuild
deleted file mode 100644
index d260b6de7204..000000000000
--- a/www-apps/nikola/nikola-6.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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/*
-}
diff --git a/www-apps/nikola/nikola-6.2.1.ebuild b/www-apps/nikola/nikola-6.2.1.ebuild
index d1259dcd622e..516991a1e5c7 100644
--- a/www-apps/nikola/nikola-6.2.1.ebuild
+++ b/www-apps/nikola/nikola-6.2.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.2.1.ebuild,v 1.1 2013/11/03 02:28:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/nikola-6.2.1.ebuild,v 1.2 2014/01/20 10:37:59 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/"
+HOMEPAGE="http://getnikola.com/"
 MY_PN="Nikola"
 
 if [[ ${PV} == *9999* ]]; then