Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils.

Check availability of nis headers before building of nis module (bug #288110).
Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation
(bug #299044). Depend on >=app-admin/eselect-python-20091230, which allows
wrapper scipts generated by python_generate_wrapper_scripts() and requiring
Python-2-specific target scripts to work correctly, when Python 3 is set as
main active version of Python.
Package-Manager: portage-15155-svn/cvs/Linux x86_64

3 files changed, 43 insertions, 31 deletions

diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index 60480930c270..3afff4efafbf 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.442 2010/01/01 18:56:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.443 2010/01/01 19:54:43 arfrever Exp $
+
+  01 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  python-3.1.1-r1.ebuild:
+  Respect PYTHONDONTWRITEBYTECODE / sys.dont_write_bytecode in distutils.
+  Check availability of nis headers before building of nis module (bug #288110).
+  Use pkg-config found by AC_PATH_TOOL() to avoid problem during crosscompilation
+  (bug #299044). Depend on >=app-admin/eselect-python-20091230, which allows
+  wrapper scipts generated by python_generate_wrapper_scripts() and requiring
+  Python-2-specific target scripts to work correctly, when Python 3 is set as
+  main active version of Python.
 
 *python-2.5.4-r4 (01 Jan 2010)
 
@@ -976,23 +986,23 @@
   bug 150595 dev-lang/python-2.5 fails to compile with LC_ALL=de_DE@euro
   bug 150732 python-2.4.3-r4 does not honor ROOT
   bug 159967 python doesn't add pthread to LIBS correctly on BSD
-  
+
   Other problems fixed:
   bug 148362 File collision between python-2.4* and python-2.5*
   bug 151695 dev-python/python-docs env.d entry incorrect
   bug 158383 emerging python-2.4.3-r4 segfaults with -ipv6
   bug 165268 dev-lang/python-2.4.4 fails to build the dbm module
-  
+
   Test failures fixed:
   bug 82469: QA issue: python-2.3.5-maketest failes with propolice
   bug 124188 dev-lang/python-2.4.2 fails test_cookielib
   bug 154247 dev-lang/python-2.4.4 tests failed: test_sax failed -- 1 of 42 tests failed: test_xmlgen_attr_escape
-  
+
   Feature requests:
   bug 131325 python 2.4.4/2.3.6 enable pthreads inconditionaly
   bug 135617 dev-lang/python should install Tools/freeze
   bug 176066 dev-lang/python-2.5.1 bump
-  
+
   Fixed in current upstream version:
   bug 90660 python-2.3.5: No module named fcntl
   bug 144798 dev-lang/python-2.4.3 with TZ=Australia/Melbourne fails test
@@ -1111,9 +1121,9 @@
   11 Jul 2006; Alastair Tse <liquidx@gentoo.org> python-2.4.3-r1.ebuild:
   python-2.2.3-r6.ebuild, python-2.3.5-r2.ebuild, python-2.4.2.ebuild,
   python-2.4.2-r1.ebuild, python-2.4.2-r2.ebuild, python-2.4.3.ebuild,
-  python-2.4.3-r1.ebuild:	
+  python-2.4.3-r1.ebuild:
   Typo fix in DESCRIPTION (#139463)
-	
+
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> python-2.4.3-r1.ebuild:
   Marked stable on mips.
 
@@ -1543,7 +1553,7 @@
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> python-2.2.2.ebuild,
   python-2.2.3-r5.ebuild, python-2.3.3-r1.ebuild, python-2.3.3.ebuild,
   python-2.3.4.ebuild, python-2.3.4_rc1.ebuild:
-  QA - fix use invocation and a bug in the 2.3.4 ebuilds: 
+  QA - fix use invocation and a bug in the 2.3.4 ebuilds:
   [ -z "use X" -o -z "use tcltk" ] doesn't do what you meant it to do
 
   20 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> python-2.3.3-r1.ebuild:
@@ -1732,15 +1742,15 @@
   files/python-updater:
   ucs4 is now default. if you previously had python-2.3 merged, you'll need to
   update your packages again. (sorry, that is the price for running p.mask'ed
-  versions). to update your python packages if you had python-2.3 installed, 
+  versions). to update your python packages if you had python-2.3 installed,
   run :
-  
+
   /usr/portage/dev-lang/python/files/python-updater -o 2.3
-  
+
   if you are upgrading from python-2.2, then you will need to run:
-  
+
   /usr/portage/dev-lang/python/files/python-updater
-  
+
   python-updater script also modified to have more robust command-line
   parsing. hopefully this will be the last revision till we can go ~x86.
 
@@ -1807,7 +1817,7 @@
   sys-apps/portage to exclusions
 
   09 Oct 2003; <tuxus@gentoo.org> python-2.2.3-r1.ebuild:
-  stable on mips 
+  stable on mips
 
 *python-2.3.2-r1 (08 Oct 2003)
 
@@ -1882,7 +1892,7 @@
   Added hppa to keywords.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
   29 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
   Added missing python-config for 2.2.2.
@@ -1894,7 +1904,7 @@
 
   20 Oct 2002; Jon Nelson <jnelson@gentoo.org> :
   2.2.2 is released
-  
+
 *python-2.2.1-r5 (03 Oct 2002)
 
   15 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
@@ -1915,7 +1925,7 @@
   Filter -malign-double from flags
 
 *python-2.1.3-r1 (2 Jul 2002)
- 
+
   20 Jul 2002; Doug Goldstein <cardoe@gentoo.org> python-2.1.3-r1.ebuild
   Added missing KEYWORDS
 
@@ -1944,8 +1954,8 @@
   python-config file has changed.
 
 *python-2.2.1-r1 (29 May 2002)
- 
-  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r1.ebuild 
+
+  20 Jul 2002; Doug Goldstein <cardoe@gentoo.org>: python-2.2.1-r1.ebuild
   Added missing KEYWORDS
 
   29 May 2002; Jon Nelson <jnelson@gentoo.org>: python-2.2.1-r1.ebuild
@@ -1972,27 +1982,27 @@
   24 Apr 2002; Jon Nelson <jnelson@gentoo.org> python-2.2-r6.ebuild : Make
   python build with shared modules.  Depends on python-fchksum, as fchksum *no
   longer built in*
-	
+
 *python-2.2-r5 (8 Apr 2002)
 
   8 Apr 2002; Jared H. Hudson <jhhudso@gentoo.org> python-2.2-r5.ebuild :
-	
+
   Added include flag for compilation of tcltk with python to compile
   correctly.
 
   --------
-	
+
   06 Apr 2002; Daniel Robbins <drobbins@gentoo.org> : the 2.2-r4 ebuild now
   disables C++ support if we are creating a new build image (since we have no
   C++ in that case).
-  
+
   30 Mar 2002; Daniel Robbins <drobbins@gentoo.org> : changed PROVIDE from
   virtual/python-2.2 to virtual/python.  No rev bump.
 
 *python-2.2-r4 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index b48e4a2c3b3c..924ab7186b82 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -18,7 +18,7 @@ DIST python-gentoo-patches-2.6.2-r4.tar.bz2 11802 RMD160 d04d80d3ed2ead001dbdbe2
 DIST python-gentoo-patches-2.6.2-r5.tar.bz2 12206 RMD160 43f321ac4df2b4c6ccb5777d3627c089d46b9024 SHA1 2e35f77a7216b61a9aac9508eac2ddce882c993a SHA256 f3e1593911130ed4bb5879c13e5afa4edd0a873682e1e8609184ec24cae244e1
 DIST python-gentoo-patches-2.6.3.tar.bz2 10996 RMD160 6247c60c54dc80f4a243e5fd2cb56e91989b1703 SHA1 066d76528e892b588d4b643ab4e7e310f2e0079e SHA256 d116be09c88ecd8b93b1f1cfa5a18100e1aeb21ca515a8425e3e14ce6b3e5554
 DIST python-gentoo-patches-2.6.4.tar.bz2 11032 RMD160 83903892ef18880f876e7a140c803c1e8a67e24b SHA1 51d4174b2a4136a11c64ae0007b59e4c2f0e13f2 SHA256 19a66a0855df270c030438f21c29260e7ff69b299830409f6aa9140611b721e2
-DIST python-gentoo-patches-3.1.1-r3.tar.bz2 8874 RMD160 06058325dec089258b5e61510c1c2e2369a26f3e SHA1 5ad63e6eb12842b31bc701d9d115669f7fbc79b2 SHA256 3be52f704a6eccfd1d6b889651420f3a04f85d09f910410f5ea93c6b4d776c68
+DIST python-gentoo-patches-3.1.1-r4.tar.bz2 10200 RMD160 418852c54bf7169eb7bab078e78997e22799139e SHA1 0c063cd446a22833e267710f59351cb157098b21 SHA256 c065659242df3e921290ff044aee6f543c8b5cd2290db5bf668065cf97fcbbbe
 EBUILD python-2.4.6.ebuild 9262 RMD160 6df7665c69b47b35b70791373dee58f6acbc2a92 SHA1 81a265d7f478487e484335a9e79b966a33d0256f SHA256 23ce2b95a5f876192326f508969e69845eaf53a0cbd1176c978c0f0e7f5719d3
 EBUILD python-2.5.4-r3.ebuild 9457 RMD160 76b23268635520077fdb652833a49c8dbd17b7e3 SHA1 9e5260a15056bd381424696ad291850cf75645be SHA256 1449dbd53a020cc2844c2eaf39004fd220f702e395c35a2a287738c86c1a4cc5
 EBUILD python-2.5.4-r4.ebuild 9713 RMD160 3cd0bbb022493d5bd04789c5724155e642d35d12 SHA1 c60627163f1d94c520c4df4e128b3324d2f1ce52 SHA256 bede02b61cf3bec09e2607693821249e30017c33574cef5907f888283e4d73d8
@@ -26,6 +26,6 @@ EBUILD python-2.6.2-r1.ebuild 10010 RMD160 932616944b96b6797b9167d324f7122504d45
 EBUILD python-2.6.2-r2.ebuild 10045 RMD160 778904d8332b14b68872ce36367c6440f4004b4a SHA1 357cf9cbbd882219ae3e136f93c467c0b210bf51 SHA256 400ef0f1d9c43aca04d10243fe60f5a3bf1e1f533c2579a4f770ca5291214f11
 EBUILD python-2.6.3.ebuild 9983 RMD160 af38972ec604b2ee906c1c05640e20a5399165d5 SHA1 bbdeb0b02516174c2250f4eb49e7e272e657c489 SHA256 f2bc2a6471f750779e41f4c77011f5d218d9a6bbb5abc729750f37b0a08f0ad3
 EBUILD python-2.6.4.ebuild 9955 RMD160 f097082baf7f1f9f7f274551eacf4ef0fbb948a3 SHA1 396c2b57f2ed222b161f8eb4a2fff582af18f235 SHA256 8577d0546288b4d07a456ffd32ed62c06cd34d9fde1b4f97fd4e68898ed6df88
-EBUILD python-3.1.1-r1.ebuild 9289 RMD160 352c9ab262d22eef137fc758ee617426ee92deda SHA1 9ef1364783d951c0e44e0f739fb3ceb84f2686e4 SHA256 8fb089a6e57476c3bc1526a4e441f205e3340f42099d2cb216664894257caa3d
-MISC ChangeLog 77176 RMD160 5ccbb4555c81eebcb0cfb22a1b320e80352490d5 SHA1 ba0ef46dc531583bb50c1b8c38006b26d44e5eab SHA256 5e9a48ca9b94ac828048041b76316bd40760ff7d4c0216eaebbd8ebc629e19e0
+EBUILD python-3.1.1-r1.ebuild 9310 RMD160 f7f14a4b399eaf1d49edf44ac46a028e74bb72bc SHA1 7b08c933aa508712c86e6ced93a0cd055628df81 SHA256 d84c2ae6caffab3bee28d00335e210687f9c8b697711b120d4c9b19eb85b5736
+MISC ChangeLog 77745 RMD160 71f306aa976420850d66720886c2b4490c9ab2a1 SHA1 ade504fc86d341d35a513cff2cb342710f55ea83 SHA256 1a159ab1d86ccd342caef6a6478c0139cf77d33cc902898d0aac99fb68bf7296
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 6f0fd6b29831..0fa9fb5c8009 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.21 2009/12/19 21:16:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.22 2010/01/01 19:54:42 arfrever Exp $
 
 EAPI="2"
 
@@ -14,7 +14,7 @@ PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 MY_P="Python-${PV}"
 S="${WORKDIR}/${MY_P}"
 
-PATCHSET_REVISION="3"
+PATCHSET_REVISION="4"
 
 DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
 HOMEPAGE="http://www.python.org/"
@@ -26,7 +26,7 @@ SLOT="3.1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite ssl +threads tk +wide-unicode wininst +xml"
 
-RDEPEND=">=app-admin/eselect-python-20090606
+RDEPEND=">=app-admin/eselect-python-20091230
 		>=sys-libs/zlib-1.1.3
 		virtual/libffi
 		virtual/libintl
@@ -208,6 +208,8 @@ src_test() {
 	elog "If you'd like to run them, you may:"
 	elog "cd /usr/$(get_libdir)/python${PYVER}/test"
 	elog "and run the tests separately."
+
+	python_disable_pyc
 }
 
 src_install() {