Delete older ebuild.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

5 files changed, 7 insertions, 221 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 9fdf387907db..4896065c7330 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.65 2011/02/10 20:08:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.66 2011/02/10 20:15:02 arfrever Exp $
+
+  10 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -django-1.2.4-r1.ebuild, -files/django-1.2.4-python-2.7.patch,
+  -files/django-1.2.4-ticket-14576.patch:
+  Delete.
 
   10 Feb 2011; Markos Chandras <hwoarang@gentoo.org> django-1.2.5.ebuild:
   Stable on amd64 wrt bug #354183
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b46aa88ccd82..5b232b90c666 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,31 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX django-1.2.4-python-2.7.patch 1466 RMD160 5661eb7856dd4690c9a89182a248ea4236362c83 SHA1 11c54fec7aecebb02265991dd9bdd482d547a2df SHA256 7b24df97848bd867b333afc193c779719fd145950bfd50200580c2d1cde21d3b
-AUX django-1.2.4-ticket-14576.patch 2379 RMD160 55894fdf1d2c6c0e255b7c773b34aa7d0f52789d SHA1 c24debf30e27a709b44f8a350bbd3c14c7c4e3f1 SHA256 4d663ab67309be059394cda8406d344e1f34ccd1c815cd71a8bc56a37bf58808
 DIST Django-1.1.4.tar.gz 5750441 RMD160 2aac00043088fa705de428ca44240253fbd79af6 SHA1 a636ea12c5d8b5d5befec60bb356016f092b1943 SHA256 1f9d48a741f98951e65818e167c84c407d1c322efcfd4cb419384773ea793dee
-DIST Django-1.2.4.tar.gz 6357270 RMD160 e28338a82d662df999a68a4473ed76bd00c974fc SHA1 d8347a9062404de49e2f474e6e99395361f34db8 SHA256 0f06cccd4ca92173b958dd80edff35035888f15554be425e5d6d55c7f94a8381
 DIST Django-1.2.5.tar.gz 6379313 RMD160 e57f48331377047763875876e51c754f91f58f80 SHA1 9593e6745650d06c0af82a79d6e304d958419f94 SHA256 649387248296386b589c4a8bf91d34590b43f93b6ebfe6cefbea0ddf4641ccd6
 EBUILD django-1.1.4.ebuild 2549 RMD160 87107de3e32e0c74debe57f23260d08ddcc26f88 SHA1 570c02ff1b9681a665280ee1911f346d9e585be4 SHA256 32fd6fbcbcd34297527293081c135242bb4cd31e5fd5ff805268e2f9de3c0979
-EBUILD django-1.2.4-r1.ebuild 2827 RMD160 c26e8c635817da8b6b527d19c1556a68f7f641e8 SHA1 b83341dc52b0725f17630d77fd76170e74ea1503 SHA256 fcf07054f5e6c2623c19633c8ed07bdc86c4922ec111ade9e2ef9b607d904693
 EBUILD django-1.2.5.ebuild 2688 RMD160 8a3ff9c99ccfea617c383c432c089af58882b0b5 SHA1 5fe24b90d1314bf9faade5ab673a2847095ecb4d SHA256 9fd7bdd75cb620909d8407f163b0ac7cd8e8acd845ee0111253fea843017461a
 EBUILD django-9999.ebuild 2543 RMD160 540a51b64d471f433e9071ca0f4219b7353441e5 SHA1 fb671ec6fdbbe3527cba97b7f40d1998b2bc07c3 SHA256 ca1fe7ef74821fda031b12f289ce81daa2af930cf3abd16dba39fe21766f57b1
-MISC ChangeLog 10112 RMD160 f7712e6c788fae2a1159c8c6ec3b49fb7c714c35 SHA1 ac3d9797da810886829eb3f0b9a006136366c3be SHA256 5309c2e380ce1d40ae96f412ac122e545d7a951229629c89adf617a6b47482d7
+MISC ChangeLog 10303 RMD160 dfe933461aab87b594d2e4f6c055c5851f25c863 SHA1 1782c95981650d77f1628bee18eee7dd2848e769 SHA256 12117f1c21ba7f3037301c79b128cee7826dd8748ace2d87e47e8ec89590ef42
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNVEU5AAoJEPqDWhW0r/LCT0AP/10dK7CG96cT/tYDO5xCLC6U
-OcWe3jXOO6rYJdU/6NVNDiPXUFBK3aJeQnbbzv4w6OK8Rp1fHPy0xi+7P/dKN4pW
-ObWnHWLeeMECpxQWhDQEQIc+R9goGgLXZrJXeNiEgaJaUDFE1U9c0gClLJ110QL8
-dQ6uBof0Y1sXeRSSCI+w/dQYYUeNk4KY4WBRYGmACT/SfmyElsbolvpVDynppQ5D
-9XV4fhGS15uCiQa5y8O/NRg4aNm6iNprDEAKwy82A365ALtltTXuJ69ct/BGojU/
-FdJ7hUHJdxALcklCxP+AqqUQk5tbDJ+i6ucpmYGDk590Gxxb57/+356w6CHupmfO
-N/sd7SmYgqk3tbJ7c93bzBHD0KflwPLexW0oi9lOriVKkGtzCfBCiLozzuxt4F5U
-UGODk8MMTYce0T3ZTDsOne5a5MDzkUKIJ6w2BNLM2/Y9xZLvdptSw0JK0StlBlyj
-ztufFhoYBz4lJn1Gr/lkF7E8lJWxn2nhE0CXQ5LO7io9bqdcNctawxKbWIODGMkP
-OLe8gvGRUM9TUw8TUh3QIT8b2kcCmbCrKNc9eeU8Fid+bWzqoZ+4/oOHS/BzoIT7
-Bj7h0lKFVSUodtLJwcFA2GjvjOTW3EPAGKFJgMuICJIDfSaMFw512T+ep2kWyhDK
-ZcBhc+02bPHar4kOHnnn
-=8xXb
------END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.2.4-r1.ebuild b/dev-python/django/django-1.2.4-r1.ebuild
deleted file mode 100644
index f8c6f6622215..000000000000
--- a/dev-python/django/django-1.2.4-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.2.4-r1.ebuild,v 1.3 2011/01/26 19:56:35 fauli Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit bash-completion distutils eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc mysql postgres sqlite test"
-
-RDEPEND="dev-python/imaging
-	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
-	postgres? ( dev-python/psycopg )
-	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-0.3 )
-	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="docs/* AUTHORS"
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python_pkg_setup
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-	epatch "${FILESDIR}/${P}-ticket-14576.patch"
-	epatch "${FILESDIR}/${P}-python-2.7.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
-}
-
-src_test() {
-	testing() {
-		# Tests have non-standard assumptions about PYTHONPATH and
-		# don't work with usual "build-${PYTHON_ABI}/lib".
-		PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dobashcompletion extras/django_bash_completion
-
-	if use doc; then
-		rm -fr docs/_build/html/_sources
-		dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/media/* || die "doins failed"
-
-	webapp_src_install
-}
-
-pkg_preinst() {
-	:
-}
-
-pkg_postinst() {
-	bash-completion_pkg_postinst
-	distutils_pkg_postinst
-
-	einfo "Now, Django has the best of both worlds with Gentoo,"
-	einfo "ease of deployment for production and development."
-	echo
-	elog "A copy of the admin media is available to"
-	elog "webapp-config for installation in a webroot,"
-	elog "as well as the traditional location in python's"
-	elog "site-packages dir for easy development"
-	echo
-	ewarn "If you build Django ${PV} without USE=\"vhosts\""
-	ewarn "webapp-config will automatically install the"
-	ewarn "admin media into the localhost webroot."
-}
diff --git a/dev-python/django/files/django-1.2.4-python-2.7.patch b/dev-python/django/files/django-1.2.4-python-2.7.patch
deleted file mode 100644
index 53923844f7e3..000000000000
--- a/dev-python/django/files/django-1.2.4-python-2.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://code.djangoproject.com/ticket/14947
-http://code.djangoproject.com/changeset/15165
-
---- tests/regressiontests/fixtures_regress/tests.py
-+++ tests/regressiontests/fixtures_regress/tests.py
-@@ -1,6 +1,7 @@
- # -*- coding: utf-8 -*-
- # Unittests for fixtures.
- import os
-+import re
- import sys
- try:
-     from cStringIO import StringIO
-@@ -327,9 +328,14 @@
- 
-         # Output order isn't guaranteed, so check for parts
-         data = stdout.getvalue()
-+
-+        # Get rid of artifacts like '000000002' to eliminate the differences
-+        # between different Python versions.
-+        data = re.sub('0{6,}\d', '', data)
-+
-         lion_json = '{"pk": 1, "model": "fixtures_regress.animal", "fields": {"count": 3, "weight": 1.2, "name": "Lion", "latin_name": "Panthera leo"}}'
-         emu_json = '{"pk": 10, "model": "fixtures_regress.animal", "fields": {"count": 42, "weight": 1.2, "name": "Emu", "latin_name": "Dromaius novaehollandiae"}}'
--        platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2000000000000002, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}'
-+        platypus_json = '{"pk": %d, "model": "fixtures_regress.animal", "fields": {"count": 2, "weight": 2.2, "name": "Platypus", "latin_name": "Ornithorhynchus anatinus"}}'
-         platypus_json = platypus_json % animal.pk
- 
-         self.assertEqual(len(data), len('[%s]' % ', '.join([lion_json, emu_json, platypus_json])))
diff --git a/dev-python/django/files/django-1.2.4-ticket-14576.patch b/dev-python/django/files/django-1.2.4-ticket-14576.patch
deleted file mode 100644
index 8308e5405fe2..000000000000
--- a/dev-python/django/files/django-1.2.4-ticket-14576.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-http://code.djangoproject.com/ticket/14576
-http://code.djangoproject.com/changeset/15044
-
---- django/contrib/formtools/tests.py
-+++ django/contrib/formtools/tests.py
-@@ -116,7 +116,7 @@
-         hash1 = utils.security_hash(None, f1)
-         hash2 = utils.security_hash(None, f2)
-         self.assertEqual(hash1, hash2)
--        
-+
-     def test_empty_permitted(self):
-         """
-         Regression test for #10643: the security hash should allow forms with
-@@ -214,3 +214,26 @@
-         wizard(DummyRequest(POST=data))
-         self.assertTrue(reached[0])
- 
-+    def test_14576(self):
-+        """
-+        Regression test for ticket #14576.
-+
-+        The form of the last step is not passed to the done method.
-+        """
-+        reached = [False]
-+        that = self
-+
-+        class Wizard(WizardClass):
-+            def done(self, request, form_list):
-+                reached[0] = True
-+                that.assertTrue(len(form_list) == 2)
-+
-+        wizard = Wizard([WizardPageOneForm,
-+                         WizardPageTwoForm])
-+
-+        data = {"0-field": "test",
-+                "1-field": "test2",
-+                "hash_0": "2fdbefd4c0cad51509478fbacddf8b13",
-+                "wizard_step": "1"}
-+        wizard(DummyRequest(POST=data))
-+        self.assertTrue(reached[0])
---- django/contrib/formtools/wizard.py
-+++ django/contrib/formtools/wizard.py
-@@ -94,9 +94,9 @@
-             # Since the hashes only take into account values, and not other
-             # other validation the form might do, we must re-do validation
-             # now for security reasons.
--            current_form_list = [self.get_form(i, request.POST) for i in range(current_step)]
-+            previous_form_list = [self.get_form(i, request.POST) for i in range(current_step)]
- 
--            for i, f in enumerate(current_form_list):
-+            for i, f in enumerate(previous_form_list):
-                 if request.POST.get("hash_%d" % i, '') != self.security_hash(request, f):
-                     return self.render_hash_failure(request, i)
- 
-@@ -111,7 +111,7 @@
- 
- 
-             if next_step == self.num_steps():
--                return self.done(request, current_form_list)
-+                return self.done(request, previous_form_list + [form])
-             else:
-                 form = self.get_form(next_step)
-                 self.step = current_step = next_step