Version bump. Clean out old versions.

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

4 files changed, 8 insertions, 112 deletions

diff --git a/www-apps/nikola/ChangeLog b/www-apps/nikola/ChangeLog
index 1b4074910002..ca3738517a55 100644
--- a/www-apps/nikola/ChangeLog
+++ b/www-apps/nikola/ChangeLog
@@ -1,6 +1,12 @@
 # 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.11 2013/10/06 06:36:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/nikola/ChangeLog,v 1.12 2013/10/21 04:45:08 yngwin Exp $
+
+*nikola-6.1.1 (21 Oct 2013)
+
+  21 Oct 2013; Ben de Groot <yngwin@gentoo.org> +nikola-6.1.1.ebuild,
+  -nikola-5.1.ebuild, -nikola-5.2.ebuild, -nikola-6.1.0.ebuild:
+  Version bump. Clean out old versions.
 
 *nikola-6.1.0 (06 Oct 2013)
 
diff --git a/www-apps/nikola/nikola-5.1.ebuild b/www-apps/nikola/nikola-5.1.ebuild
deleted file mode 100644
index 9f5a5b2ba529..000000000000
--- a/www-apps/nikola/nikola-5.1.ebuild
+++ /dev/null
@@ -1,55 +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-5.1.ebuild,v 1.4 2013/06/09 19:03:24 floppym 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
-	virtual/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
-}
diff --git a/www-apps/nikola/nikola-5.2.ebuild b/www-apps/nikola/nikola-5.2.ebuild
deleted file mode 100644
index 019a7c855b3e..000000000000
--- a/www-apps/nikola/nikola-5.2.ebuild
+++ /dev/null
@@ -1,55 +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-5.2.ebuild,v 1.2 2013/06/09 19:03:24 floppym 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
-	virtual/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 AUTHORS.txt CHANGES.txt 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
-}
diff --git a/www-apps/nikola/nikola-6.1.0.ebuild b/www-apps/nikola/nikola-6.1.1.ebuild
index 18cf4ed1c671..e50304357d0a 100644
--- a/www-apps/nikola/nikola-6.1.0.ebuild
+++ b/www-apps/nikola/nikola-6.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.1 2013/10/06 06:36:28 yngwin Exp $
+# $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} )