bump, drop unused IUSE test, rm old

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

5 files changed, 60 insertions, 183 deletions

diff --git a/dev-python/django-debug-toolbar/ChangeLog b/dev-python/django-debug-toolbar/ChangeLog
index eabb0b507e38..c0404383a037 100644
--- a/dev-python/django-debug-toolbar/ChangeLog
+++ b/dev-python/django-debug-toolbar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/django-debug-toolbar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/ChangeLog,v 1.10 2014/08/27 08:55:39 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/ChangeLog,v 1.11 2014/11/03 08:37:38 idella4 Exp $
+
+*django-debug-toolbar-1.2.2 (03 Nov 2014)
+
+  03 Nov 2014; Ian Delaney <idella4@gentoo.org>
+  +django-debug-toolbar-1.2.2.ebuild, -django-debug-toolbar-0.10.0.ebuild,
+  -django-debug-toolbar-0.10.2.ebuild, -django-debug-toolbar-0.11.0.ebuild:
+  bump, drop unused IUSE test, rm old
 
 *django-debug-toolbar-1.2.1 (27 Aug 2014)
 
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.0.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.0.ebuild
deleted file mode 100644
index b11c665e48ab..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.0.ebuild,v 1.2 2014/01/23 09:55:52 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/django-debug-toolbar/django-debug-toolbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-LICENSE="MIT"
-SLOT="0"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-		<dev-python/django-1.6[${PYTHON_USEDEP}]
-		>=dev-python/python-sqlparse-0.1.10[$(python_gen_usedep python2_7 'python3*')]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# python-sqlparse-0.1.10 doesn't support py2_6
-	if [[ "${EPYTHON}" != "python2.6" ]]; then
-		"${PYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	#rm all OSX fork files, Bug #450880
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.2.ebuild
deleted file mode 100644
index 9fcb9f2351f6..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.10.2.ebuild,v 1.2 2014/03/03 11:00:45 ultrabug Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/django-debug-toolbar/django-debug-toolbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-LICENSE="MIT"
-SLOT="0"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-		<dev-python/django-1.6[${PYTHON_USEDEP}]
-		>=dev-python/python-sqlparse-0.1.10[$(python_gen_usedep python2_7 'python3*')]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# python-sqlparse-0.1.10 doesn't support py2_6
-	if [[ "${EPYTHON}" != "python2.6" ]]; then
-		"${PYTHON}" runtests.py || die "Tests failed with ${EPYTHON}"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	#rm all OSX fork files, Bug #450880
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-0.11.0.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-0.11.0.ebuild
deleted file mode 100644
index fd88b8269ba6..000000000000
--- a/dev-python/django-debug-toolbar/django-debug-toolbar-0.11.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-0.11.0.ebuild,v 1.2 2014/03/03 11:00:45 ultrabug Exp $
-
-EAPI=5
-
-# Keep py2.6 for now
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A configurable set of panels that display debug information"
-HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
-	https://github.com/django-debug-toolbar/django-debug-toolbar/"
-SRC_URI="https://github.com/django-debug-toolbar/django-debug-toolbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-LICENSE="MIT"
-SLOT="0"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RDEPEND=">=dev-python/django-1.4.2[${PYTHON_USEDEP}]
-		<dev-python/django-1.7[${PYTHON_USEDEP}]
-		>=dev-python/python-sqlparse-0.1.10[$(python_gen_usedep python2_7 'python3*')]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
-
-	# tests folder in this versions invokes file collision on install
-	if ! use test; then
-		rm -rf tests || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	# python-sqlparse-0.1.10 doesn't support py2_6
-	if [[ "${EPYTHON}" != "python2.6" ]]; then
-		emake test
-	fi
-	# tests folder in this versions invokes file collision on install
-	rm -rf ./{build/lib/tests,tests}/ || die
-}
-
-python_install() {
-	distutils-r1_python_install
-	#rm all OSX fork files, Bug #450880
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-}
-
-python_install() {
-	rm -rf "${S}"/tests/  || die
-	distutils-r1_python_install
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( example/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild
new file mode 100644
index 000000000000..9ebedc49d134
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-debug-toolbar/django-debug-toolbar-1.2.2.ebuild,v 1.1 2014/11/03 08:37:38 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="http://pypi.python.org/pypi/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/django-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.10[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	# Prevent non essential d'loading by intersphinx
+	sed -e 's:intersphinx_mapping:_&:' -i docs/conf.py || die
+
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( example/. )
+	distutils-r1_python_install_all
+}