diff options
| author |   Thomas Kuther <gimpel@sonnenkinder.org> | 2009-03-26 15:13:31 +0100 |
|---|---|---|
| committer | Thomas Kuther <gimpel@sonnenkinder.org> | 2009-03-26 15:13:31 +0100 |
| commit | 8cf02d1bfe7b3649c36ad9b4e7b014822bbf1bb7 (patch) | |
| tree | 7f9efe6838d6f28ff65fa824a0092c8d0fcc70ac /dev-lang | |
| parent | Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay (diff) | |
| download | multilib-portage-8cf02d1bfe7b3649c36ad9b4e7b014822bbf1bb7.tar.gz multilib-portage-8cf02d1bfe7b3649c36ad9b4e7b014822bbf1bb7.tar.bz2 multilib-portage-8cf02d1bfe7b3649c36ad9b4e7b014822bbf1bb7.zip | |
fix multilibs typo all over media-libs
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/python/Manifest | 4 | ||||
| -rw-r--r-- | dev-lang/python/python-2.5.2-r7.ebuild | 20 | ||||
| -rw-r--r-- | dev-lang/python/python-2.5.4-r2.ebuild | 2 |
3 files changed, 12 insertions, 14 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 2b506e329..193befcf7 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -19,6 +19,6 @@ DIST Python-2.6.1.tar.bz2 10960385 RMD160 497dafaca9c150fca611b0175eeb13c2fc4d3e DIST python-gentoo-patches-2.5.2-r7.tar.bz2 28160 RMD160 c2a8c71f464f1cf0cd8e3d142a3f3454de46bc55 SHA1 b64fc90f331e42ea2c364fd61d13b515300fdcbf SHA256 8afff4ed12c3c5ca4418da657617317a8c646a69ae341a3d494747659825355f 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 10765 RMD160 bd829cc1088c4f71637d03973b2789294f573d28 SHA1 4caaf98aa148067bc84f58fd4d323a7fe4fa05d1 SHA256 b38b5a7e0b7bf77f3193e94a64004c6ba3b36fb416ce974efd33fdde9a42d163 -EBUILD python-2.5.4-r2.ebuild 10827 RMD160 cf7c1f68395da214c02c894b92d26c4fc59ef39f SHA1 88a20f961b10740dd41f671de11dcd63f5902196 SHA256 ab1a143c0d7b94d8417b3abe697f58c1c159adfe708a4d5beeacd7294d688c27 +EBUILD python-2.5.2-r7.ebuild 10843 RMD160 970b308a596d9a53986730e64cbe89f323fb560e SHA1 e7d7b6fa7de4971926fd0678f65cb91c8003d1bb SHA256 8737738ec785bed3ed337c4dc6c94658d83751aac2103db21decd9fec8dc88f1 +EBUILD python-2.5.4-r2.ebuild 10803 RMD160 a6df8cd49f7b042585ffe851e564a52a451e8c11 SHA1 1790cb31ab37f45e0d31b74a7ea705e96bc87839 SHA256 b365f3c6f4d18ae72514c823d9ca8fb08513e376d0553433b7521acd32f21a5b EBUILD python-2.6.1-r1.ebuild 8957 RMD160 6241bbc2591d67baeaef0145a1cc4b1b80ac1ed1 SHA1 371af08ce2c4f14acd2bf04d97acdda80a235532 SHA256 93855ee967551f0ec3ad906cf8b9f93e955bc35629c6b70ff0ffee2b6218b4a6 diff --git a/dev-lang/python/python-2.5.2-r7.ebuild b/dev-lang/python/python-2.5.2-r7.ebuild index 075308ef5..55ab9ee1d 100644 --- a/dev-lang/python/python-2.5.2-r7.ebuild +++ b/dev-lang/python/python-2.5.2-r7.ebuild @@ -9,7 +9,7 @@ EAPI="2" -inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives libtool multilib-native +inherit eutils autotools flag-o-matic python versionator toolchain-funcs alternatives libtool multilib-native # we need this so that we don't depends on python.eclass PYVER_MAJOR=$(get_major_version) @@ -32,18 +32,18 @@ IUSE="ncurses gdbm ssl readline tk berkdb ipv6 build ucs2 sqlite doc +threads ex # NOTE: dev-python/{elementtree,celementtree,pysqlite,ctypes,cjkcodecs} # do not conflict with the ones in python proper. - liquidx -DEPEND=">=sys-libs/zlib-1.1.3 +DEPEND=">=sys-libs/zlib-1.1.3[lib32?] !build? ( - sqlite? ( >=dev-db/sqlite-3 ) + sqlite? ( >=dev-db/sqlite-3[lib32?] ) tk? ( >=dev-lang/tk-8.0 ) - ncurses? ( >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) ) - berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 - sys-libs/db:4.2 ) ) - gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) + 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 ) + xml? ( dev-libs/expat[lib32?] ) )" # NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri diff --git a/dev-lang/python/python-2.5.4-r2.ebuild b/dev-lang/python/python-2.5.4-r2.ebuild index 207b00ecb..77ffc7cdb 100644 --- a/dev-lang/python/python-2.5.4-r2.ebuild +++ b/dev-lang/python/python-2.5.4-r2.ebuild @@ -83,8 +83,6 @@ multilib-native_src_prepare_internal() { eautoreconf } -src_configure() { :; } - src_configure_internal() { # disable extraneous modules with extra dependencies if use build; then |