remove missed old, fix typo

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

4 files changed, 4 insertions, 159 deletions

diff --git a/dev-python/colander/ChangeLog b/dev-python/colander/ChangeLog
index 2fe462cb75c5..b322806e9f22 100644
--- a/dev-python/colander/ChangeLog
+++ b/dev-python/colander/ChangeLog
@@ -1,13 +1,14 @@
 # ChangeLog for dev-python/colander
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.13 2014/12/07 10:45:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/ChangeLog,v 1.14 2014/12/07 10:50:33 idella4 Exp $
 
 *colander-1.0 (07 Dec 2014)
 
   07 Dec 2014; Ian Delaney <idella4@gentoo.org> +colander-1.0.ebuild,
   -colander-1.0_alpha1-r1.ebuild, -colander-1.0_alpha1.ebuild,
-  -colander-1.0_beta1.ebuild:
-  clean old impl, add pypy3, add new dep for tests, tm old
+  -colander-1.0_beta1.ebuild, -colander-0.9.7.ebuild, -colander-0.9.8.ebuild,
+  -colander-0.9.9.ebuild:
+  clean old impl, add pypy3, add new dep for tests, rm old
 
 *colander-1.0_beta1 (21 Aug 2014)
 
diff --git a/dev-python/colander/colander-0.9.7.ebuild b/dev-python/colander/colander-0.9.7.ebuild
deleted file mode 100644
index b0522bef38dd..000000000000
--- a/dev-python/colander/colander-0.9.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.7.ebuild,v 1.1 2012/04/08 19:33:43 floppym Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_install() {
-	distutils_src_install
-
-	# The docs do not currently build for me and depend on a theme
-	# only available from git that contains hardcoded references
-	# to files on https://static.pylonsproject.org/ (so the docs
-	# would not actually work offline). Include the source, which
-	# is at least somewhat readable.
-
-	docinto docs
-	dodoc docs/*.rst
-}
diff --git a/dev-python/colander/colander-0.9.8.ebuild b/dev-python/colander/colander-0.9.8.ebuild
deleted file mode 100644
index fd91be31f359..000000000000
--- a/dev-python/colander/colander-0.9.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.8.ebuild,v 1.2 2012/05/08 18:18:00 xarthisius Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Remove pylons theme since it's not included in source
-	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		# https://github.com/Pylons/colander/issues/38
-		PYTHONPATH="." emake -C docs html SPHINXOPTS=""
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}
diff --git a/dev-python/colander/colander-0.9.9.ebuild b/dev-python/colander/colander-0.9.9.ebuild
deleted file mode 100644
index ea5764f5b52e..000000000000
--- a/dev-python/colander/colander-0.9.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/colander/colander-0.9.9.ebuild,v 1.1 2012/10/09 09:17:59 patrick Exp $
-
-EAPI=4
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 3.1"
-DISTUTILS_SRC_TEST=nosetests
-
-inherit distutils
-
-DESCRIPTION="A simple schema-based serialization and deserialization library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/colander/en/latest/ http://pypi.python.org/pypi/colander"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-# MIT license is used by included (modified) iso8601.py code.
-LICENSE="repoze MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# Depend on an ebuild of translationstring with Python 3 support.
-RDEPEND=">=dev-python/translationstring-1.1"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Remove pylons theme since it's not included in source
-	sed -e "/# Add and use Pylons theme/,+37d" -i docs/conf.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		# https://github.com/Pylons/colander/issues/38
-		PYTHONPATH="." emake -C docs html SPHINXOPTS=""
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-}