Fix building with Python 3.2 (bug #365549). Requested by Arfrever.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

5 files changed, 45 insertions, 21 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 706739b543f7..6f3b66524a15 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.118 2011/06/21 21:50:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.119 2011/06/24 21:01:56 hwoarang Exp $
+
+  24 Jun 2011; Markos Chandras <hwoarang@gentoo.org> pykde4-4.6.3-r1.ebuild,
+  +files/pykde4-4.6.3-python-3.2.patch, pykde4-4.6.4-r1.ebuild:
+  Fix building with Python 3.2 (bug #365549). Requested by Arfrever.
 
   21 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   pykde4-4.6.3-r1.ebuild, pykde4-4.6.4-r1.ebuild:
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 5fad9b8e4620..893b4bb9b999 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -3,30 +3,31 @@ Hash: SHA512
 
 AUX pykde4-4.4.4-arm-sip.patch 822 RMD160 60af91680e1e8388acd7f8401a32dbf894a4351f SHA1 20d37a8b127eebffc4556352168786036969ee78 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2
 AUX pykde4-4.6.3-pyqt475.patch 1199 RMD160 c3539d50f6eb2d0e44b700c4a88df387eb82ac40 SHA1 82445e3a85474d5059fc97f296432d5bc261d0d0 SHA256 3aabf5fdc1ad4f293fcc0cdf1a14057c7a33464d04e5eab695e128aca07c1cf0
+AUX pykde4-4.6.3-python-3.2.patch 488 RMD160 50d1e692d77934c55b73b1a1f1c1745d56d6a618 SHA1 9715c41a2f98c824eea93e1817ca353bdf5d5051 SHA256 6b54c9ce2c82b4affb4d1e6f9af0f2bd1873387570043561fc989881e26e89a2
 AUX pykde4-4.6.4-pyqt475.patch 859 RMD160 26310ab2ca9f7b9c3a51d39a2888c855bc578014 SHA1 f44979aa3f5bbd110cb60a9f4e3264b7177ba605 SHA256 3fdfc6d26ca8cb0108f171fa20a2568207c7c5aa7a9ca637728df610724ed8b4
 DIST kdebindings-4.6.2.tar.bz2 7077784 RMD160 767de487f3c9836a94f5924d04c1af4bd8e26f1e SHA1 eff4b5785b09958fffe4e23583f5af75c796aa9e SHA256 b75a4ee71471547060294cef25adb4d884218d8c3fb60b7611e62d80fd25e1ce
 DIST kdebindings-4.6.3.tar.bz2 7078095 RMD160 f62d84df4957f4449695486bfb117df917f17da9 SHA1 4ecc6ac378c241472aa75680abfafd8d57672653 SHA256 13cf7fc54132303a7bcaf0c03b696d05a07405f51d2cb5ba14e56d35c0762be3
 DIST kdebindings-4.6.4.tar.bz2 7077300 RMD160 8322437b3c897bdd19f27795b1506453553186a5 SHA1 ee5d85598e278bda76f7937c0a832723785ffe49 SHA256 880587671dee144d25d7ae7b74fe9f35a42719a76cba860acf2d7179b926f587
 EBUILD pykde4-4.6.2.ebuild 2129 RMD160 9e244a82d12d9d085450e8f4b398e196e5c9b260 SHA1 ea1c64601f0726f3ca2365ecd9570d87bad4f445 SHA256 71a3e61c8d23074c7e7b5f35eecc950976318c2495806cbd6416dd16919d0129
-EBUILD pykde4-4.6.3-r1.ebuild 2326 RMD160 c00b4f5eaed1899ce2b9f89bccf519e010e9ff06 SHA1 823fa93a53e5ba85535d61024867b6b07a9c5a1d SHA256 eccd401f4fcc6bb23682496bd2619277a28207f4b8a96eb02b6ebeb06043cfc9
+EBUILD pykde4-4.6.3-r1.ebuild 2363 RMD160 1c29f23479d27d961d706eed8e4d1c6276ebed47 SHA1 802994282a89b3de9df6cd91b61d4731ae2598ee SHA256 650d8768c27b38cceaa2b1b69fdc925da4669857b9caa904c4360ee14061ed94
 EBUILD pykde4-4.6.3.ebuild 2203 RMD160 d7d9feab0d31b340a593602966ca77b5297f0fd2 SHA1 c83d7cff8759ce2d489bf343e44a9b45494dcef0 SHA256 165d7e42bb97b9ee8d33a40f3f760db88733da60bcc4fc5f543863b1f2b6c80d
-EBUILD pykde4-4.6.4-r1.ebuild 2330 RMD160 5b3c7183c2a56a27a20742d0186d5e63e4da7199 SHA1 b3c625bf3d582ec4befa18d07584ba6351a894ce SHA256 fffbaad87d6815190ac9eff2df7e87066c67a71d5ded232bfdae1c5f838d56f3
-MISC ChangeLog 16391 RMD160 b85274ab338b9e4dc7293a04a6ad95ab98b7cc53 SHA1 b231119173b6b09716d09a564af4a632e5fd95b1 SHA256 06c1741ed2bf1941c81fe3f4abdc0797518794dc3b1a532948549e08900f3b08
+EBUILD pykde4-4.6.4-r1.ebuild 2374 RMD160 c70575b03922254614e7580c0c1dd7f2a927d954 SHA1 5ceadb4a7f64a44223a9ce17c8d4f18747207f6d SHA256 3a39eef165f597867e614f0f0a7111bebfb56002e9c93f17e05fbd13fd5c2ddc
+MISC ChangeLog 16601 RMD160 8b6e52401f187263c63c5023f7c671e79e3020cc SHA1 0372dd9daebb73bd39bab17560a8e7c7203fc943 SHA256 bc0700e6aaa5d7e589c8828c4d45c8ff7e04feacb867b160478080cfb9954a29
 MISC metadata.xml 260 RMD160 a5b7b39214f909c85f4f5de6be8efefb36e5283d SHA1 1e2c113943a2677634a92324ea50f44ccf71b2ec SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOARIeAAoJENwGBM22xffep4UP/1st2QzseFhmvvKwIXJmRjrK
-JmxuugDj5uIILuekASuQiRWlXP72LXTypcTk7BhVAkz91ds47zL2xixfCUSeSZOI
-N7ctJdCWwLOVB9CiqJ0wrSgBLTvkqEi96t0vSIxPwGyHL1F98ijfo7wT1X9dA6Rr
-kGP8qdIKavyeamswvt7qcW/LBWkj9DNlmcfwwU4sTnE+pHL9gAbmFYTe7WAO/gRC
-dVCRe4vx6aB4f4iEBUPBScCdr5HNTZW1GJh7mAAK8hsg5xYC18kLPkp9jWCfpSWz
-VGkwviV7JnfMFgqIlSJHQwdA2907g1yvk+euA/e8UpzD+6c94W9vJeYjgfZzHQ0U
-RufffdLje5piDFaETmpi2sDZy603WeRPe8idRq5BK9t3VfJpj8V1vJXx8MjU+9+l
-ulBdIGB8puWZPwoTVnTmHtzvpZ7e5tSdDFcHxv8ga/nPzZmsmETtEGxaXYzTEYsu
-hH6hkjIcop5gqv791tk5bsWCw2Dw1yW7j1V/kg3NSx7INzo1lTSQY8pz9Ze83/20
-gCvg4wmXYiVG2y3RMhtlE7TRyeXoTW4yf+joBiHUjr0QAi2fk92KPT50WtQj3xVp
-H5ZFmdvqq1DVy+TLysnD9iVsIJG+rwWpTxvHFsQajHH5EscY0aGtf0CE8FxLBcjp
-fHP5wq59DIBarunu6ziX
-=sBLp
+iQIcBAEBCgAGBQJOBPu8AAoJEPqDWhW0r/LCB6gP/RW6suhIpmRfLrgBhKUjMSVG
+lMU2HZ4wvSvU5w4+hs6YXTtXsMHLv9GnmRw/DNu+jcRyoiSCpsa0R36O5JekbTpv
+n4OdB2w2sE8AZzbPpc5JUd4Zi75dJ4GLV1R1s1QlgDUysVnhy/A9jiPHkXYQscF3
+h4GAYLkjKTyz9+/9EqO6oWlMqGnotBpUN3eZE2tIiUQwApziLLSzAXaZQetcPTno
++FZlHAueu1DDegc0VJL+saHlIL4urYdh46UzCgxZQqcpz2ksXQfs4/fFs9plYdiD
+OSqUELCZdAMMV774CFYxUQNAcAv3Rmql+1Kbx8yFUr+F+6dL8ek0Y1IAP6cvJa48
+JFukTJxE/glF/vPSW8AEbN/rQ3ITfNaMtFTgvUXr+6AB6vM2LWAznzNHOa7Jw5IL
+UnZA0GTdjwXYbEaDD6+SCIOqGQMaIm/fXUmlcTDMRpDXo9+/yOza5QBJI6Vw0Pxt
+kH4ahi1lef5F3osxiKX7xFRIexByDYTVkzgMd/+c0w5eadC/sobNaftp48H6few2
+eAooVJfZamePPG5704WARdnd2Yf4dyKBPJRZghxwHi8smaArZciU8f2gD5Qm3DUu
+4iIJYMYoYIglqVYAfdeUd/4Q8h7ijmc143GmvH6o4LU/ClPc8UJ4UdBFb36v5ke5
+eVXWNEotgDI4FyK8yHs1
+=eQ4V
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
new file mode 100644
index 000000000000..62abdf0a1ba1
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.6.3-python-3.2.patch
@@ -0,0 +1,17 @@
+--- python/pykde4/sip/kio/kfileitem.sip
++++ python/pykde4/sip/kio/kfileitem.sip
+@@ -236,7 +236,13 @@
+         
+         len = sipCpp->count();
+         
+-        if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0)
++        if (PySlice_GetIndicesEx(
++#if PY_VERSION_HEX >= 0x03020000
++          a0,
++#else
++          (PySliceObject *)a0,
++#endif
++	   len, &start, &stop, &step, &slicelength) < 0)
+             sipIsErr = 1;
+         else
+         {
diff --git a/kde-base/pykde4/pykde4-4.6.3-r1.ebuild b/kde-base/pykde4/pykde4-4.6.3-r1.ebuild
index 2dca96a991b1..9fc72c0785b3 100644
--- a/kde-base/pykde4/pykde4-4.6.3-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.3-r1.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/kde-base/pykde4/pykde4-4.6.3-r1.ebuild,v 1.3 2011/06/21 21:50:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.3-r1.ebuild,v 1.4 2011/06/24 21:01:56 hwoarang Exp $
 
 EAPI=3
 
@@ -33,7 +33,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.3-pyqt475.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.6.3-pyqt475.patch" 
+	"${FILESDIR}/${P}-python-3.2.patch" )
 
 pkg_setup() {
 	python_pkg_setup
diff --git a/kde-base/pykde4/pykde4-4.6.4-r1.ebuild b/kde-base/pykde4/pykde4-4.6.4-r1.ebuild
index dd18519c948a..68c42062c161 100644
--- a/kde-base/pykde4/pykde4-4.6.4-r1.ebuild
+++ b/kde-base/pykde4/pykde4-4.6.4-r1.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/kde-base/pykde4/pykde4-4.6.4-r1.ebuild,v 1.3 2011/06/21 21:50:15 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.6.4-r1.ebuild,v 1.4 2011/06/24 21:01:56 hwoarang Exp $
 
 EAPI=3
 
@@ -33,7 +33,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.6.4-pyqt475.patch" 
+	"${FILESDIR}/${PN}-4.6.3-python-3.2.patch" )
 
 pkg_setup() {
 	python_pkg_setup