[dev-python[errorhandler.pkginfo] remove, update django-xslt

11 files changed, 21 insertions, 213 deletions

diff --git a/dev-python/django-xslt/Manifest b/dev-python/django-xslt/Manifest
index fc54518..15d192b 100644
--- a/dev-python/django-xslt/Manifest
+++ b/dev-python/django-xslt/Manifest
@@ -1 +1,2 @@
 DIST django-xslt-0.4.5.tar.gz 15717 SHA256 db3bad334310e13a37391cbd52fc1b0432165d9a97494c9413008c0fc8023ccb SHA512 25f3268d5eae29326ee93b5c4189389577bbf282e9f9007798de2ce96c6420d240c07e6a2abbbc57ce0bb4abb3aef557b545948a02b36a118afaefb30ca5a2b4 WHIRLPOOL 9654a2a3d7baf8ed3de9061cc43872db9e0a72f9331cce5bd804d5395611a0421d2cbec7f7a94fd73f48d439a702b0fbb98424ce15274511183398e317289fab
+DIST django-xslt-demoapp-0.4.5_p20120427.tar.bz2 5506 SHA256 a448e2cb6db716199915a1bc3a49ab28388cdb41d4ad3e7c6a0127e82143766f SHA512 200832172eac9c2729816c800fc32376ae62be2d832a398538054dca875fbedc41a300618f37f4d2b1cc36f36be20a6cbd86cc7f66e5ada476309e734c3f578d WHIRLPOOL 1afabf88e61bdb1e545bd84a0890953cd59d6e2811760e1d4c3f93307fd2f01b915404867af42265e19daa58c10cdb7b0538e31c468b8852cd960107063f00c0
diff --git a/dev-python/django-xslt/django-xslt-0.4.5.ebuild b/dev-python/django-xslt/django-xslt-0.4.5.ebuild
index b4d59f4..4908b58 100644
--- a/dev-python/django-xslt/django-xslt-0.4.5.ebuild
+++ b/dev-python/django-xslt/django-xslt-0.4.5.ebuild
@@ -8,10 +8,9 @@ SUPPORT_PYTHON_ABIS=1
 RESTRICT_PYTHON_ABIS="3.*"
 inherit distutils
 
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-if use test; then
-	SRC_URI+="http://dev.gentoo.org/~tampakrap/tarballs/${PN}-demoapp-0.4.5_p20120427.tar.bz2"
-fi
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( http://dev.gentoo.org/~tampakrap/tarballs/${PN}-demoapp-0.4.5_p20120427.tar.bz2 )"
+
 
 DESCRIPTION="A configurable set of panels that display debug information"
 HOMEPAGE="http://pypi.python.org/pypi/django-xslt/"
@@ -28,14 +27,25 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools
 	test? ( dev-python/lxml )"
 
+#src_test() {
+#	export DJANGO_SETTINGS_MODULE="django.conf"
+#	testing() {
+#		PYTHONPATH="build-${PYTHON_ABI}/lib/" \
+#		"$(PYTHON)" src/djangoxslt/xslt/tests.py
+#		if [[ $? ]]; then
+#			einfo "Tests for python"$(python_get_version)" completed ok"
+#		fi
+#	}
+#	python_execute_function testing
+#}
+
 src_test() {
-	export DJANGO_SETTINGS_MODULE="django.conf"
 	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/" \
-		"$(PYTHON)" src/djangoxslt/xslt/tests.py
-		if [[ $? ]]; then
-			einfo "Tests for python"$(python_get_version)" completed ok"
-		fi
+		pushd ${WORKDIR}/demoapp > /dev/null
+		PYTHONPATH="${S}/build-${PYTHON_ABI}/lib/" \
+		"$(PYTHON)" manage.py test
+		popd ${WORKDIR}/demoapp > /dev/null
 	}
 	python_execute_function testing
 }
+	
diff --git a/dev-python/errorhandler/Manifest b/dev-python/errorhandler/Manifest
deleted file mode 100644
index 38b3f94..0000000
--- a/dev-python/errorhandler/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST errorhandler-1.1.1.tar.gz 8321 SHA256 2baa97a8a256fe72960d196bbdee4404162186f539c4d73b3f1c072db18463e9 SHA512 a2f875537103086be956becfdac25a43a646a89b404b6a7a2a243c6d2ddbc29d55948b781529d0a0fa82b163187747f3396b62ed0be98d39834de038cc4a1fd2 WHIRLPOOL dd296200b2a451ae36225122d69e215e463a777ca162ed4b98067e146080e5fa91fd4ee8a219fc0999a05461aa69c712866e57c3b31c9a19366d82ea8efdad8a
diff --git a/dev-python/errorhandler/errorhandler-1.1.1.ebuild b/dev-python/errorhandler/errorhandler-1.1.1.ebuild
deleted file mode 100644
index f62d6dd..0000000
--- a/dev-python/errorhandler/errorhandler-1.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="A logging framework handler that tracks when messages above a certain level have been logged"
-HOMEPAGE="http://pypi.python.org/pypi/errorhandler"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND} dev-python/pkginfo
-	dev-python/setuptools
-	doc? ( dev-python/sphinx )"
-
-src_prepare() {
-	sed -e 's:../bin/sphinx-build:/usr/bin/sphinx-build:' -i docs/Makefile || die
-	epatch "${FILESDIR}"/${P}-test.patch
-	distutils_src_prepare
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib/" "$(PYTHON)" -c \
-			"import errorhandler.tests as et, unittest; \
-			unittest.TextTestRunner().run(et.test_suite())"
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	if use doc; then
-		dohtml -r docs/_build/html/
-	fi
-	distutils_src_install
-}
diff --git a/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch b/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
deleted file mode 100644
index 126b508..0000000
--- a/dev-python/errorhandler/files/errorhandler-1.1.1-test.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur errorhandler-1.1.1.orig/errorhandler/tests.py errorhandler-1.1.1/errorhandler/tests.py
---- errorhandler/tests.py	2010-03-01 16:41:46.000000000 +0800
-+++ errorhandler/tests.py	2012-04-26 02:28:11.991954681 +0800
-@@ -134,3 +134,5 @@
-                      tearDown=tearDown,
-                      optionflags=options),
-         ))
-+if __name__ == "__main__":
-+    unittest.main()
diff --git a/dev-python/errorhandler/metadata.xml b/dev-python/errorhandler/metadata.xml
deleted file mode 100644
index d02cc23..0000000
--- a/dev-python/errorhandler/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-        <maintainer><email>tampakrap@gentoo.org</email></maintainer>
-        <maintainer>
-                <email>della5@iinet.com.au</email>
-                <name>Ian Delaney aka idella4 proxy maintainer</name>
-        </maintainer>
-</pkgmetadata>
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
deleted file mode 100644
index 4d06e5a..0000000
--- a/dev-python/pkginfo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pkginfo-0.8.tar.gz 22374 SHA256 5d37007c0ca72e41367bd2c1a9af6d5927996f516b6df7584110ef7cafd0efbb SHA512 d5a2478a1ca0cdb191944a3908f5297c3a7c2db53c58d23d3a85d2433527e611b33d4ac236c76fb96ef40892f0035bc6e7f6a52958cdf0ecae97bba0528b6f1b WHIRLPOOL f8cd9956a681a7d86344ce6e32bc0ea73fbe59ef4604f3b32feaa600f8a0fd2d31d1bef29ead1857fc9de241fe4e30afa7edf45a49c9bb46d3e7ebd8b36fd503
diff --git a/dev-python/pkginfo/files/test-py26.patch b/dev-python/pkginfo/files/test-py26.patch
deleted file mode 100644
index 8c73815..0000000
--- a/dev-python/pkginfo/files/test-py26.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur pkginfo-0.8.orig/pkginfo/tests/test_installed.py pkginfo-0.8/pkginfo/tests/test_installed.py
---- pkginfo/tests/test_installed.py	2010-11-18 05:27:18.000000000 +0800
-+++ pkginfo/tests/test_installed.py	2012-04-17 01:45:30.998684273 +0800
-@@ -98,6 +98,6 @@
-         def test_ctor_w_egg_info_as_file(self):
-             import pkginfo.tests.funny
-             installed = self._makeOne('pkginfo.tests.funny')
--            self.assertEqual(installed.metadata_version, '1.0')
-+            self.assertEqual(installed.metadata_version, None)
-             self.assertEqual(installed.package, pkginfo.tests.funny)
-             self.assertEqual(installed.package_name, 'pkginfo.tests.funny')
diff --git a/dev-python/pkginfo/files/test-py27.patch b/dev-python/pkginfo/files/test-py27.patch
deleted file mode 100644
index 4a467ba..0000000
--- a/dev-python/pkginfo/files/test-py27.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ur pkginfo-0.8.orig/pkginfo/tests/test_installed.py pkginfo-0.8/pkginfo/tests/test_installed.py
---- pkginfo/tests/test_installed.py	2010-11-18 05:27:18.000000000 +0800
-+++ pkginfo/tests/test_installed.py	2012-04-17 01:21:13.457692999 +0800
-@@ -34,7 +34,7 @@
-             installed = self._makeOne(pkginfo)
-             self.assertEqual(installed.package, pkginfo)
-             self.assertEqual(installed.package_name, 'pkginfo')
--            self.assertEqual(installed.metadata_version, '1.0')
-+            self.assertEqual(installed.metadata_version, '1.1')
-             _checkSample(self, installed)
- 
-         def test_ctor_w_no___package___falls_back_to___name__(self):
-@@ -69,7 +69,7 @@
-             import pkginfo
-             from pkginfo.tests import _checkSample
-             installed = self._makeOne('pkginfo')
--            self.assertEqual(installed.metadata_version, '1.0')
-+            self.assertEqual(installed.metadata_version, '1.1')
-             self.assertEqual(installed.package, pkginfo)
-             self.assertEqual(installed.package_name, 'pkginfo')
-             _checkSample(self, installed)
-@@ -98,6 +98,6 @@
-         def test_ctor_w_egg_info_as_file(self):
-             import pkginfo.tests.funny
-             installed = self._makeOne('pkginfo.tests.funny')
--            self.assertEqual(installed.metadata_version, '1.0')
-+            self.assertEqual(installed.metadata_version, None)
-             self.assertEqual(installed.package, pkginfo.tests.funny)
-             self.assertEqual(installed.package_name, 'pkginfo.tests.funny')
-diff -ur pkginfo-0.8.orig/pkginfo/tests/test_utils.py pkginfo-0.8/pkginfo/tests/test_utils.py
---- pkginfo/tests/test_utils.py	2010-11-05 02:15:06.000000000 +0800
-+++ pkginfo/tests/test_utils.py	2012-04-17 01:19:18.912693766 +0800
-@@ -95,7 +95,7 @@
-             import pkginfo
-             from pkginfo.tests import _checkSample
-             dist = self._callFUT(pkginfo)
--            self.assertEqual(dist.metadata_version, '1.0')
-+            self.assertEqual(dist.metadata_version, '1.1')
-             _checkSample(self, dist)
- 
-     def test_w_module_and_metadata_version(self):
-@@ -114,7 +114,7 @@
-         if sys.version_info >= (2, 6):
-             from pkginfo.tests import _checkSample
-             dist = self._callFUT('pkginfo')
--            self.assertEqual(dist.metadata_version, '1.0')
-+            self.assertEqual(dist.metadata_version, '1.1')
-             _checkSample(self, dist)
- 
-     def test_w_package_name_and_metadata_version(self):
diff --git a/dev-python/pkginfo/metadata.xml b/dev-python/pkginfo/metadata.xml
deleted file mode 100644
index 0645cd9..0000000
--- a/dev-python/pkginfo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-        <herd>python</herd>
-</pkgmetadata>
diff --git a/dev-python/pkginfo/pkginfo-0.8.ebuild b/dev-python/pkginfo/pkginfo-0.8.ebuild
deleted file mode 100644
index 0655c0e..0000000
--- a/dev-python/pkginfo/pkginfo-0.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS=1
-RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils eutils
-
-DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
-HOMEPAGE="http://pypi.python.org/pypi/pkginfo"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-LICENSE="MIT"
-SLOT="0"
-DEPEND="doc? ( dev-python/sphinx )
-	dev-python/setuptools"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e  's:SPHINXBUILD   = sphinx-build:SPHINXBUILD   = /usr/bin/sphinx-build:' \
-		-i docs/Makefile || die
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		emake -C docs html
-	fi
-}
-
-src_test() {
-	testing() {
-		cd pkginfo/tests/
-		for test in test_*.py; do
-			PYTHONPATH="../../build-${PYTHON_ABI}/lib/" \
-			"$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}"
-			if [[ $? ]]; then
-				einfo "Test "${test}" successful"
-			fi
-		done
-		cd ../../ && einfo ""
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r docs/.build/html/*
-	fi
-
-	if use examples; then
-		insinto usr/share/doc/${PF}/
-		doins -r docs/examples/
-	fi
-}