summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-04-07 20:54:25 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-04-07 20:54:25 +0100
commit05e863d62795bea5735066aea024cf31d40143ad (patch)
treed2e475cb39751bdc0fe1d020c347a0b12acb29ce /dev-lang
parentRemove unneeded dependency (diff)
downloadmultilib-portage-05e863d62795bea5735066aea024cf31d40143ad.tar.gz
multilib-portage-05e863d62795bea5735066aea024cf31d40143ad.tar.bz2
multilib-portage-05e863d62795bea5735066aea024cf31d40143ad.zip
Further python cleanups
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/Manifest2
-rw-r--r--dev-lang/python/python-2.5.4-r2.ebuild19
2 files changed, 11 insertions, 10 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 9521f3dfc..92b4df258 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,5 +20,5 @@ DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d1
DIST python-gentoo-patches-2.5.4.tar.bz2 19474 RMD160 00bb0918414db251b11b7f19a9f8a112c9e49fbd SHA1 fd4955f7da3049abecc4df0e203e783a90390cf8 SHA256 6e050dd8e8a90655bf935af99ad1ae6456bc072f075ddb9bcd532201bbb37274
DIST python-gentoo-patches-2.6-r5.tar.bz2 7431 RMD160 dbfc0715773446614843b45818d4152ca133140a SHA1 495cbfbf333052faf6860cf2d682f249a787557c SHA256 ef81eac97d933c77afcfd2434f44132717cd0a1550d1092e388e3c2f3dd5f3cf
EBUILD python-2.5.2-r7.ebuild 9125 RMD160 aec8cd3b33f589ca4fa067778cc8f9506d9f795b SHA1 68e99c703dfe2e29d5707e6b732df37ff23b9e3a SHA256 3bd498dc2531801f2aed47cd880ede34d13a80d7df7cd33142ca4e0cf4c98097
-EBUILD python-2.5.4-r2.ebuild 10642 RMD160 bb9752a853f15aa50b53dad2f22bf00c3c70c379 SHA1 e3c9a9a60cafd2d312f992cb14e5dda43084122e SHA256 3e9f67d94f1dc28a23a8380583ea8e614f5f636f661dbac68c84c001fde79b95
+EBUILD python-2.5.4-r2.ebuild 10735 RMD160 91b456d330849cdd7ed6512a43f5a4473479ac1a SHA1 a794d8e2aa195310eac7820da49ed9fbe07fcd00 SHA256 c72a22cd612f9f83ad9c6e83f26efab87d70347b5f37749c7c52321b2444deed
EBUILD python-2.6.1-r1.ebuild 9209 RMD160 466694abd36d1ba29f82bd2902fb402aa35705f4 SHA1 a8d79f68b6ed8516a1f06e35330f368901b44dfe SHA256 ac26547932f5eb1945094894b3fd2833304b7b313338f2326e9efe6462b9cf1a
diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild
index 631a76aa5..e7f855087 100644
--- a/dev-lang/python/python-2.5.4-r2.ebuild
+++ b/dev-lang/python/python-2.5.4-r2.ebuild
@@ -35,15 +35,16 @@ IUSE="+xml ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threa
# do not conflict with the ones in python proper. - liquidx
DEPEND=">=sys-libs/zlib-1.1.3[lib32?]
- !build? (
- sqlite? ( >=dev-db/sqlite-3[lib32?] )
- tk? ( >=dev-lang/tk-8.0[lib32?] )
- ncurses? ( >=sys-libs/ncurses-5.2[lib32?]
- readline? ( >=sys-libs/readline-4.1[lib32?] ) )
- berkdb? ( >=sys-libs/db-3.1[lib32?] )
- gdbm? ( sys-libs/gdbm[lib32?] )
- ssl? ( dev-libs/openssl[lib32?] )
- doc? ( dev-python/python-docs:2.5 )
+ !build? (
+ sqlite? ( >=dev-db/sqlite-3[lib32?] )
+ tk? ( >=dev-lang/tk-8.0[lib32?] )
+ ncurses? ( >=sys-libs/ncurses-5.2[lib32?]
+ readline? ( >=sys-libs/readline-4.1[lib32?] ) )
+ berkdb? ( || ( sys-libs/db:4.5[lib32?] sys-libs/db:4.4[lib32?] sys-libs/db:4.3[lib32?]
+ sys-libs/db:4.2[lib32?] ) )
+ gdbm? ( sys-libs/gdbm[lib32?] )
+ ssl? ( dev-libs/openssl[lib32?] )
+ doc? ( dev-python/python-docs:2.5 )
xml? ( dev-libs/expat[lib32?] )
)"