diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2006-08-26 09:43:12 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2006-08-26 09:43:12 +0000 |
| commit | cc0b05e02970014592cb3f3798061c4fcfd627e0 (patch) | |
| tree | 6336cab6bd6c2dc693269a72e1dcb31502f64626 | |
| parent | bumping version of 3.4 and added bluez-gnome (diff) | |
| download | liquidx-cc0b05e02970014592cb3f3798061c4fcfd627e0.tar.gz liquidx-cc0b05e02970014592cb3f3798061c4fcfd627e0.tar.bz2 liquidx-cc0b05e02970014592cb3f3798061c4fcfd627e0.zip | |
migrating to patched tarballs, bumping version of python 2.5
svn path=/; revision=63
24 files changed, 156 insertions, 1699 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index 40899b5..976a3e3 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -2,3 +2,7 @@ * Added sqlite USE flag * Added webbrowser to the skipped_tests because of sandbox violation. * Ported some of the patches to 2.5 + + +2.4 +* Fix collisions between slotted version with idle
\ No newline at end of file diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 1905bcc..15e9a68 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -1,97 +1,30 @@ -AUX patches/2.4-mimetypes_apache.patch 454 RMD160 231f61334fea15adef48cbf06300ce4409a8a3aa SHA1 2cf17759b0131282f8001787fd171f347d13f50f SHA256 8c16e5a4ce52b2c7b7bc30e55f6113d13e0e57dfb41cd3510548137d803fda61 -MD5 ec16631b538a7481f0537191d5f23b27 files/patches/2.4-mimetypes_apache.patch 454 -RMD160 231f61334fea15adef48cbf06300ce4409a8a3aa files/patches/2.4-mimetypes_apache.patch 454 -SHA256 8c16e5a4ce52b2c7b7bc30e55f6113d13e0e57dfb41cd3510548137d803fda61 files/patches/2.4-mimetypes_apache.patch 454 -AUX patches/2.4.1-libdir.patch 7572 RMD160 3988180968a5cb73fc8f2fb1b9c930023e5acc52 SHA1 a56b5531e97f3f1851472db64860375c467ed264 SHA256 8b699cadfcd488745f13c9c1943277ff367b7128217df4da839a3f7719fa7e0e -MD5 5fcb80fb9e7ae452d9ec09c99d7c7431 files/patches/2.4.1-libdir.patch 7572 -RMD160 3988180968a5cb73fc8f2fb1b9c930023e5acc52 files/patches/2.4.1-libdir.patch 7572 -SHA256 8b699cadfcd488745f13c9c1943277ff367b7128217df4da839a3f7719fa7e0e files/patches/2.4.1-libdir.patch 7572 -AUX patches/2.4.1-st_flags.patch 5649 RMD160 e8cb5e59e84cd65bef96d08614af59b884d8cf43 SHA1 877ca3573c9b7a497eb275aec4e4fc3860b4f448 SHA256 f9f234de9af0288c6c6fda1a3c5b3dfa382ddb3f20f0e90e6225b0101e4afe5d -MD5 5af982af8ad4befbf15567ae399cf2b9 files/patches/2.4.1-st_flags.patch 5649 -RMD160 e8cb5e59e84cd65bef96d08614af59b884d8cf43 files/patches/2.4.1-st_flags.patch 5649 -SHA256 f9f234de9af0288c6c6fda1a3c5b3dfa382ddb3f20f0e90e6225b0101e4afe5d files/patches/2.4.1-st_flags.patch 5649 -AUX patches/2.4.2-readline.patch 8628 RMD160 a2d1e726ad16006f13ac63adb150c26f4522eb52 SHA1 26a6a469aef0a61c1382ef84ce4b400ea74c928b SHA256 f4a4b5136e8675650a7c7b21931a2d1529214189dd373da0f751d30d183e3954 -MD5 36b36bac050785b8e393dc72f8e51d2f files/patches/2.4.2-readline.patch 8628 -RMD160 a2d1e726ad16006f13ac63adb150c26f4522eb52 files/patches/2.4.2-readline.patch 8628 -SHA256 f4a4b5136e8675650a7c7b21931a2d1529214189dd373da0f751d30d183e3954 files/patches/2.4.2-readline.patch 8628 -AUX patches/2.4.3-libdir.patch 7186 RMD160 ebe3f055fa4d910c3552542d5a24e07f60c42b9a SHA1 edae781cf4972478d9fb47ed60ca45c3e207e568 SHA256 9d6dc08f2962735e6f4b62e711d5dd49dc300f406418f876a1bbd3fbaee64b2c -MD5 74288b8ef90ca7bab4a21748bd4cda8b files/patches/2.4.3-libdir.patch 7186 -RMD160 ebe3f055fa4d910c3552542d5a24e07f60c42b9a files/patches/2.4.3-libdir.patch 7186 -SHA256 9d6dc08f2962735e6f4b62e711d5dd49dc300f406418f876a1bbd3fbaee64b2c files/patches/2.4.3-libdir.patch 7186 -AUX patches/2.5-libdir.patch 5865 RMD160 1e4ce24e05f2d1b1c9587d9047d36facc93d7a2f SHA1 f9d15014e53a346fe02e00595b5611369a6cccd3 SHA256 aa960b6e9a45d263fa6b87d29ad1198c1c18877d11169fb20ae81820ab17fa4e -MD5 447c7d1e97dca1d3a361dc968e8272b9 files/patches/2.5-libdir.patch 5865 -RMD160 1e4ce24e05f2d1b1c9587d9047d36facc93d7a2f files/patches/2.5-libdir.patch 5865 -SHA256 aa960b6e9a45d263fa6b87d29ad1198c1c18877d11169fb20ae81820ab17fa4e files/patches/2.5-libdir.patch 5865 -AUX patches/2.5-mimetypes_gentoo_apache.patch 490 RMD160 b92d065bf43fb0be0867e9084f6bc29c30d41200 SHA1 cd237858f6aaa54f06e863b634227f0570e7c0ac SHA256 1b0e6a6d5e53a84227b36908228ecd252f8c9a8ad374cf4b03895a6a2fa24c0d -MD5 49740763b3951df283ba5614c288d7b0 files/patches/2.5-mimetypes_gentoo_apache.patch 490 -RMD160 b92d065bf43fb0be0867e9084f6bc29c30d41200 files/patches/2.5-mimetypes_gentoo_apache.patch 490 -SHA256 1b0e6a6d5e53a84227b36908228ecd252f8c9a8ad374cf4b03895a6a2fa24c0d files/patches/2.5-mimetypes_gentoo_apache.patch 490 -AUX patches/2.5-readline.patch 532 RMD160 277928eea5e36d7a79276118fe82c241c6a94f18 SHA1 232ed820f759522145051818a162d62b31f4932a SHA256 9e469a96e02f25d034ab7f6d52502662386cce760d0775e2f8908a95e2a364c7 -MD5 b2a39b01f64db9a3f598d4015d86bf3e files/patches/2.5-readline.patch 532 -RMD160 277928eea5e36d7a79276118fe82c241c6a94f18 files/patches/2.5-readline.patch 532 -SHA256 9e469a96e02f25d034ab7f6d52502662386cce760d0775e2f8908a95e2a364c7 files/patches/2.5-readline.patch 532 -AUX patches/python-2.4-add_portage_search_path.patch 556 RMD160 858be60495dd7bd21429821750997cab7bccada1 SHA1 62a2ed1c44ef28971eac083d041262294201df23 SHA256 7042fdf98e3e228460d46ad5ee100e28fc29e9f1fa2008d29da0c25719b611cb -MD5 5bee9fa15d4effc7423e76d2f7f47655 files/patches/python-2.4-add_portage_search_path.patch 556 -RMD160 858be60495dd7bd21429821750997cab7bccada1 files/patches/python-2.4-add_portage_search_path.patch 556 -SHA256 7042fdf98e3e228460d46ad5ee100e28fc29e9f1fa2008d29da0c25719b611cb files/patches/python-2.4-add_portage_search_path.patch 556 -AUX patches/python-2.4-disable_modules_and_ssl.patch 1285 RMD160 995029e98fa3f9be38dff8446f7684dcd44ef11b SHA1 1d91fb65989b01e283e98e3cafae624e3953b05b SHA256 34f3604347510a18c613ba5eaacc4176e7499bdf2a7efaee486232cb00c49388 -MD5 2b953054102d344834597bc73b209e12 files/patches/python-2.4-disable_modules_and_ssl.patch 1285 -RMD160 995029e98fa3f9be38dff8446f7684dcd44ef11b files/patches/python-2.4-disable_modules_and_ssl.patch 1285 -SHA256 34f3604347510a18c613ba5eaacc4176e7499bdf2a7efaee486232cb00c49388 files/patches/python-2.4-disable_modules_and_ssl.patch 1285 -AUX patches/python-2.4-gentoo_py_dontcompile.patch 477 RMD160 b0734a4d8cf58ad922938082b20495ee17234105 SHA1 7c83501c7dd2a05338e00f834d829f1b56e8ed44 SHA256 49bdcfa5cbda826158c534a96fe62109aacb4ada1f1913ddb57bce168e65dea7 -MD5 2121d3986faa4b6c2c3ed472f77f2a9d files/patches/python-2.4-gentoo_py_dontcompile.patch 477 -RMD160 b0734a4d8cf58ad922938082b20495ee17234105 files/patches/python-2.4-gentoo_py_dontcompile.patch 477 -SHA256 49bdcfa5cbda826158c534a96fe62109aacb4ada1f1913ddb57bce168e65dea7 files/patches/python-2.4-gentoo_py_dontcompile.patch 477 -AUX patches/python-2.4.1-crosscompile.patch 4126 RMD160 58ff65efe6526a89deb317084f31fffca24fbfd1 SHA1 237335f6a43b1490a6f1a28aa3cc3fc9526e5265 SHA256 5d5edae052e7087c7a5327cafe34e5360b799aa820b61fe38a94f793ff6e7312 -MD5 ec1400ca4877399cae56ccefb72a200f files/patches/python-2.4.1-crosscompile.patch 4126 -RMD160 58ff65efe6526a89deb317084f31fffca24fbfd1 files/patches/python-2.4.1-crosscompile.patch 4126 -SHA256 5d5edae052e7087c7a5327cafe34e5360b799aa820b61fe38a94f793ff6e7312 files/patches/python-2.4.1-crosscompile.patch 4126 -AUX patches/python-2.4.3-db4.patch 1602 RMD160 59a533ba6dc0ee4702c22ecd1b28c1b95a54e4c7 SHA1 c7eb00c0e3ee215bf76cc80ec629ae22a8a0c197 SHA256 6366623ed12d682210931211d8dc0edb78c4ea9256fd2357661762864f5a7611 -MD5 99edd492f449d6b61456ea8d5fd71ee9 files/patches/python-2.4.3-db4.patch 1602 -RMD160 59a533ba6dc0ee4702c22ecd1b28c1b95a54e4c7 files/patches/python-2.4.3-db4.patch 1602 -SHA256 6366623ed12d682210931211d8dc0edb78c4ea9256fd2357661762864f5a7611 files/patches/python-2.4.3-db4.patch 1602 -AUX patches/python-2.4.3-gentoo_obsd-r1.patch 1162 RMD160 fa91e83d08ff4880f6c3c40b610189fcb090a39f SHA1 04c9e473ad41954c399eab0c9a937898c36895f2 SHA256 025ede7c7993aeb453ce95660d2c1244aab7e633f06b3e76f059639a8e5710b9 -MD5 6990e6f24bbdd37fb4f4a8b7bbb16928 files/patches/python-2.4.3-gentoo_obsd-r1.patch 1162 -RMD160 fa91e83d08ff4880f6c3c40b610189fcb090a39f files/patches/python-2.4.3-gentoo_obsd-r1.patch 1162 -SHA256 025ede7c7993aeb453ce95660d2c1244aab7e633f06b3e76f059639a8e5710b9 files/patches/python-2.4.3-gentoo_obsd-r1.patch 1162 -AUX python-config-2.5 232 RMD160 cc6697f47dfdb7687df7a37c31aea1f152cb5965 SHA1 ae9a5532dfa551e8dcd7c4dfee0046d4aaaef0bc SHA256 037364e801efd49e16c25f364505b0550832b9849b520be271f883e52ca9c09b -MD5 ec3a084ddd27398af0e7c532afbd44eb files/python-config-2.5 232 -RMD160 cc6697f47dfdb7687df7a37c31aea1f152cb5965 files/python-config-2.5 232 -SHA256 037364e801efd49e16c25f364505b0550832b9849b520be271f883e52ca9c09b files/python-config-2.5 232 AUX python-updater-r1 8780 RMD160 e4e11a2f39d704bd91d6c78be1dd1cce024575af SHA1 4a7871d51f0d3c3dfafc823d26c46105573e3fb4 SHA256 5c2479244ebf6521d6ff833923058d56c793d55b60a3fcc3e5264b0b71119d46 MD5 cfed36069ba81aebdae8f7e547b65d0a files/python-updater-r1 8780 RMD160 e4e11a2f39d704bd91d6c78be1dd1cce024575af files/python-updater-r1 8780 SHA256 5c2479244ebf6521d6ff833923058d56c793d55b60a3fcc3e5264b0b71119d46 files/python-updater-r1 8780 -AUX python-updater-r1~ 8776 RMD160 ad05cecf76ad41caab8d80c2320fb4b50928f527 SHA1 52b21d39ff843f0251d3f26d2b3b851a5126bce8 SHA256 cac748e88d5fa7a5e42a3a2195dcca43ce705498ce345e85dccddad634e27254 -MD5 6fb23a460b8e2dc3fdb0838839521af6 files/python-updater-r1~ 8776 -RMD160 ad05cecf76ad41caab8d80c2320fb4b50928f527 files/python-updater-r1~ 8776 -SHA256 cac748e88d5fa7a5e42a3a2195dcca43ce705498ce345e85dccddad634e27254 files/python-updater-r1~ 8776 DIST Python-2.4.3.tar.bz2 8005915 RMD160 c86247554975e6c44f91d05e44e68e280d5244dc SHA1 d6b81e1aec0045b5acff99676f2abe303da1b384 SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c -DIST Python-2.5b3.tar.bz2 9362705 RMD160 ba16dd5043a13b2c8945b33707c6033ab1a8f449 SHA1 31741b7a5b37cb03de1dfbfdfbcf6adc6668297c SHA256 c2c673763addd4a48df1a148656085a09730579b8165519f0acacaab44f66301 DIST Python-2.5c1.tar.bz2 9355537 RMD160 664f132bfa442657737c8ae3360160c05e748e3f SHA1 ad487ae0917f1f02ce492ca2ad7e12f5795fd53f SHA256 f54e9ed517f7015737547db3188701e0384d9b4c4b59723073b164a3f2873908 -DIST python-2.4-patches-2.tar.bz2 9219 RMD160 bd4c3502b42f4f9a10f423c434f31ad370d9da4b SHA1 812f0796e348e1788ba56a851050932c0b69218d SHA256 e66ee41328999e89bea833ff3dc58b4691a6d16ada029e88a8ba9df35979352a -EBUILD python-2.4.3-r2.ebuild 9752 RMD160 26841c24e90fbad23a8ebccb218655be8395fe99 SHA1 42c110dd2a713be66355f4978d90828647ec8725 SHA256 ab458ca1303cdeb575531f84529d65fc8bb838516391d106b88af6c894d1a55e -MD5 57dcf4f73e0fa66a66262a836c7f5e02 python-2.4.3-r2.ebuild 9752 -RMD160 26841c24e90fbad23a8ebccb218655be8395fe99 python-2.4.3-r2.ebuild 9752 -SHA256 ab458ca1303cdeb575531f84529d65fc8bb838516391d106b88af6c894d1a55e python-2.4.3-r2.ebuild 9752 -EBUILD python-2.5_beta3.ebuild 9919 RMD160 32db7a89f7f74a63b95faac54e8b0eeb66ee3477 SHA1 2d2723387c65ee246f0c22253885e33e97bd9353 SHA256 657bc5b226ee45f84a9f374bd042761c29a0d6597ce51ff3552d8c67e3e2e626 -MD5 3898af9fbc6acc2c4acec0c0478313d6 python-2.5_beta3.ebuild 9919 -RMD160 32db7a89f7f74a63b95faac54e8b0eeb66ee3477 python-2.5_beta3.ebuild 9919 -SHA256 657bc5b226ee45f84a9f374bd042761c29a0d6597ce51ff3552d8c67e3e2e626 python-2.5_beta3.ebuild 9919 -EBUILD python-2.5_rc1.ebuild 9917 RMD160 454b22c6ad04230240b7c6f901e68cd7b3ce0015 SHA1 60ed991fe7b855b669debf534db211769898621d SHA256 ba0eaa3d3604c708464e89d8457a5ae95cdc55ced4728e9eeb6c3ea65e15347c -MD5 0ec10e573f794f4b7fe7d195f6b57cf1 python-2.5_rc1.ebuild 9917 -RMD160 454b22c6ad04230240b7c6f901e68cd7b3ce0015 python-2.5_rc1.ebuild 9917 -SHA256 ba0eaa3d3604c708464e89d8457a5ae95cdc55ced4728e9eeb6c3ea65e15347c python-2.5_rc1.ebuild 9917 -MISC ChangeLog 155 RMD160 772b207477cbeaba16c741ac99bd6d55b64721b2 SHA1 388a6d5f2ec32891f08ac6988b67b64734326bfa SHA256 831fdedcc11b019982f511f889d824abacde88daf08a5c9fd62823528e60b015 -MD5 09d24c69cfd168f3dc5e0a4199b581bd ChangeLog 155 -RMD160 772b207477cbeaba16c741ac99bd6d55b64721b2 ChangeLog 155 -SHA256 831fdedcc11b019982f511f889d824abacde88daf08a5c9fd62823528e60b015 ChangeLog 155 -MD5 074466092860a2451d114cf7fad357f2 files/digest-python-2.4.3-r2 503 -RMD160 71a7eceb40337728f36e0d2970e1fb3956b7496a files/digest-python-2.4.3-r2 503 -SHA256 3f77c805317ac37a5bbe788bc0ad4b723c3584c0d676d6ee4e2040291cb4177d files/digest-python-2.4.3-r2 503 -MD5 df32ea3ca3ce2ace66a93ceb4c8b122c files/digest-python-2.5_beta3 244 -RMD160 33139c5a65fc7c84bf0ed3deba446cdcfe1a9753 files/digest-python-2.5_beta3 244 -SHA256 a3002eae29f02dd011208972c0fc18bf870d5132f2633b7b347d77a1d1f9721c files/digest-python-2.5_beta3 244 -MD5 1134bff627ecae969e1e906f08a62f20 files/digest-python-2.5_rc1 244 -RMD160 122427709eee3fa8bbbf5fd3fb66f2a75cc2e636 files/digest-python-2.5_rc1 244 -SHA256 cc053703f2a9a55921c0ac8ab56f7ecaa4504041088acf2bc422fb75c1690b9d files/digest-python-2.5_rc1 244 +DIST python-gentoo-patches-2.4.3.tar.bz2 8440 RMD160 3ac6277af81d95c011d3b0177c80a617c4a4951e SHA1 c4e9b752ad2ab456309b9baaf16e0b8e1db433b7 SHA256 c57ed86ab6657469c87080015bcba62d955619e882e53b6d75d7df4fc7e9973f +DIST python-gentoo-patches-2.5.tar.bz2 5183 RMD160 89098f891a76a1ada98352b275d46e4c53086fe3 SHA1 983496edff67af25cb522103f56026ba3a4392bb SHA256 4ea6e5e6a4c43e7e550dbe363d0a3486e74259875b3079a73452f12791d9349f +EBUILD python-2.4.3-r2.ebuild 10386 RMD160 3b148cf4794025b42b9e13544325922ea31b0627 SHA1 666b7a0968b65842bd42f511ee169482d83423b7 SHA256 e1f32ddaaf9c8c50e77933d0c9613a7bf784c2a335c687d5b98f4d0a1ce679cc +MD5 8dc5db78f3a9c48a56bdfc812c078ed2 python-2.4.3-r2.ebuild 10386 +RMD160 3b148cf4794025b42b9e13544325922ea31b0627 python-2.4.3-r2.ebuild 10386 +SHA256 e1f32ddaaf9c8c50e77933d0c9613a7bf784c2a335c687d5b98f4d0a1ce679cc python-2.4.3-r2.ebuild 10386 +EBUILD python-2.5_rc1.ebuild 10516 RMD160 cc58c81b086f4f2a95b7218a1b455a0a3c74ce18 SHA1 13f9bbb13f8657f5009c8523d6484628bd00dd1f SHA256 295faa8e12869f7418f159cee2799a1a9eca9dfb0fa7bbb15e0ea28a7643831d +MD5 8999557aef2929089ffbcee248039b93 python-2.5_rc1.ebuild 10516 +RMD160 cc58c81b086f4f2a95b7218a1b455a0a3c74ce18 python-2.5_rc1.ebuild 10516 +SHA256 295faa8e12869f7418f159cee2799a1a9eca9dfb0fa7bbb15e0ea28a7643831d python-2.5_rc1.ebuild 10516 +MISC ChangeLog 211 RMD160 77886c696f38431ca65222471d628e94ae12ae11 SHA1 756e398275bb53d8eb725c9608b068595643a54a SHA256 4652602442c2b23d1d4c43b4bb142d67828e5f24db2b70a42d40b71f0e457f95 +MD5 248a8252a6fd542dc45bf366f34393de ChangeLog 211 +RMD160 77886c696f38431ca65222471d628e94ae12ae11 ChangeLog 211 +SHA256 4652602442c2b23d1d4c43b4bb142d67828e5f24db2b70a42d40b71f0e457f95 ChangeLog 211 +MISC python-2.5_rc1.ebuild~ 10515 RMD160 61afe130978cc898c9de4e58155f5d4c2ac97611 SHA1 14794f5b126303d1cbfe683db0fa863c92782747 SHA256 87acb507b2276ec9adbca490cb2ffcbd475103387a4e19ba50f3b088364aac20 +MD5 13fb5fc63abd83cec882566c522972fa python-2.5_rc1.ebuild~ 10515 +RMD160 61afe130978cc898c9de4e58155f5d4c2ac97611 python-2.5_rc1.ebuild~ 10515 +SHA256 87acb507b2276ec9adbca490cb2ffcbd475103387a4e19ba50f3b088364aac20 python-2.5_rc1.ebuild~ 10515 +MD5 d3a76a6022ab5c6d40ae0ef9ff922a52 files/digest-python-2.4.3-r2 524 +RMD160 f1cea1edb417f82b066c689678182a3eb324bb83 files/digest-python-2.4.3-r2 524 +SHA256 8a0e91bf588722007cfcd8d902ac7d2f3a7468cf011c5045b479ec6a9ade6a24 files/digest-python-2.4.3-r2 524 +MD5 85f90f241285cf7235887ee97ba01a40 files/digest-python-2.5_rc1 518 +RMD160 9ca0c5c113e8532ef98265057c8e4f1250d8b50a files/digest-python-2.5_rc1 518 +SHA256 90e07d345ac2c58e919434d059e0fce8166426a370500f83c8de9603aa82bcee files/digest-python-2.5_rc1 518 diff --git a/dev-lang/python/files/digest-python-2.4.3-r2 b/dev-lang/python/files/digest-python-2.4.3-r2 new file mode 100644 index 0000000..dd13414 --- /dev/null +++ b/dev-lang/python/files/digest-python-2.4.3-r2 @@ -0,0 +1,6 @@ +MD5 141c683447d5e76be1d2bd4829574f02 Python-2.4.3.tar.bz2 8005915 +RMD160 c86247554975e6c44f91d05e44e68e280d5244dc Python-2.4.3.tar.bz2 8005915 +SHA256 c9b3bbc52fa18c6dba7a8c3481fa7de98187c9978749241395305f252134ba2c Python-2.4.3.tar.bz2 8005915 +MD5 4a9f21f4e0819dd040ccd38f57f69a94 python-gentoo-patches-2.4.3.tar.bz2 8440 +RMD160 3ac6277af81d95c011d3b0177c80a617c4a4951e python-gentoo-patches-2.4.3.tar.bz2 8440 +SHA256 c57ed86ab6657469c87080015bcba62d955619e882e53b6d75d7df4fc7e9973f python-gentoo-patches-2.4.3.tar.bz2 8440 diff --git a/dev-lang/python/files/digest-python-2.5_beta3 b/dev-lang/python/files/digest-python-2.5_beta3 deleted file mode 100644 index 170e8eb..0000000 --- a/dev-lang/python/files/digest-python-2.5_beta3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 30d851f535e31c8eac7924003c43e8a9 Python-2.5b3.tar.bz2 9362705 -RMD160 ba16dd5043a13b2c8945b33707c6033ab1a8f449 Python-2.5b3.tar.bz2 9362705 -SHA256 c2c673763addd4a48df1a148656085a09730579b8165519f0acacaab44f66301 Python-2.5b3.tar.bz2 9362705 diff --git a/dev-lang/python/files/digest-python-2.5_rc1 b/dev-lang/python/files/digest-python-2.5_rc1 new file mode 100644 index 0000000..2f6173c --- /dev/null +++ b/dev-lang/python/files/digest-python-2.5_rc1 @@ -0,0 +1,6 @@ +MD5 1e8a7a7c6fe14003e325c14b335f3d6c Python-2.5c1.tar.bz2 9355537 +RMD160 664f132bfa442657737c8ae3360160c05e748e3f Python-2.5c1.tar.bz2 9355537 +SHA256 f54e9ed517f7015737547db3188701e0384d9b4c4b59723073b164a3f2873908 Python-2.5c1.tar.bz2 9355537 +MD5 7d2d7f83bb38d7ce57a6b149df0cbdce python-gentoo-patches-2.5.tar.bz2 5183 +RMD160 89098f891a76a1ada98352b275d46e4c53086fe3 python-gentoo-patches-2.5.tar.bz2 5183 +SHA256 4ea6e5e6a4c43e7e550dbe363d0a3486e74259875b3079a73452f12791d9349f python-gentoo-patches-2.5.tar.bz2 5183 diff --git a/dev-lang/python/files/patches/2.4-mimetypes_apache.patch b/dev-lang/python/files/patches/2.4-mimetypes_apache.patch deleted file mode 100644 index 7254aa0..0000000 --- a/dev-lang/python/files/patches/2.4-mimetypes_apache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/mimetypes.py.old 2004-01-24 21:48:39.957577048 +0000 -+++ Lib/mimetypes.py 2004-01-24 21:49:27.023421952 +0000 -@@ -33,6 +33,8 @@ - - knownfiles = [ - "/etc/mime.types", -+ "/etc/apache/conf/mime.types", # Apache 1.x for Gentoo -+ "/etc/apache2/conf/mime.types", # Apache 2.x for Gentoo - "/usr/local/etc/httpd/conf/mime.types", - "/usr/local/lib/netscape/mime.types", - "/usr/local/etc/httpd/conf/mime.types", # Apache 1.2 diff --git a/dev-lang/python/files/patches/2.4.1-libdir.patch b/dev-lang/python/files/patches/2.4.1-libdir.patch deleted file mode 100644 index 9312ddd..0000000 --- a/dev-lang/python/files/patches/2.4.1-libdir.patch +++ /dev/null @@ -1,176 +0,0 @@ ---- Python-2.4.1/Lib/distutils/command/install.py -+++ Python-2.4.1/Lib/distutils/command/install.py -@@ -39,15 +39,15 @@ else: - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', - }, - 'unix_home': { -- 'purelib': '$base/lib/python', -+ 'purelib': '$base/@@GENTOO_LIBDIR/python', -- 'platlib': '$base/lib/python', -+ 'platlib': '$base/@@GENTOO_LIBDIR@@/python', - 'headers': '$base/include/python/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- Python-2.4.1/Lib/distutils/sysconfig.py -+++ Python-2.4.1/Lib/distutils/sysconfig.py -@@ -99,9 +99,9 @@ def get_python_lib(plat_specific=0, stan - prefix = plat_specific and EXEC_PREFIX or PREFIX - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "@@GENTOO_LIBDIR@@", "python" + get_python_version()) - if standard_lib: - return libpython - else: ---- Python-2.4.1/Lib/site.py -+++ Python-2.4.1/Lib/site.py -@@ -179,10 +179,20 @@ def addsitepackages(known_paths): - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -+ "@@GENTOO_LIBDIR@@", -+ "python" + sys.version[:3], -+ "site-packages"), -+ os.path.join(prefix, - "lib", - "python" + sys.version[:3], - "site-packages"), -+ os.path.join(prefix, "lib64", "site-python"), - os.path.join(prefix, "lib", "site-python")] -+ tmp_sitedirs = [] -+ for sdir in sitedirs: -+ if sdir not in tmp_sitedirs: -+ tmp_sitedirs.append(sdir) -+ sitedirs = tmp_sitedirs - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] ---- Python-2.4.1/Makefile.pre.in -+++ Python-2.4.1/Makefile.pre.in -@@ -79,9 +79,9 @@ exec_prefix= @exec_prefix@ - - # Expanded directories - BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+LIBDIR= $(exec_prefix)/@@GENTOO_LIBDIR@@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include ---- Python-2.4.1/Modules/Setup.dist -+++ Python-2.4.1/Modules/Setup.dist -@@ -400,7 +400,7 @@ GLHACK=-Dclear=__GLclear - #DB=/usr/local/BerkeleyDB.4.0 - #DBLIBVER=4.0 - #DBINC=$(DB)/include --#DBLIB=$(DB)/lib -+DBLIB=$(DB)/@@GENTOO_LIBDIR@@ - #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -446,7 +446,7 @@ GLHACK=-Dclear=__GLclear - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz - - # Interface to the Expat XML parser - # ---- Python-2.4.1/Modules/getpath.c -+++ Python-2.4.1/Modules/getpath.c -@@ -113,7 +113,7 @@ - - #ifndef PYTHONPATH - #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -125,6 +125,7 @@ static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; - static char lib_python[] = "lib/python" VERSION; -+static char lib_exec_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -321,7 +322,7 @@ search_for_exec_prefix(char *argv0_path, - strncpy(exec_prefix, delim+1, MAXPATHLEN); - else - strncpy(exec_prefix, home, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - return 1; - } -@@ -338,7 +339,7 @@ search_for_exec_prefix(char *argv0_path, - copy_absolute(exec_prefix, argv0_path); - do { - n = strlen(exec_prefix); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -348,7 +349,7 @@ search_for_exec_prefix(char *argv0_path, - - /* Look at configure's EXEC_PREFIX */ - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, lib_python); -+ joinpath(exec_prefix, lib_exec_python); - joinpath(exec_prefix, "lib-dynload"); - if (isdir(exec_prefix)) - return 1; -@@ -525,7 +526,7 @@ calculate_path(void) - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "@@GENTOO_LIBDIR@@/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - ---- Python-2.4.1/setup.py -+++ Python-2.4.1/setup.py -@@ -274,7 +275,7 @@ class PyBuildExt(build_ext): - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -+ '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@', - '/lib', '/usr/lib', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] -@@ -437,11 +438,11 @@ class PyBuildExt(build_ext): - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/@@GENTOO_LIBDIR@@/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'], - libraries=readline_libs) ) - if platform not in ['mac']: - # crypt module. -@@ -1015,7 +1016,7 @@ class PyBuildExt(build_ext): - added_lib_dirs.append('/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): - include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -+ added_lib_dirs.append('/usr/X11R6/lib') - added_lib_dirs.append('/usr/X11R6/lib') - elif os.path.exists('/usr/X11R5/include'): - include_dirs.append('/usr/X11R5/include') diff --git a/dev-lang/python/files/patches/2.4.1-st_flags.patch b/dev-lang/python/files/patches/2.4.1-st_flags.patch deleted file mode 100644 index a042bd2..0000000 --- a/dev-lang/python/files/patches/2.4.1-st_flags.patch +++ /dev/null @@ -1,185 +0,0 @@ -Only in Python-2.4.1-st_flags/: autom4te.cache -diff -ur Python-2.4.1/configure Python-2.4.1-st_flags/configure ---- Python-2.4.1/configure 2005-03-29 01:23:02.000000000 +0200 -+++ Python-2.4.1-st_flags/configure 2005-06-19 01:26:10.485461096 +0200 -@@ -16411,6 +16411,116 @@ - - fi - -+echo "$as_me:$LINENO: checking for struct stat.st_flags" >&5 -+echo $ECHO_N "checking for struct stat.st_flags... $ECHO_C" >&6 -+if test "${ac_cv_member_struct_stat_st_flags+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static struct stat ac_aggr; -+if (ac_aggr.st_flags) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_member_struct_stat_st_flags=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static struct stat ac_aggr; -+if (sizeof ac_aggr.st_flags) -+return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_member_struct_stat_st_flags=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_member_struct_stat_st_flags=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_flags" >&5 -+echo "${ECHO_T}$ac_cv_member_struct_stat_st_flags" >&6 -+if test $ac_cv_member_struct_stat_st_flags = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_STRUCT_STAT_ST_FLAGS 1 -+_ACEOF -+ -+ -+fi -+ - echo "$as_me:$LINENO: checking for struct stat.st_blocks" >&5 - echo $ECHO_N "checking for struct stat.st_blocks... $ECHO_C" >&6 - if test "${ac_cv_member_struct_stat_st_blocks+set}" = set; then -diff -ur Python-2.4.1/configure.in Python-2.4.1-st_flags/configure.in ---- Python-2.4.1/configure.in 2005-03-29 01:23:34.000000000 +0200 -+++ Python-2.4.1-st_flags/configure.in 2005-06-19 01:25:34.050000128 +0200 -@@ -2421,6 +2421,7 @@ - AC_STRUCT_TIMEZONE - AC_CHECK_MEMBERS([struct stat.st_rdev]) - AC_CHECK_MEMBERS([struct stat.st_blksize]) -+AC_CHECK_MEMBERS([struct stat.st_flags]) - AC_STRUCT_ST_BLOCKS - - AC_MSG_CHECKING(for time.h that defines altzone) -Only in Python-2.4.1-st_flags/: configure.in.orig -diff -ur Python-2.4.1/Modules/posixmodule.c Python-2.4.1-st_flags/Modules/posixmodule.c ---- Python-2.4.1/Modules/posixmodule.c 2005-03-13 23:18:26.000000000 +0100 -+++ Python-2.4.1-st_flags/Modules/posixmodule.c 2005-06-19 01:25:34.048000432 +0200 -@@ -703,6 +703,9 @@ - #ifdef HAVE_STRUCT_STAT_ST_RDEV - {"st_rdev", "device type (if inode device)"}, - #endif -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+ {"st_flags", "flags set onf ile"}, -+#endif - {0} - }; - -@@ -724,6 +727,12 @@ - #define ST_RDEV_IDX ST_BLOCKS_IDX - #endif - -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+#define ST_FLAGS_IDX (ST_RDEV_IDX+1) -+#else -+#define ST_FLAGS_IDX ST_RDEV_IDX -+#endif -+ - static PyStructSequence_Desc stat_result_desc = { - "stat_result", /* name */ - stat_result__doc__, /* doc */ -@@ -887,6 +896,10 @@ - PyStructSequence_SET_ITEM(v, ST_RDEV_IDX, - PyInt_FromLong((long)st.st_rdev)); - #endif -+#ifdef HAVE_STRUCT_STAT_ST_FLAGS -+ PyStructSequence_SET_ITEM(v, ST_FLAGS_IDX, -+ PyInt_FromLong((long)st.st_flags)); -+#endif - - if (PyErr_Occurred()) { - Py_DECREF(v); -Only in Python-2.4.1-st_flags/Modules: posixmodule.c.orig -diff -ur Python-2.4.1/pyconfig.h.in Python-2.4.1-st_flags/pyconfig.h.in ---- Python-2.4.1/pyconfig.h.in 2004-10-13 17:30:55.000000000 +0200 -+++ Python-2.4.1-st_flags/pyconfig.h.in 2005-06-19 01:26:10.971387224 +0200 -@@ -480,6 +480,9 @@ - /* Define to 1 if `st_blocks' is member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_BLOCKS - -+/* Define to 1 if `st_flags' is member of `struct stat'. */ -+#undef HAVE_STRUCT_STAT_ST_FLAGS -+ - /* Define to 1 if `st_rdev' is member of `struct stat'. */ - #undef HAVE_STRUCT_STAT_ST_RDEV - -Only in Python-2.4.1-st_flags/: pyconfig.h.in~ diff --git a/dev-lang/python/files/patches/2.4.2-readline.patch b/dev-lang/python/files/patches/2.4.2-readline.patch deleted file mode 100644 index 7c5ab7d..0000000 --- a/dev-lang/python/files/patches/2.4.2-readline.patch +++ /dev/null @@ -1,287 +0,0 @@ -diff -u configure configure ---- configure 2005-03-29 00:23:02.000000000 +0100 -+++ configure 2005-04-26 14:14:49.373258580 +0100 -@@ -19306,6 +19306,217 @@ - - fi - -+# what library does readline need to be linked with -+READLINE_SHARED_LIBADD="" -+echo "$as_me:$LINENO: checking for tgetent in -lncurses" >&5 -+echo $ECHO_N "checking for tgetent in -lncurses... $ECHO_C" >&6 -+if test "${ac_cv_lib_ncurses_tgetent+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lncurses $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char tgetent (); -+int -+main () -+{ -+tgetent (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_ncurses_tgetent=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_ncurses_tgetent=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5 -+echo "${ECHO_T}$ac_cv_lib_ncurses_tgetent" >&6 -+if test $ac_cv_lib_ncurses_tgetent = yes; then -+ READLINE_SHARED_LIBADD="-lncurses" -+else -+ echo "$as_me:$LINENO: checking for tgetent in -lcurses" >&5 -+echo $ECHO_N "checking for tgetent in -lcurses... $ECHO_C" >&6 -+if test "${ac_cv_lib_curses_tgetent+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lcurses $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char tgetent (); -+int -+main () -+{ -+tgetent (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_curses_tgetent=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_curses_tgetent=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5 -+echo "${ECHO_T}$ac_cv_lib_curses_tgetent" >&6 -+if test $ac_cv_lib_curses_tgetent = yes; then -+ READLINE_SHARED_LIBADD="-lcurses" -+else -+ echo "$as_me:$LINENO: checking for tgetent in -ltermcap" >&5 -+echo $ECHO_N "checking for tgetent in -ltermcap... $ECHO_C" >&6 -+if test "${ac_cv_lib_termcap_tgetent+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltermcap $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char tgetent (); -+int -+main () -+{ -+tgetent (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_termcap_tgetent=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_termcap_tgetent=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5 -+echo "${ECHO_T}$ac_cv_lib_termcap_tgetent" >&6 -+if test $ac_cv_lib_termcap_tgetent = yes; then -+ READLINE_SHARED_LIBADD="-ltermcap" -+fi -+ -+ -+fi -+ -+ -+fi -+ -+ - # check for readline 2.1 - echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 - echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6 -@@ -19313,7 +19524,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -ltermcap $LIBS" -+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19445,7 +19656,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -ltermcap $LIBS" -+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -19519,7 +19730,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline -ltermcap $LIBS" -+LIBS="-lreadline $READLINE_SHARED_LIBADD $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -diff -u configure.in configure.in ---- configure.in 2005-03-29 00:23:34.000000000 +0100 -+++ configure.in 2005-04-26 14:01:03.721206572 +0100 -@@ -2846,10 +2846,18 @@ - [Define this if you have flockfile(), getc_unlocked(), and funlockfile()]) - fi - -+# what library does readline need to be linked with -+READLINE_SHARED_LIBADD="" -+AC_CHECK_LIB(ncurses, tgetent, [READLINE_SHARED_LIBADD="-lncurses"], -+ AC_CHECK_LIB(curses, tgetent, [READLINE_SHARED_LIBADD="-lcurses"], -+ AC_CHECK_LIB(termcap, tgetent, [READLINE_SHARED_LIBADD="-ltermcap"]) -+ ) -+ ) -+ - # check for readline 2.1 - AC_CHECK_LIB(readline, rl_callback_handler_install, - AC_DEFINE(HAVE_RL_CALLBACK, 1, -- [Define if you have readline 2.1]), , -ltermcap) -+ [Define if you have readline 2.1]), , $READLINE_SHARED_LIBADD) - - # check for readline 2.2 - AC_TRY_CPP([#include <readline/readline.h>], -@@ -2865,12 +2873,12 @@ - # check for readline 4.0 - AC_CHECK_LIB(readline, rl_pre_input_hook, - AC_DEFINE(HAVE_RL_PRE_INPUT_HOOK, 1, -- [Define if you have readline 4.0]), , -ltermcap) -+ [Define if you have readline 4.0]), , $READLINE_SHARED_LIBADD) - - # check for readline 4.2 - AC_CHECK_LIB(readline, rl_completion_matches, - AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, -- [Define if you have readline 4.2]), , -ltermcap) -+ [Define if you have readline 4.2]), , $READLINE_SHARED_LIBADD) - - # also in readline 4.2 - AC_TRY_CPP([#include <readline/readline.h>], - diff --git a/dev-lang/python/files/patches/2.4.3-libdir.patch b/dev-lang/python/files/patches/2.4.3-libdir.patch deleted file mode 100644 index f75c756..0000000 --- a/dev-lang/python/files/patches/2.4.3-libdir.patch +++ /dev/null @@ -1,156 +0,0 @@ -diff -ur Python-2.4.3.orig/Lib/distutils/command/install.py Python-2.4.3/Lib/distutils/command/install.py ---- Python-2.4.3.orig/Lib/distutils/command/install.py 2005-01-20 19:15:39.000000000 +0000 -+++ Python-2.4.3/Lib/distutils/command/install.py 2006-08-16 15:15:27.000000000 +0100 -@@ -38,8 +38,8 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', -+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', -Only in Python-2.4.3/Lib/distutils/command: install.py~ -diff -ur Python-2.4.3.orig/Lib/distutils/sysconfig.py Python-2.4.3/Lib/distutils/sysconfig.py ---- Python-2.4.3.orig/Lib/distutils/sysconfig.py 2005-01-06 23:16:03.000000000 +0000 -+++ Python-2.4.3/Lib/distutils/sysconfig.py 2006-08-16 15:16:47.000000000 +0100 -@@ -100,7 +100,7 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "@@GENTOO_LIBDIR@@", "python" + get_python_version()) - if standard_lib: - return libpython - else: -Only in Python-2.4.3/Lib/distutils: sysconfig.py~ -diff -ur Python-2.4.3.orig/Lib/site.py Python-2.4.3/Lib/site.py ---- Python-2.4.3.orig/Lib/site.py 2006-08-16 15:06:40.000000000 +0100 -+++ Python-2.4.3/Lib/site.py 2006-08-16 15:19:21.000000000 +0100 -@@ -179,10 +179,10 @@ - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -- "lib", -+ "@@GENTOO_LIBDIR@@", - "python" + sys.version[:3], - "site-packages"), -- os.path.join(prefix, "lib", "site-python")] -+ os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python")] - sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] -Only in Python-2.4.3/Lib: site.py~ -diff -ur Python-2.4.3.orig/Makefile.pre.in Python-2.4.3/Makefile.pre.in ---- Python-2.4.3.orig/Makefile.pre.in 2006-03-13 13:08:41.000000000 +0000 -+++ Python-2.4.3/Makefile.pre.in 2006-08-16 15:11:25.000000000 +0100 -@@ -79,11 +79,11 @@ - - # Expanded directories - BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+LIBDIR= $(exec_prefix)/@@GENTOO_LIBDIR@@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@ - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) -Only in Python-2.4.3: Makefile.pre.in~ -diff -ur Python-2.4.3.orig/Modules/Setup.dist Python-2.4.3/Modules/Setup.dist ---- Python-2.4.3.orig/Modules/Setup.dist 2005-12-27 17:37:16.000000000 +0000 -+++ Python-2.4.3/Modules/Setup.dist 2006-08-16 15:19:14.000000000 +0100 -@@ -401,7 +401,7 @@ - #DB=/usr/local/BerkeleyDB.4.0 - #DBLIBVER=4.0 - #DBINC=$(DB)/include --#DBLIB=$(DB)/lib -+DBLIB=$(DB)/@@GENTOO_LIBDIR@@ - #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - - # Historical Berkeley DB 1.85 -@@ -447,7 +447,7 @@ - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz - - # Interface to the Expat XML parser - # -Only in Python-2.4.3/Modules: Setup.dist~ -diff -ur Python-2.4.3.orig/Modules/getpath.c Python-2.4.3/Modules/getpath.c ---- Python-2.4.3.orig/Modules/getpath.c 2006-02-20 17:37:39.000000000 +0000 -+++ Python-2.4.3/Modules/getpath.c 2006-08-16 15:21:21.000000000 +0100 -@@ -112,8 +112,8 @@ - #endif - - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION ":" \ -+ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload" - #endif - - #ifndef LANDMARK -@@ -124,7 +124,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -529,7 +529,7 @@ - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "@@GENTOO_LIBDIR@@/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - -Only in Python-2.4.3/Modules: getpath.c~ -diff -ur Python-2.4.3.orig/setup.py Python-2.4.3/setup.py ---- Python-2.4.3.orig/setup.py 2006-08-16 15:06:37.000000000 +0100 -+++ Python-2.4.3/setup.py 2006-08-16 15:13:53.000000000 +0100 -@@ -275,8 +275,7 @@ - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -+ '@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@', - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] - exts = [] -@@ -441,11 +440,11 @@ - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/@@GENTOO_LIBDIR@@/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'], - libraries=readline_libs) ) - if platform not in ['mac']: - # crypt module. -@@ -1023,8 +1022,7 @@ - added_lib_dirs.append('/usr/openwin/lib') - elif os.path.exists('/usr/X11R6/include'): - include_dirs.append('/usr/X11R6/include') -- added_lib_dirs.append('/usr/X11R6/lib64') -- added_lib_dirs.append('/usr/X11R6/lib') -+ added_lib_dirs.append('/usr/X11R6/@@GENTOO_LIBDIR@@') - elif os.path.exists('/usr/X11R5/include'): - include_dirs.append('/usr/X11R5/include') - added_lib_dirs.append('/usr/X11R5/lib') -Only in Python-2.4.3: setup.py~ diff --git a/dev-lang/python/files/patches/2.5-libdir.patch b/dev-lang/python/files/patches/2.5-libdir.patch deleted file mode 100644 index 0347f41..0000000 --- a/dev-lang/python/files/patches/2.5-libdir.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- ./Lib/distutils/sysconfig.py~ 2006-06-27 11:08:25.000000000 +0100 -+++ ./Lib/distutils/sysconfig.py 2006-08-09 14:38:58.000000000 +0100 -@@ -100,7 +100,8 @@ - - if os.name == "posix": - libpython = os.path.join(prefix, -- "lib", "python" + get_python_version()) -+ "@@GENTOO_LIBDIR@@", -+ "python" + get_python_version()) - if standard_lib: - return libpython - else: -@@ -409,7 +410,7 @@ - # command. (It's also needed for non-MS compilers on Windows, and - # it's taken care of for them by the 'build_ext.get_libraries()' - # method.) -- g['LDSHARED'] = ("%s -L%s/lib -lpython%s" % -+ g['LDSHARED'] = ("%s -L%s/@@GENTOO_LIBDIR@@ -lpython%s" % - (linkerscript, PREFIX, get_python_version())) - - global _config_vars ---- ./Lib/distutils/command/install.py~ 2006-03-27 22:55:21.000000000 +0100 -+++ ./Lib/distutils/command/install.py 2006-08-09 14:36:01.000000000 +0100 -@@ -38,8 +38,8 @@ - - INSTALL_SCHEMES = { - 'unix_prefix': { -- 'purelib': '$base/lib/python$py_version_short/site-packages', -- 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', -+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short/$dist_name', - 'scripts': '$base/bin', - 'data' : '$base', ---- ./Lib/site.py~ 2006-08-09 14:34:02.000000000 +0100 -+++ ./Lib/site.py 2006-08-09 14:40:31.000000000 +0100 -@@ -182,13 +182,13 @@ - sitedirs = [os.path.join(prefix, "Lib", "site-packages")] - elif os.sep == '/': - sitedirs = [os.path.join(prefix, -- "lib", -+ "@@GENTOO_LIBDIR@@", - "python" + sys.version[:3], - "site-packages"), -- os.path.join(prefix, "lib", "site-python")] -- sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs -+ os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python")] -+ sitedirs = [os.path.join(prefix, "@@GENTOO_LIBDIR@@", "portage","pym")] + sitedirs - else: -- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] -+ sitedirs = [prefix, os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-packages")] - if sys.platform == 'darwin': - # for framework builds *only* we add the standard Apple - # locations. Currently only per-user, but /Library and ---- ./Makefile.pre.in~ 2006-07-30 17:20:10.000000000 +0100 -+++ ./Makefile.pre.in 2006-08-09 14:46:42.000000000 +0100 -@@ -84,11 +84,11 @@ - - # Expanded directories - BINDIR= $(exec_prefix)/bin --LIBDIR= $(exec_prefix)/lib -+LIBDIR= $(exec_prefix)/@@GENTOO_LIBDIR@@ - MANDIR= @mandir@ - INCLUDEDIR= @includedir@ - CONFINCLUDEDIR= $(exec_prefix)/include --SCRIPTDIR= $(prefix)/lib -+SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@ - - # Detailed destination directories - BINLIBDEST= $(LIBDIR)/python$(VERSION) ---- ./setup.py~ 2006-08-09 14:45:13.000000000 +0100 -+++ ./setup.py 2006-08-09 14:46:21.000000000 +0100 -@@ -504,11 +504,11 @@ - elif self.compiler.find_library_file(lib_dirs, 'curses'): - readline_libs.append('curses') - elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -+ ['/usr/@@GENTOO_LIBDIR@@/termcap'], - 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], -+ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - if platform not in ['mac']: ---- ./Modules/Setup.dist~ 2006-08-09 14:42:29.000000000 +0100 -+++ ./Modules/Setup.dist 2006-08-09 14:42:45.000000000 +0100 -@@ -448,7 +448,7 @@ - # Andrew Kuchling's zlib module. - # This require zlib 1.1.3 (or later). - # See http://www.gzip.org/zlib/ --#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz -+zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz - - # Interface to the Expat XML parser - # ---- ./Modules/getpath.c~ 2006-08-09 14:43:13.000000000 +0100 -+++ ./Modules/getpath.c 2006-08-09 14:43:43.000000000 +0100 -@@ -129,7 +129,7 @@ - static char exec_prefix[MAXPATHLEN+1]; - static char progpath[MAXPATHLEN+1]; - static char *module_search_path = NULL; --static char lib_python[] = "lib/python" VERSION; -+static char lib_python[] = "@@GENTOO_LIBDIR@@/python" VERSION; - - static void - reduce(char *dir) -@@ -524,7 +524,7 @@ - } - else - strncpy(zip_path, PREFIX, MAXPATHLEN); -- joinpath(zip_path, "lib/python00.zip"); -+ joinpath(zip_path, "@@GENTOO_LIBDIR@@/python00.zip"); - bufsz = strlen(zip_path); /* Replace "00" with version */ - zip_path[bufsz - 6] = VERSION[0]; - zip_path[bufsz - 5] = VERSION[2]; -@@ -534,7 +534,7 @@ - fprintf(stderr, - "Could not find platform dependent libraries <exec_prefix>\n"); - strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN); -- joinpath(exec_prefix, "lib/lib-dynload"); -+ joinpath(exec_prefix, "@@GENTOO_LIBDIR@@/lib-dynload"); - } - /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - diff --git a/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch b/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch deleted file mode 100644 index edf42e4..0000000 --- a/dev-lang/python/files/patches/2.5-mimetypes_gentoo_apache.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/mimetypes.py.old 2006-08-09 14:31:43.000000000 +0100 -+++ Lib/mimetypes.py 2006-08-09 14:32:32.000000000 +0100 -@@ -33,6 +33,8 @@ - - knownfiles = [ - "/etc/mime.types", -+ "/etc/apache/conf/mime.types", # Gentoo Apache 1 -+ "/etc/apache2/conf/mime.types", # Gentoo Apache 2 - "/etc/httpd/mime.types", # Mac OS X - "/etc/httpd/conf/mime.types", # Apache - "/etc/apache/mime.types", # Apache 1 diff --git a/dev-lang/python/files/patches/2.5-readline.patch b/dev-lang/python/files/patches/2.5-readline.patch deleted file mode 100644 index e9ef328..0000000 --- a/dev-lang/python/files/patches/2.5-readline.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.in.old 2006-08-09 14:27:46.000000000 +0100 -+++ configure.in 2006-08-09 14:28:16.000000000 +0100 -@@ -3069,10 +3069,10 @@ - # save the value of LIBS so we don't actually link Python with readline - LIBS_no_readline=$LIBS - AC_CHECK_LIB(readline, readline) --if test "$ac_cv_have_readline_readline" = no --then -- AC_CHECK_LIB(termcap, readline) --fi -+#if test "$ac_cv_have_readline_readline" = no -+#then -+# AC_CHECK_LIB(termcap, readline) -+#fi - - # check for readline 2.1 - AC_CHECK_LIB(readline, rl_callback_handler_install, diff --git a/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch b/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch deleted file mode 100644 index 655eeed..0000000 --- a/dev-lang/python/files/patches/python-2.4-add_portage_search_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Lib/site.py 2004-09-03 15:10:33.158488512 -0700 -+++ Lib/site.py 2004-09-03 15:10:24.101865328 -0700 -@@ -183,6 +183,7 @@ - "python" + sys.version[:3], - "site-packages"), - os.path.join(prefix, "lib", "site-python")] -+ sitedirs = [os.path.join(prefix,"lib","portage","pym")] + sitedirs - else: - sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")] - if sys.platform == 'darwin': - diff --git a/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch b/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch deleted file mode 100644 index 808d7cb..0000000 --- a/dev-lang/python/files/patches/python-2.4-disable_modules_and_ssl.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- setup.py.old 2003-11-01 19:23:48.495647848 +0000 -+++ setup.py 2003-11-01 19:24:16.044459792 +0000 -@@ -15,7 +15,14 @@ - from distutils.command.install_lib import install_lib - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = os.environ["PYTHON_DISABLE_MODULES"].split() -+except KeyError: -+ disabled_module_list = [] -+try: -+ disable_ssl = os.environ["PYTHON_DISABLE_SSL"] -+except KeyError: -+ disable_ssl = 0 - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if -@@ -240,6 +247,7 @@ - return sys.platform - - def detect_modules(self): -+ global disable_ssl - # Ensure that /usr/local is always used - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -@@ -451,7 +459,8 @@ - ] ) - - if (ssl_incs is not None and -- ssl_libs is not None): -+ ssl_libs is not None and -+ not disable_ssl): - exts.append( Extension('_ssl', ['_ssl.c'], - include_dirs = ssl_incs, - library_dirs = ssl_libs, diff --git a/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch b/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch deleted file mode 100644 index 9cd1c31..0000000 --- a/dev-lang/python/files/patches/python-2.4-gentoo_py_dontcompile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Python-2.4/Python/import.c 2004-09-08 10:02:03.166032656 +0100 -+++ import.c 2004-09-08 10:02:57.423420120 +0100 -@@ -808,8 +808,12 @@ - write_compiled_module(PyCodeObject *co, char *cpathname, long mtime) - { - FILE *fp; -- -- fp = open_exclusive(cpathname); -+ char *py_dontcompile = getenv("PYTHON_DONTCOMPILE"); -+ -+ if (!py_dontcompile) -+ fp = open_exclusive(cpathname); -+ else -+ fp = NULL; - if (fp == NULL) { - if (Py_VerboseFlag) - PySys_WriteStderr( - diff --git a/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch b/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch deleted file mode 100644 index 6a78648..0000000 --- a/dev-lang/python/files/patches/python-2.4.1-crosscompile.patch +++ /dev/null @@ -1,106 +0,0 @@ -Ripped from OpenEmbedded - ---- Python-2.4c1/Makefile.pre.in -+++ Python-2.4c1/Makefile.pre.in -@@ -162,6 +162,7 @@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - # === Definitions added by makesetup === - -@@ -188,7 +189,7 @@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -- -+HOSTPGEN= $(PGEN)$(EXE) - POBJS= \ - Parser/acceler.o \ - Parser/grammar1.o \ -@@ -320,8 +321,8 @@ - # Build the shared modules - sharedmods: $(BUILDPYTHON) - case $$MAKEFLAGS in \ -- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ -- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ -+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py -q build;; \ -+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' $(HOSTPYTHON) -E $(srcdir)/setup.py build;; \ - esac - - # buildno should really depend on something like LIBRARY_SRC -@@ -442,7 +443,7 @@ - - - $(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -- -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ -$(HOSTPGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -@@ -718,19 +719,19 @@ - done - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'badsyntax|site-packages' $(DESTDIR)$(LIBDEST) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -- ./$(BUILDPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -+ $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - -@@ -825,7 +826,7 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: -- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ -+ $(RUNSHARED) $(HOSTPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ ---- Python-2.4c1/setup.py -+++ Python-2.4c1/setup.py -@@ -206,6 +206,7 @@ - try: - imp.load_dynamic(ext.name, ext_filename) - except ImportError, why: -+ return - self.announce('*** WARNING: renaming "%s" since importing it' - ' failed: %s' % (ext.name, why), level=3) - assert not self.inplace -@@ -239,8 +240,6 @@ - - def detect_modules(self): - # Ensure that /usr/local is always used -- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') -- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - - # Add paths to popular package managers on OS X/darwin - if sys.platform == "darwin": -@@ -260,12 +260,6 @@ - add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/opt/local/include') - -- if os.path.normpath(sys.prefix) != '/usr': -- add_dir_to_list(self.compiler.library_dirs, -- sysconfig.get_config_var("LIBDIR")) -- add_dir_to_list(self.compiler.include_dirs, -- sysconfig.get_config_var("INCLUDEDIR")) -- - try: - have_unicode = unicode - except NameError: diff --git a/dev-lang/python/files/patches/python-2.4.3-db4.patch b/dev-lang/python/files/patches/python-2.4.3-db4.patch deleted file mode 100644 index 0ad5b3b..0000000 --- a/dev-lang/python/files/patches/python-2.4.3-db4.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- setup.py.old 2006-04-02 11:33:32.000000000 +0200 -+++ setup.py 2006-04-02 11:34:57.000000000 +0200 -@@ -500,30 +500,13 @@ - # construct a list of paths to look for the header file in on - # top of the normal inc_dirs. - db_inc_paths = [ -+ '/usr/include/db4.3', -+ '/usr/include/db4.2', -+ '/usr/include/db4.1', - '/usr/include/db4', -- '/usr/local/include/db4', -- '/opt/sfw/include/db4', -- '/sw/include/db4', -- '/usr/include/db3', -- '/usr/local/include/db3', -- '/opt/sfw/include/db3', -- '/sw/include/db3', -+ '/usr/include/db3.2', -+ '/usr/include/db3', - ] -- # 4.x minor number specific paths -- for x in (0,1,2,3,4): -- db_inc_paths.append('/usr/include/db4%d' % x) -- db_inc_paths.append('/usr/include/db4.%d' % x) -- db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) -- db_inc_paths.append('/usr/local/include/db4%d' % x) -- db_inc_paths.append('/pkg/db-4.%d/include' % x) -- db_inc_paths.append('/opt/db-4.%d/include' % x) -- # 3.x minor number specific paths -- for x in (2,3): -- db_inc_paths.append('/usr/include/db3%d' % x) -- db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x) -- db_inc_paths.append('/usr/local/include/db3%d' % x) -- db_inc_paths.append('/pkg/db-3.%d/include' % x) -- db_inc_paths.append('/opt/db-3.%d/include' % x) - - db_ver_inc_map = {} - diff --git a/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch b/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch deleted file mode 100644 index ed2e3c8..0000000 --- a/dev-lang/python/files/patches/python-2.4.3-gentoo_obsd-r1.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur Python-2.4.3.orig/Include/Python.h Python-2.4.3/Include/Python.h ---- Python-2.4.3.orig/Include/Python.h 2006-05-04 14:20:30.000000000 +0000 -+++ Python-2.4.3/Include/Python.h 2006-05-04 14:21:26.000000000 +0000 -@@ -2,6 +2,11 @@ - #define Py_PYTHON_H - /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ - -+/* Required on Gentoo/OpenBSD */ -+#if defined(__OpenBSD__) -+#include <sys/types.h> -+#endif -+ - /* Include nearly all Python header files */ - - #include "patchlevel.h" -diff -Naur Python-2.4.3.orig/configure.in Python-2.4.3/configure.in ---- Python-2.4.3.orig/configure.in 2006-05-04 14:20:30.000000000 +0000 -+++ Python-2.4.3/configure.in 2006-05-04 14:23:22.000000000 +0000 -@@ -1528,9 +1528,16 @@ - - # only check for sem_ini if thread support is requested - if test "$with_threads" = "yes" -o -z "$with_threads"; then -+ case "$ac_sys_system" in -+ OpenBSD*) -+ LIBS="-pthread ${LIBS}" -+ ;; -+ *) - AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris - # posix4 on Solaris 2.6 - # pthread (first!) on Linux -+ ;; -+ esac - fi - - # check if we need libintl for locale functions diff --git a/dev-lang/python/files/python-config-2.4 b/dev-lang/python/files/python-config-2.4 new file mode 100644 index 0000000..db91332 --- /dev/null +++ b/dev-lang/python/files/python-config-2.4 @@ -0,0 +1,4 @@ +#!/usr/bin/python +import distutils.sysconfig, string +print "-lpython2.4 -lm -L/usr/lib/python2.4/config",string.join(string.split(distutils.sysconfig.get_config_var("MODLIBS"))) + diff --git a/dev-lang/python/files/python-config-2.5 b/dev-lang/python/files/python-config-2.5 deleted file mode 100644 index 6a799bc..0000000 --- a/dev-lang/python/files/python-config-2.5 +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/python - -import distutils.sysconfig -import sys - -pyver = sys.version[:3] -modlibs = distutils.sysconfig.get_config_var("MODLIBS") -print "-lpython%s -lm -L@PYTHON_LIBDIR@/python%s/config %s" % \ - (pyver, pyver, modlibs) - - diff --git a/dev-lang/python/python-2.4.3-r2.ebuild b/dev-lang/python/python-2.4.3-r2.ebuild index 5e20056..dc3c4af 100644 --- a/dev-lang/python/python-2.4.3-r2.ebuild +++ b/dev-lang/python/python-2.4.3-r2.ebuild @@ -7,26 +7,24 @@ # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils flag-o-matic python multilib versionator toolchain-funcs +inherit eutils flag-o-matic python multilib versionator toolchain-funcs alternatives # we need this so that we don't depends on python.eclass PYVER_MAJOR=$(get_major_version) PYVER_MINOR=$(get_version_component_range 2) PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" -PATCHTAR="${PN}-${PYVER}-patches-2" - MY_P="Python-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." HOMEPAGE="http://www.python.org/" SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2 - mirror://gentoo/${PATCHTAR}.tar.bz2" + mirror://gentoo/python-gentoo-patches-${PV}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.4" #KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -KEYWORDS="-x86 -amd64" +KEYWORDS="~x86 -amd64" IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 doc nocxx" DEPEND=">=sys-libs/zlib-1.1.3 @@ -63,20 +61,20 @@ src_unpack() { cd ${S} # unnecessary termcap dep in readline (#79013) - epatch ${FILESDIR}/patches/2.4.2-readline.patch + epatch ${WORKDIR}/${PV}/2.4.2-readline.patch # db4.2 support - epatch ${FILESDIR}/patches/${P}-db4.patch + epatch ${WORKDIR}/${PV}/2.4.3-db4.patch # adds support for PYTHON_DONTCOMPILE shell environment to # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) - epatch ${FILESDIR}/patches/python-2.4-gentoo_py_dontcompile.patch - epatch ${FILESDIR}/patches/python-2.4-disable_modules_and_ssl.patch - epatch ${FILESDIR}/patches/2.4-mimetypes_apache.patch + epatch ${WORKDIR}/${PV}/2.4-gentoo_py_dontcompile.patch + epatch ${WORKDIR}/${PV}/2.4-disable_modules_and_ssl.patch + epatch ${WORKDIR}/${PV}/2.4-mimetypes_apache.patch # prepends /usr/lib/portage/pym to sys.path - epatch ${FILESDIR}/patches/python-2.4-add_portage_search_path.patch + epatch ${WORKDIR}/${PV}/2.4-add_portage_search_path.patch - epatch ${FILESDIR}/patches/2.4.3-libdir.patch + epatch ${WORKDIR}/${PV}/2.4.3-libdir.patch sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ Lib/distutils/sysconfig.py \ @@ -87,7 +85,7 @@ src_unpack() { setup.py || die # add support for struct stat st_flags attribute (bug 94637) - epatch ${FILESDIR}/patches/2.4.1-st_flags.patch + epatch ${WORKDIR}/${PV}/2.4.1-st_flags.patch # fix os.utime() on hppa. utimes it not supported but unfortunately # reported as working - gmsoft (22 May 04) @@ -95,11 +93,11 @@ src_unpack() { [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure if tc-is-cross-compiler ; then - epatch ${FILESDIR}/patches/python-2.4.1-crosscompile.patch + epatch ${WORKDIR}/${PV}/2.4.1-crosscompile.patch fi # fix gentoo/obsd problems (bug 117261) - epatch ${FILESDIR}/patches/python-2.4.3-gentoo_obsd-r1.patch + epatch ${WORKDIR}/${PV}/2.4.3-gentoo_obsd.patch } src_configure() { @@ -191,10 +189,31 @@ src_install() { # install our own custom python-config exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PYVER} python-config + doexe ${FILESDIR}/python-config-${PYVER} # Use correct libdir in python-config - dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config + dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config-${PYVER} + + # install python-updater in /usr/sbin + newsbin ${FILESDIR}/python-updater-r1 python-updater + + if use build ; then + rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} + else + use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test} + use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb + use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk + fi + + # Fix slotted collisions + mv ${D}/usr/bin/pydoc ${D}/usr/bin/pydoc${PYVER} + mv ${D}/usr/bin/idle ${D}/usr/bin/idle${PYVER} + mv ${D}/usr/share/man/man1/python.1 \ + ${D}/usr/share/man/man1/python${PYVER}.1 + rm -f ${D}/usr/bin/smtpd.py + + prep_ml_includes usr/include/python${PYVER} + # The stuff below this line extends from 2.1, and should be deprecated # in 2.3, or possibly can wait till 2.4 @@ -210,25 +229,20 @@ src_install() { dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \ /usr/$(get_libdir)/python${PYVER}/config/Makefile - # install python-updater in /usr/sbin - #dosbin ${FILESDIR}/python-updater - newsbin ${FILESDIR}/python-updater-r1 python-updater - - if use build ; then - rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} - else - use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test} - use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb - use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk - fi - - prep_ml_includes usr/include/python${PYVER} } pkg_postrm() { python_makesym + alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/python-config" \ + "python-config-[0-9].[0-9]" + alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \ + "python[0-9].[0-9].1.gz" + python_mod_cleanup /usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_cleanup /usr/$(get_libdir)/python${PYVER} } pkg_postinst() { @@ -236,9 +250,19 @@ pkg_postinst() { myroot=$(echo $ROOT | sed 's:/$::') python_makesym + alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/python-config" \ + "python-config-[0-9].[0-9]" + alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \ + "python[0-9].[0-9].1.gz" + python_mod_optimize - python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER} + python_mod_optimize -x site-packages \ + -x test ${myroot}/usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_optimize -x site-packages \ + -x test ${myroot}/usr/$(get_libdir)/python${PYVER} # workaround possible python-upgrade-breaks-portage situation @@ -251,14 +275,10 @@ pkg_postinst() { fi fi - # try to upgrade to new python automatically - something to think about - #if [ "${ROOT}" = "/" ]; then - # /usr/sbin/python-updater - #fi - echo ewarn - ewarn "If you have just upgraded from an older version of python you will need to run:" + ewarn "If you have just upgraded from an older version of python you" + ewarn "will need to run:" ewarn ewarn "/usr/sbin/python-updater" ewarn diff --git a/dev-lang/python/python-2.5_beta3.ebuild b/dev-lang/python/python-2.5_beta3.ebuild deleted file mode 100644 index 4658a94..0000000 --- a/dev-lang/python/python-2.5_beta3.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.4.3-r1.ebuild,v 1.12 2006/07/20 17:25:17 blubb Exp $ - -# NOTE about python-portage interactions : -# - Do not add a pkg_setup() check for a certain version of portage -# in dev-lang/python. It _WILL_ stop people installing from -# Gentoo 1.4 images. - -inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs - -# we need this so that we don't depends on python.eclass -PYVER_MAJOR=$(get_major_version) -PYVER_MINOR=$(get_version_component_range 2) -PYVER="${PYVER_MAJOR}.${PYVER_MINOR}" - -MY_PV=${PV/_beta/b} -MY_P="Python-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." -HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2" - -LICENSE="PSF-2.2" -SLOT="2.5" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="ncurses gdbm ssl readline tk berkdb bootstrap ipv6 build ucs2 sqlite doc nocxx" - -# 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 - !build? ( - sqlite? ( !=dev-python/pysqlite-2* - >=dev-db/sqlite-3 ) - tk? ( >=dev-lang/tk-8.0 ) - ncurses? ( >=sys-libs/ncurses-5.2 - readline? ( >=sys-libs/readline-4.1 ) ) - berkdb? ( >=sys-libs/db-3.1 ) - gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) - doc? ( =dev-python/python-docs-${PV}* ) - dev-libs/expat - )" - -# 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 - -# NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri - -PDEPEND="${DEPEND} dev-python/python-fchksum" - -PROVIDE="virtual/python" - -# confcache breaks a dlopen check, causing python to not support -# loading .so files - marienz -RESTRICT="confcache" - -src_unpack() { - unpack ${A} - cd ${S} - - # unnecessary termcap dep in readline (#79013) - epatch "${FILESDIR}/patches/2.5-readline.patch" - # db4.2 support - epatch "${FILESDIR}/patches/${PN}-2.4.3-db4.patch" - - # adds support for PYTHON_DONTCOMPILE shell environment to - # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) - epatch "${FILESDIR}/patches/${PN}-2.4-gentoo_py_dontcompile.patch" - epatch "${FILESDIR}/patches/${PN}-2.4-disable_modules_and_ssl.patch" - epatch "${FILESDIR}/patches/2.5-mimetypes_gentoo_apache.patch" - - # prepends /usr/lib/portage/pym to sys.path - epatch "${FILESDIR}/patches/${PN}-2.4-add_portage_search_path.patch" - - epatch "${FILESDIR}/patches/2.5-libdir.patch" - sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ - Lib/distutils/command/install.py \ - Lib/distutils/sysconfig.py \ - Lib/site.py \ - Makefile.pre.in \ - Modules/Setup.dist \ - Modules/getpath.c \ - setup.py || die - - # fix os.utime() on hppa. utimes it not supported but unfortunately reported as working - gmsoft (22 May 04) - # PLEASE LEAVE THIS FIX FOR NEXT VERSIONS AS IT'S A CRITICAL FIX !!! - [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure - - if tc-is-cross-compiler ; then - epatch "${FILESDIR}/patches/${PN}-2.4.1-crosscompile.patch" - fi - - # fix gentoo/obsd problems (bug 117261) - epatch "${FILESDIR}/patches/${PN}-2.4.3-gentoo_obsd-r1.patch" - - eautoreconf -} - -src_configure() { - # disable extraneous modules with extra dependencies - if use build; then - export PYTHON_DISABLE_MODULES="readline pyexpat dbm gdbm bsddb _curses _curses_panel _tkinter _sqlite3" - export PYTHON_DISABLE_SSL=1 - else - use gdbm \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} gdbm" - use berkdb \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} dbm bsddb" - use readline \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} readline" - use tk \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _tkinter" - use ncurses \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _curses _curses_panel" - use sqlite \ - || PYTHON_DISABLE_MODULES="${PYTHON_DISABLE_MODULES} _sqlite3" - use ssl \ - || export PYTHON_DISABLE_SSL=1 - export PYTHON_DISABLE_MODULES - echo $PYTHON_DISABLE_MODULES - fi -} - -src_compile() { - filter-flags -malign-double - - # Seems to no longer be necessary - #[ "${ARCH}" = "amd64" ] && append-flags -fPIC - [ "${ARCH}" = "alpha" ] && append-flags -fPIC - - # http://bugs.gentoo.org/show_bug.cgi?id=50309 - if is-flag -O3; then - is-flag -fstack-protector-all && replace-flags -O3 -O2 - use hardened && replace-flags -O3 -O2 - fi - - export OPT="${CFLAGS}" - - local myconf - #if we are creating a new build image, we remove the dependency on g++ - if use build && ! use bootstrap || use nocxx ; then - myconf="--with-cxx=no" - fi - - # super-secret switch. don't use this unless you know what you're - # doing. enabling UCS2 support will break your existing python - # modules - use ucs2 \ - && myconf="${myconf} --enable-unicode=ucs2" \ - || myconf="${myconf} --enable-unicode=ucs4" - - src_configure - - if tc-is-cross-compiler ; then - OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \ - ./configure --with-cxx=no || die "cross-configure failed" - emake python Parser/pgen || die "cross-make failed" - mv python hostpython - mv Parser/pgen Parser/hostpgen - make distclean - sed -i \ - -e '/^HOSTPYTHON/s:=.*:=./hostpython:' \ - -e '/^HOSTPGEN/s:=.*:=./Parser/hostpgen:' \ - Makefile.pre.in || die - fi - - # export CXX so it ends up in /usr/lib/python2.x/config/Makefile - tc-export CXX - # set LINKCC to prevent python from being linked to libstdc++.so - export LINKCC="\$(PURIFY) \$(CC)" - econf \ - --with-fpectl \ - --enable-shared \ - `use_enable ipv6` \ - --infodir='${prefix}'/share/info \ - --mandir='${prefix}'/share/man \ - --with-threads \ - --with-libc='' \ - ${myconf} || die - emake || die "Parallel make failed" -} - -src_install() { - dodir /usr - src_configure - make DESTDIR="${D}" altinstall maninstall || die - - # install our own custom python-config - exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PYVER} python-config - - # Use correct libdir in python-config - dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config - - # The stuff below this line extends from 2.1, and should be deprecated - # in 2.3, or possibly can wait till 2.4 - - # seems like the build do not install Makefile.pre.in anymore - # it probably shouldn't - use DistUtils, people! - insinto /usr/$(get_libdir)/python${PYVER}/config - doins ${S}/Makefile.pre.in - - # While we're working on the config stuff... Let's fix the OPT var - # so that it doesn't have any opts listed in it. Prevents the problem - # with compiling things with conflicting opts later. - dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \ - /usr/$(get_libdir)/python${PYVER}/config/Makefile - - # install python-updater in /usr/sbin - #dosbin ${FILESDIR}/python-updater - newsbin ${FILESDIR}/python-updater-r1 python-updater - - if use build ; then - rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} - else - use elibc_uclibc && rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,bsddb/test} - use berkdb || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/bsddb - use tk || rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/lib-tk - fi - - prep_ml_includes usr/include/python${PYVER} -} - -pkg_postrm() { - python_makesym - python_mod_cleanup /usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER} -} - -pkg_postinst() { - local myroot - myroot=$(echo $ROOT | sed 's:/$::') - - python_makesym - python_mod_optimize - python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER} - - - # workaround possible python-upgrade-breaks-portage situation - if [ ! -f ${myroot}/usr/lib/portage/pym/portage.py ]; then - if [ -f ${myroot}/usr/lib/python2.3/site-packages/portage.py ]; then - einfo "Working around possible python-portage upgrade breakage" - mkdir -p ${myroot}/usr/lib/portage/pym - cp ${myroot}/usr/lib/python2.4/site-packages/{portage,xpak,output,cvstree,getbinpkg,emergehelp,dispatch_conf}.py ${myroot}/usr/lib/portage/pym - python_mod_optimize ${myroot}/usr/lib/portage/pym - fi - fi - - # try to upgrade to new python automatically - something to think about - #if [ "${ROOT}" = "/" ]; then - # /usr/sbin/python-updater - #fi - - echo - ewarn - ewarn "If you have just upgraded from an older version of python you will need to run:" - ewarn - ewarn "/usr/sbin/python-updater" - ewarn - ewarn "This will automatically rebuild all the python dependent modules" - ewarn "to run with python-${PYVER}." - ewarn - ewarn "Your original Python is still installed and can be accessed via" - ewarn "/usr/bin/python2.x." - ewarn - ebeep 5 -} - -src_test() { - # PYTHON_DONTCOMPILE=1 breaks test_import - unset PYTHON_DONTCOMPILE - - #skip all tests that fail during emerge but pass without emerge: - #(See bug# 67970) - local skip_tests="distutils global mimetools minidom mmap strptime subprocess syntax tcl time urllib urllib2 webbrowser" - - for test in ${skip_tests} ; do - mv ${S}/Lib/test/test_${test}.py ${T} - done - - # rerun failed tests in verbose mode (regrtest -w) - EXTRATESTOPTS="-w" make test || die "make test failed" - - for test in ${skip_tests} ; do - mv ${T}/test_${test}.py ${S}/Lib/test/test_${test}.py - done - - einfo "Portage skipped the following tests which aren't able to run from emerge:" - for test in ${skip_tests} ; do - einfo "test_${test}.py" - done - - einfo "If you'd like to run them, you may:" - einfo "cd /usr/lib/python${PYVER}/test" - einfo "and run the tests separately." -} diff --git a/dev-lang/python/python-2.5_rc1.ebuild b/dev-lang/python/python-2.5_rc1.ebuild index e3daa01..d4f0a2b 100644 --- a/dev-lang/python/python-2.5_rc1.ebuild +++ b/dev-lang/python/python-2.5_rc1.ebuild @@ -7,7 +7,7 @@ # in dev-lang/python. It _WILL_ stop people installing from # Gentoo 1.4 images. -inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs +inherit eutils autotools flag-o-matic python multilib versionator toolchain-funcs alternatives # we need this so that we don't depends on python.eclass PYVER_MAJOR=$(get_major_version) @@ -20,7 +20,8 @@ S="${WORKDIR}/${MY_P}" DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language." HOMEPAGE="http://www.python.org/" -SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2" +SRC_URI="http://www.python.org/ftp/python/${PYVER}/${MY_P}.tar.bz2 + mirror://gentoo/python-gentoo-patches-${PYVER}.tar.bz2" LICENSE="PSF-2.2" SLOT="2.5" @@ -54,7 +55,6 @@ DEPEND=">=sys-libs/zlib-1.1.3 # NOTE: changed RDEPEND to PDEPEND to resolve bug 88777. - kloeri PDEPEND="${DEPEND} dev-python/python-fchksum" - PROVIDE="virtual/python" # confcache breaks a dlopen check, causing python to not support @@ -63,23 +63,23 @@ RESTRICT="confcache" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # unnecessary termcap dep in readline (#79013) - epatch "${FILESDIR}/patches/2.5-readline.patch" + epatch "${WORKDIR}/${PYVER}/2.5-readline.patch" # db4.2 support - epatch "${FILESDIR}/patches/${PN}-2.4.3-db4.patch" + epatch "${WORKDIR}/${PYVER}/2.4.3-db4.patch" # adds support for PYTHON_DONTCOMPILE shell environment to # supress automatic generation of .pyc and .pyo files - liquidx (08 Oct 03) - epatch "${FILESDIR}/patches/${PN}-2.4-gentoo_py_dontcompile.patch" - epatch "${FILESDIR}/patches/${PN}-2.4-disable_modules_and_ssl.patch" - epatch "${FILESDIR}/patches/2.5-mimetypes_gentoo_apache.patch" + epatch "${WORKDIR}/${PYVER}/2.4-gentoo_py_dontcompile.patch" + epatch "${WORKDIR}/${PYVER}/2.4-disable_modules_and_ssl.patch" + epatch "${WORKDIR}/${PYVER}/2.5-mimetypes_gentoo_apache.patch" # prepends /usr/lib/portage/pym to sys.path - epatch "${FILESDIR}/patches/${PN}-2.4-add_portage_search_path.patch" + epatch "${WORKDIR}/${PYVER}/2.4-add_portage_search_path.patch" - epatch "${FILESDIR}/patches/2.5-libdir.patch" + epatch "${WORKDIR}/${PYVER}/2.5-libdir.patch" sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \ Lib/distutils/command/install.py \ Lib/distutils/sysconfig.py \ @@ -94,11 +94,11 @@ src_unpack() { [ "${ARCH}" = "hppa" ] && sed -e 's/utimes //' -i ${S}/configure if tc-is-cross-compiler ; then - epatch "${FILESDIR}/patches/${PN}-2.4.1-crosscompile.patch" + epatch "${WORKDIR}/${PYVER}/2.4.1-crosscompile.patch" fi # fix gentoo/obsd problems (bug 117261) - epatch "${FILESDIR}/patches/${PN}-2.4.3-gentoo_obsd-r1.patch" + epatch "${WORKDIR}/${PYVER}/2.4.3-gentoo_obsd.patch" eautoreconf } @@ -192,20 +192,17 @@ src_install() { src_configure make DESTDIR="${D}" altinstall maninstall || die - # install our own custom python-config - exeinto /usr/bin - newexe ${FILESDIR}/python-config-${PYVER} python-config - - # Use correct libdir in python-config - dosed "s:/usr/lib/:/usr/$(get_libdir)/:" /usr/bin/python-config + mv ${D}/usr/bin/python${PYVER}-config ${D}/usr/bin/python-config-${PYVER} - # The stuff below this line extends from 2.1, and should be deprecated - # in 2.3, or possibly can wait till 2.4 + # Fix slotted collisions + mv ${D}/usr/bin/pydoc ${D}/usr/bin/pydoc${PYVER} + mv ${D}/usr/bin/idle ${D}/usr/bin/idle${PYVER} + mv ${D}/usr/share/man/man1/python.1 \ + ${D}/usr/share/man/man1/python${PYVER}.1 + rm -f ${D}/usr/bin/smtpd.py - # seems like the build do not install Makefile.pre.in anymore - # it probably shouldn't - use DistUtils, people! - insinto /usr/$(get_libdir)/python${PYVER}/config - doins ${S}/Makefile.pre.in + # install python-updater in /usr/sbin + newsbin ${FILESDIR}/python-updater-r1 python-updater # While we're working on the config stuff... Let's fix the OPT var # so that it doesn't have any opts listed in it. Prevents the problem @@ -213,10 +210,6 @@ src_install() { dosed -e 's:^OPT=.*:OPT=-DNDEBUG:' \ /usr/$(get_libdir)/python${PYVER}/config/Makefile - # install python-updater in /usr/sbin - #dosbin ${FILESDIR}/python-updater - newsbin ${FILESDIR}/python-updater-r1 python-updater - if use build ; then rm -rf ${D}/usr/$(get_libdir)/python${PYVER}/{test,encodings,email,lib-tk,bsddb/test} else @@ -226,12 +219,28 @@ src_install() { fi prep_ml_includes usr/include/python${PYVER} + + # The stuff below this line extends from 2.1, and should be deprecated + # in 2.3, or possibly can wait till 2.4 + + # seems like the build do not install Makefile.pre.in anymore + # it probably shouldn't - use DistUtils, people! + insinto /usr/$(get_libdir)/python${PYVER}/config + doins ${S}/Makefile.pre.in } pkg_postrm() { python_makesym + alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]" + alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \ + "python[0-9].[0-9].1.gz" + alternatives_auto_makesym "/usr/bin/python-config" \ + "python-config-[0-9].[0-9]" + python_mod_cleanup /usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_cleanup /usr/$(get_libdir)/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_cleanup /usr/$(get_libdir)/python${PYVER} } pkg_postinst() { @@ -239,9 +248,19 @@ pkg_postinst() { myroot=$(echo $ROOT | sed 's:/$::') python_makesym + alternatives_auto_makesym "/usr/bin/idle" "idle[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/pydoc" "pydoc[0-9].[0-9]" + alternatives_auto_makesym "/usr/bin/python-config" \ + "python-config-[0-9].[0-9]" + alternatives_auto_makesym "/usr/share/man/man1/python.1.gz" \ + "python[0-9].[0-9].1.gz" + python_mod_optimize - python_mod_optimize -x site-packages -x test ${myroot}/usr/lib/python${PYVER} - [[ "$(get_libdir)" == "lib" ]] || python_mod_optimize -x site-packages -x test ${myroot}/usr/$(get_libdir)/python${PYVER} + python_mod_optimize -x site-packages \ + -x test ${myroot}/usr/lib/python${PYVER} + [[ "$(get_libdir)" == "lib" ]] || \ + python_mod_optimize -x site-packages \ + -x test ${myroot}/usr/$(get_libdir)/python${PYVER} # workaround possible python-upgrade-breaks-portage situation @@ -254,14 +273,10 @@ pkg_postinst() { fi fi - # try to upgrade to new python automatically - something to think about - #if [ "${ROOT}" = "/" ]; then - # /usr/sbin/python-updater - #fi - echo ewarn - ewarn "If you have just upgraded from an older version of python you will need to run:" + ewarn "If you have just upgraded from an older version of python you will" + ewarn "need to run:" ewarn ewarn "/usr/sbin/python-updater" ewarn |