Fix building with Jython. Patch by Arfrever.

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 36 insertions, 11 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 17c1cf82e544..8c7e092d4aba 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/scons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.101 2011/10/02 06:09:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.102 2011/11/11 19:24:06 hwoarang Exp $
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
+  +files/scons-2.1.0-jython.patch, scons-2.1.0.ebuild:
+  Fix building with Jython. Patch by Arfrever.
 
 *scons-2.1.0 (02 Oct 2011)
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 951497323ab0..ca8eaf4a3be2 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA512
 
 AUX scons-1.2.0-popen.patch 1826 RMD160 33d195bffbcb2f5280d04c1742f082f82e761bdb SHA1 ba24a0b73f6671d8ec4a44c31691a98b6dba080f SHA256 84a3bc1ba70fe60cc483d0186703b303daeb7bed246f21e3db9227c255afd312
+AUX scons-2.1.0-jython.patch 427 RMD160 d573db7af227781c6aacdba49dbe85c9a8f64a98 SHA1 2c42ffcb68a5cf34a4c62595b7939536134b1e77 SHA256 f973254e500325334c44f7db86daec87954aa47287c8aa92146a91ed172eb97a
 DIST scons-2.0.1-user.html 820975 RMD160 6ddf70a7ed0403816ae5e1f42f95a71d144770cc SHA1 acfd3d24797d9e5ddde2155158fe6bd2c706f7e7 SHA256 3016ff013d8422bdbb98b39d1810f8c707c59b66ace38d3b81421466053c83b5
 DIST scons-2.0.1-user.pdf 1841747 RMD160 178da2a01782443a497bc158ae7c5a3423ff82dc SHA1 b91906f3446a6b81325af6985eeca27db71db4da SHA256 2fbd518c51d9221cdfba98145c047726960c681233c0802641aeb90fc62450c7
 DIST scons-2.0.1.tar.gz 559293 RMD160 c191a1b49e1b91a5121fb5cac7ccf28379474a8a SHA1 f9183f1b29cb94b48bb3175608831276e60b8fc5 SHA256 0a8151da41c4a26c776c84f44f747ce03e093d43be3e83b38c14a76ab3256762
@@ -10,17 +11,23 @@ DIST scons-2.1.0-user.pdf 2117035 RMD160 b055bd2e2251d5797817bcc82dc0fe01dcd5157
 DIST scons-2.1.0.tar.gz 574666 RMD160 281f6833de8b4fbbeaac4eb11e2d2d48ce54d96f SHA1 69c4bddfcca498e25dcc29a462042907fc93b243 SHA256 4139ed14f60dd2ebcd47c59984d14705636180eb27b3d1b2949489e514b1921d
 EBUILD scons-2.0.1-r1.ebuild 1610 RMD160 d117dbd6d39d7bd7063f47c1b90dde99f35a0530 SHA1 1dc3fc5becadb242e4aead15d3be3da902ddb9f2 SHA256 373f96222a28485ca76ca589209ce8af06fba12464f26a24409762f9e84b7ac9
 EBUILD scons-2.0.1.ebuild 1381 RMD160 a695bfbac7995d50761c8180993e08d9be744d9c SHA1 b6fd805aa6fe800c881f34f29af54415a0680c27 SHA256 aa7e36b40d0c5e4975bfb2f33d541bf05003191c907986a6670ca8ddcb7223e0
-EBUILD scons-2.1.0.ebuild 1616 RMD160 9fdbe716ea39ace413bb8e1a233d9be2bc701de3 SHA1 39b1ab06a828d96a98684d0e3d0d768407b90223 SHA256 13da2b3b39555161fbf98cbea290a548468cadbc0c5d2524f82e4d02bbf9f1cf
-MISC ChangeLog 6131 RMD160 6b7ed68a078f3c693b7d65784a3cfc340eee9950 SHA1 4b92fdd6d03ad0aaf3686d74b9c4a6e493fc2cd5 SHA256 f17394b57cfdb5becbe9a7e78f6ad09b9b14268788c4b7baf843a4a227838970
+EBUILD scons-2.1.0.ebuild 1655 RMD160 d0a8b6d839d2417ccb7e234f80b5f995a31a43ed SHA1 ddf3f359fa2203092d4a5eef9831ca3c4f89df65 SHA256 1f8d44dbe7757c5e3c7f21b95492ad1d20c0c4a697684842745f1050e6e8a4f8
+MISC ChangeLog 6286 RMD160 ce8c2f87db5e12dd04fe04a279c79c1d5dec1362 SHA1 01a919bb299288a93e32f559bf1a21bc04aa325c SHA256 c89bd0389475963f07a26412918e2f39cbb2f08a2f51a5a6572b5b50076232ab
 MISC metadata.xml 638 RMD160 313c3b4020d391dd897fb124fd3ae7148e4d25f4 SHA1 2ba17518173dc79962c08f88dc495ade267e443c SHA256 8e7b7a43fc5e94c0c0d538aa07cf5e4b37bc5d9ef688bf8f7870395d2504b7cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOiAAfAAoJEEqz6FtPBkyjPWwH/3M8mwGQVMAjFbc632p9VOgt
-uqmlphHj5axFmr5vYNH/tccIQPoSduJfVuy7XrVxSrT73nClKKlfUIUkMa/OxbDP
-zz78s5j8ClInzbtMO8SmbIRQNQLEHe6Ji0XNATu86RkKXS14PZrqVPDDxZOcRouD
-zM9SQg0S0ZA4I3/Gu61iSyeP7ZRua+SpTTx0PmDzkCvct7DfGI/zBR3n6r68Rk1Y
-DG2DZ7bnNILB4f9Vnn8fsJr10Evyfsm588LoKdUaPM/mQDWtyqSswvdtbick5eHT
-E06XWAfIlxfyaxsGZm+UHwJh6dsbdAtt7P9YDEBDwyimUNGDgQ7tm7OMWgLwMM0=
-=se2O
+iQIcBAEBCgAGBQJOvXZaAAoJEPqDWhW0r/LCbHQQALLUuD9IiEM9Clj51jSNCRbF
+m5uDvzX8TV397ZMvA9U0dISq33zd9qVbx1ENLr3VN9m/yq8OrkCjfH1qfzLKZhjd
+X8wh8ByPweTi826pCRx3OlQknyH25WqrA7T8vhCsXmaldS5sx/TLeqZrY/SqYOIZ
+hmxLkkNmIR76JA/GNjXWsY/yejj6wIgZn7Yxylwlw0YbqbUOV1FCid4pF6Xm1AhV
+g7NSQB7zQ/VZiZ3gYMTPxWtgEvE7jSOBrePsO57GqAigL7Te69k671DiikneMTF3
+ti8RSBMeayl3xP+EKiH4987q4KpUovXOUJrFbfD9txjkvLszyFtT22aTYXrR7RFq
+q69HAU6+Mohr23q8/ByQ93b4CDnS9p7vUcVlB2D28kqEXvIMfUHqfmhi/CbwCzSX
+2OegPdXLcE7nM7xhGSMITXF4syozqtux3rxElJTQd55BN6+zvcMXEh6lT6XAw1+9
+QNm/a5F3Q7ZcAKDvULBgDdV3PouMdbOIFfG07+TZQR4lb+6Ar2sB06AFYKBN/PXZ
+puKF8QwQ5BL5r3Nr6dwAtI1XbzWrY//SrdBXVmDwAEucNwN1+zAssb06riDSf60p
+3pHo/6D8xymlv/X7t4jtzwq5H67w5w+tv9KECdNr5kvPt/6K+Zh0e9LdfBZHfZQA
+Hv/v2qoG71jwUuHE1LPq
+=uoEo
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/files/scons-2.1.0-jython.patch b/dev-util/scons/files/scons-2.1.0-jython.patch
new file mode 100644
index 000000000000..ca04e12031e1
--- /dev/null
+++ b/dev-util/scons/files/scons-2.1.0-jython.patch
@@ -0,0 +1,13 @@
+http://scons.tigris.org/issues/show_bug.cgi?id=2791
+
+--- setup.py
++++ setup.py
+@@ -325,7 +325,7 @@
+                 self.copy_scons(src, scons_version_bat)
+ 
+         # --- distutils copy/paste ---
+-        if os.name == 'posix':
++        if hasattr(os, 'chmod'):
+             # Set the executable bits (owner, group, and world) on
+             # all the scripts we just installed.
+             for file in self.get_outputs():
diff --git a/dev-util/scons/scons-2.1.0.ebuild b/dev-util/scons/scons-2.1.0.ebuild
index f96cd6a5b2d1..d62be2074b76 100644
--- a/dev-util/scons/scons-2.1.0.ebuild
+++ b/dev-util/scons/scons-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.1.0.ebuild,v 1.1 2011/10/02 06:09:30 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-2.1.0.ebuild,v 1.2 2011/11/11 19:24:06 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.4"
@@ -30,6 +30,7 @@ DOCS="CHANGES.txt RELEASE.txt"
 src_prepare() {
 	distutils_src_prepare
 	epatch "${FILESDIR}/scons-1.2.0-popen.patch"
+	epatch "${FILESDIR}/${P}-jython.patch"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=361061
 	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}usr/local/bin:${EPREFIX}opt/bin:${EPREFIX}bin:${EPREFIX}usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die