reverting changes to deps and adding note about why they are arranged in that way (to remind myself never to touch them again :)

Package-Manager: portage-2.0.51.19

4 files changed, 31 insertions, 19 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index bc2e4a2f0bbf..569c4cc04a20 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/python
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.136 2005/04/20 17:10:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.137 2005/04/20 18:48:48 liquidx Exp $
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> python-2.3.5.ebuild,
+  python-2.4-r3.ebuild:
+  reverting changes to deps and adding note about why they are arranged in
+  that way (to remind myself never to touch them again :)
 
   20 Apr 2005; Alastair Tse <liquidx@gentoo.org>
   +files/python-2.3-readline.patch, +files/python-2.4-readline.patch,
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 1a17af14c824..c42ae18d6e89 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6dbb76ca9648f09d9b0a77d886654c8c ChangeLog 23030
+MD5 dff709aa1b2a43a03d21814610d40898 ChangeLog 23258
 MD5 8145ce0144332d6caca98fa5fb648741 metadata.xml 221
 MD5 b0dabb5b661c34b2054f5ae852c2fd45 python-2.1.3-r1.ebuild 2329
 MD5 1e424541a26b4d5785a6e830e6a14fe8 python-2.2.3-r6.ebuild 4498
@@ -9,8 +9,8 @@ MD5 2b2c1c7fabbe14699111e59f9e78f65f python-2.3.3-r2.ebuild 7160
 MD5 6208b0b2586611378709b4aec6628eac python-2.3.4-r1.ebuild 7167
 MD5 5cc96c3709ae06baddee984d80cfee3c python-2.4-r1.ebuild 6804
 MD5 1bc0f485e700a65e4b15c87a21b85154 python-2.4-r2.ebuild 6777
-MD5 f3cf6a04585d8dd44ac9f59941647256 python-2.3.5.ebuild 7500
-MD5 9746b6ffae442426bdccd2ab62acb1de python-2.4-r3.ebuild 6875
+MD5 b2b8ce321f3e21558aae7fb197e68dcf python-2.3.5.ebuild 7727
+MD5 11883082a4dbea2432a68330776944dd python-2.4-r3.ebuild 7102
 MD5 1c5cd53cb89c821a549968bac31df0f1 files/depreorder.py 2235
 MD5 f3f370c8d1382c1a7571cfc1cbb196d9 files/digest-python-2.1.3-r1 62
 MD5 fccf57b8c47164b676517e516898dc46 files/digest-python-2.4-r3 64
@@ -54,7 +54,7 @@ MD5 e9cc1b9be363e6c3f8df75cdb2ea9621 files/python-2.3-readline.patch 9596
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCZo2CTM53OX+9xmMRApJ5AJ4uih2oW6QzO//Tdpgepyotaz/iUACgne47
-7dIRSQs1SMGls0FiCSOFX2k=
-=0wlJ
+iD8DBQFCZqQtTM53OX+9xmMRAjBuAJ970WOcGFlJ9ZQiIoMGzo+WUJp8fgCgihCQ
+DP+3ShaJGBWdcnA5sz/RW7M=
+=m536
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/python/python-2.3.5.ebuild b/dev-lang/python/python-2.3.5.ebuild
index f44987945686..6329fbf45be9 100644
--- a/dev-lang/python/python-2.3.5.ebuild
+++ b/dev-lang/python/python-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.4 2005/04/20 17:10:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.3.5.ebuild,v 1.5 2005/04/20 18:48:48 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -23,8 +23,7 @@ SLOT="2.3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="ncurses gdbm ssl readline tcltk berkdb bootstrap ipv6 build ucs2 doc X"
 
-RDEPEND="virtual/libc
-	dev-python/python-fchksum
+DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
@@ -36,10 +35,15 @@ RDEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-DEPEND="${RDEPEND}"
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
+#       provides the functionality expected from previous pythons.
+
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+RDEPEND="${DEPEND} dev-python/python-fchksum"
 
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
 
 PROVIDE="virtual/python"
 
diff --git a/dev-lang/python/python-2.4-r3.ebuild b/dev-lang/python/python-2.4-r3.ebuild
index f7d66778900d..1515f97039c8 100644
--- a/dev-lang/python/python-2.4-r3.ebuild
+++ b/dev-lang/python/python-2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.2 2005/04/20 17:10:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4-r3.ebuild,v 1.3 2005/04/20 18:48:48 liquidx Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -24,9 +24,8 @@ SLOT="2.4"
 
 KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~s390 ~alpha ~ia64 ~mips"
 
-RDEPEND="virtual/libc
+DEPEND="virtual/libc
 	>=sys-libs/zlib-1.1.3
-	dev-python/python-fchksum
 	!build? (
 		X? ( tcltk? ( >=dev-lang/tk-8.0 ) )
 		ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) )
@@ -37,10 +36,14 @@ RDEPEND="virtual/libc
 		dev-libs/expat
 	)"
 
-DEPEND="${RDEPEND}"
+# NOTE: The dev-python/python-fchksum RDEPEND is needed so that this python 
+#       provides the functionality expected from previous pythons.
 
-# The dev-python/python-fchksum RDEPEND is needed to that this python provides
-# the functionality expected from previous pythons.
+# NOTE: python-fchksum is only a RDEPEND and not a DEPEND since we don't need
+#       it to compile python. We just need to ensure that when we install
+#       python, we definitely have fchksum support. - liquidx
+
+RDEPEND="${DEPEND} 	dev-python/python-fchksum"
 
 PROVIDE="virtual/python"