Update arm patch wrt bug #464750.

Package-Manager: portage-2.1.11.60/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

6 files changed, 43 insertions, 46 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index 6336714c3a78..7420406cf9ec 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.205 2013/04/06 00:04:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.206 2013/04/12 14:06:12 kensington Exp $
+
+  12 Apr 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/pykde4-4.10.1-arm-sip.patch, -files/pykde4-4.4.4-arm-sip.patch,
+  pykde4-4.10.1.ebuild, pykde4-4.10.2.ebuild:
+  Update arm patch wrt bug #464750.
 
 *pykde4-4.10.2 (05 Apr 2013)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index 573672603f3e..ebb93afe0af1 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -2,29 +2,21 @@
 Hash: SHA256
 
 AUX kpythonpluginfactorywrapper.c-r1 1255 SHA256 f89773e5b44515093a0434a2c8925097d0dc358b58fa11a125e732d191727576 SHA512 aa167083a56dc0f7d03c282cc4adec062f56d610ed39c55fbe1dea918d08427e86da392b25b0982c7db6c69adeb342bd6e53b290f24c1de028d9f945e0df1229 WHIRLPOOL 96a08f80bc88cf1d278dc7980a585d8e7b29945a6a9df1cdf6d685434996f861cc9b50a849848415298953a922892e7096d32b2d37aa8edc47755b9506d6b77d
-AUX pykde4-4.4.4-arm-sip.patch 822 SHA256 c2defa87628148fe77eb82f43f5904ace4bb66898424218423c79c7fa40613e2 SHA512 047c20ae42030c434bbcc0b4c522ecc9b5ded43631362390666a20aadbc8d9a0c4d76ddcfee1c805b161dddfa62eede48281e6c4f985c940e2d9bf30af0eb3f3 WHIRLPOOL 82bc0045cc48773b075270f49c1b583f419929317ee574ba0ed9851573dcfd2d6c9b40aae3f12d492450fb32e16a4f71127b9eb2b1d1215209c9fee8f2c5f175
+AUX pykde4-4.10.1-arm-sip.patch 630 SHA256 0697830f7207838640e3f47b13c5996260b7e1c742e965dff0ed6e2cfe66ffa2 SHA512 8d976e65cea346a7bf3b8af1e8d3fc8b59fbabd05515daa63b13943317b8d8b1f99e39fdb07c43d64017dafea94def1b6c4c95aefa37fe2ca025f93f28e67741 WHIRLPOOL d6d8a7d259afc2cae26dd905d72721523868142817edee868300a7a4f98311bce844739bb42b09ab0a91f2cb81a15db83a162b1d8deacfadf33c55df62ce40ab
 DIST pykde4-4.10.1.tar.xz 2029852 SHA256 37a3d263ea7870e8e410e775d978d42b0aea59859bb6d627b2b325d5ad79b039 SHA512 c80385e7b36dc228e9d89911f54f37344be5459463c911c7dabf4adeced627fa597525150fab4ff5377eb00a9bd96bffd2e25a8e196a668b36d0f80db1895490 WHIRLPOOL a16956b9b1ea565de40c4291de1391f60d602aae5b580dbf26537ccf60fcf81203d8fec549a817624907ac31bd63d6babe25b04bc02cff4996d9b8f42c72a887
 DIST pykde4-4.10.2.tar.xz 2033256 SHA256 b943605b3a08d6e81ba55638297eeeb54d556a72ae20c7494fbb8ec0a581110b SHA512 8e6380533deb30259ae3aa2ad2b99330f739788a878546f893c7fc0fba3e15b70c005ad23b21b2ea7ca75ae66163b1b3abf3d8f05009a6fb9aed951dc518eb94 WHIRLPOOL bc79f8bbf6203ec81ee0bae71109acdb42d06a5f699d2cd06fedd04e2c956362adc31423d6fa5d5e6590f319027104c9718b3778c6711f9cec3282646c72f5c2
-EBUILD pykde4-4.10.1.ebuild 4328 SHA256 c7bc509a51e72ad591aed0bb4842286b3794162d080da14e34348dacb33ff62d SHA512 6226bd8ac94e90cf2ee7066cbeb6d735446d88acbb4b229ff430b010e6a702d59ac3ec09da79ab9d6c55ea9199f58420d946b2067acffdbd8783928309b51ffc WHIRLPOOL 18a6197174bc66c371604218a2dfcad06090c64a2d350010ee39db5fb7fae4452074ec9a47b47c327f3e5662cda74bbf94570a66439fcfa5e3c076fa09f90ac2
-EBUILD pykde4-4.10.2.ebuild 4338 SHA256 4e23a68ec6da4b8767a65926d893571e04d02534efe17bd0b14a19964bac233a SHA512 defe7ccaa2d90865ff8a9b5d8aa03cb3b4c08184e62764077ab0e4273dcd7641ca011ca64e634e3218c665d63874bd2ec60b3776c53c47f40f78bb68a2c7659c WHIRLPOOL 1a2bdcfd1358a33c558de1dbb45c1bd2c78c7b4b1670917418804e2d8759ca2fb5445c84850d253e4a23084fab25a83da283ce764e7c3e52fdf7534389ca0a71
-MISC ChangeLog 26725 SHA256 ef2c1fcfcfd3d7276d9d40ba356bc21c298ff0efe55f6fe94f020521d679ac5a SHA512 f3deb421c3295aa4771cd76724bab18235258c5469214f466136215ff58cd2083f7ea6342350b89d88588b1ed998d02eddf84a63e3212890726ed2f8aa6d1e1f WHIRLPOOL c9524db6c0e37c35c337be579f73f356b9dc5bcddb5c7d7be583dd3eca9ef23e54409a5acc3cb3eca2cd20a393ffa44c1c7852a35b2f9d6b41debafd25355f20
+EBUILD pykde4-4.10.1.ebuild 4336 SHA256 a038e4394978e3a901006d7de5aacca63e7f3a9e3f50087bcf0c830873db995c SHA512 58528302ea2ca3050b9727a71ced8ebe831becc3e798354de31025b73691597ed0c48f7cf8c8623868467b71130158c314e49db49dfa41962a69314f13459c95 WHIRLPOOL c52dacf871d330299fed453aca7fb6d7308999aac755de1db15da25a31bd92c83beeb0d8596ed9a9b8551200239d5483cb3d1747e0a4f385de8b1a159d6e4bdc
+EBUILD pykde4-4.10.2.ebuild 4340 SHA256 3c2951185cfc00e2bc6cbc18f990c55d23fe2678c8e4f3fc6776c2e5125a73dd SHA512 1004bba18c77afdbcf0421bcf23acd5adaac225acca5a5a6e84eda86621f5c0ef6d3284d0a3b91fbcece1a2973e9f95ea651efb9b7818341dfa72bc752f5b3a4 WHIRLPOOL 77f08fe67b0f59dbeae394f6c96456fbf9bee4a33c85c8324d414661c7163cec910eac2f2621fdfe009cf160182c79d8293c42cd829cc37a373aa25e95c35ad1
+MISC ChangeLog 26938 SHA256 4108619a87773d188c735740a7fb0edf68c1362817a52df34f78de3f53578aa9 SHA512 d554a64bc932161b34d614a1da75ebc014dba93a6c1ed43689537213532b4c8fae8599551f091527bcbf2d4879b6ce8da9b95cc5d47b582ca62ef29e5a311760 WHIRLPOOL 280b6bd6fbb75e1291e84d0608992a1bc29ebdeb847452d4eee8e815498e2462a943ae55c1bc858b8b8921fa7b9c70ee63b7e8cf6a899a8d0411059d447fc6fc
 MISC metadata.xml 260 SHA256 0ca2c4d395d5a18420e2afaa9701549afc4e584b5b9be90e4b6ff5db89d66369 SHA512 2371a6075a0873610a53d4337fab9e368d607cb63cb924520c02149612934e7d1d8a5131f8d1c8ae01cac380e3a17f01b0105acda382ebb6da058fc2a561e1aa WHIRLPOOL 097f71b3d076f2c2a7091f0f89b05d8bc7f24d453d2e3c876fd95f91068b634ace21a5f53afc14be9f061f5b2e996aa18c3ef827eb16ad23f9c260a950a0eae8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRX2daXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOclfcP/iNwjAKaRCP81QzYzUS/NVp0
-U0TbiVk06baIUUcpFVpDNABn7INkgJFUegVCE98w09aOdElat0AeYbBcYYcBZAgL
-LhmV1pZ+n3l6+zwxaJ+gxZ2mkW8MZrSqRnRIFrhKXBINvyUW3zti0LjntFtPTTEa
-YB7Rqu1LV+qIje/MkT5lklogxS92MVRMzD/Ge1pIdbRRQHhrdPOWi/2I7y4ooVcO
-lAzroT1IL2ig3BomH8trlHSz0j2U49u2gIYK1o+ygHdzfSbCaCbSINF1IIkOYXdW
-4NUgNoz4VqdLYeKiAadVZf7dzQD7AKSwcwLQBhMDbCkynIxTAFJjbjTfNraeLk26
-mLg0fALUMi+WD7RxDyIrLdjuHvjKLj88nsdPuPIVk44ldYURjChPpgsR+QHGLMSS
-TVksyX5PVNOGkCac7j2LpRH54A9sRlro+FrVm7mOHEb7iMlNutYV3E/VeVweZ3c1
-EI1c6AekJdGxj1G0RvggSSBbIZ39KSUqYdqMg8P0gCeDJL1IM45G9zbTlWICvB5v
-+glIjwxgSJdBNpXWZEMM2wXjyHFW/cuuTrwcqox94W+AQOimPOAwx9rv14aWGgCm
-O3PlovVNaIYzO+rMEyjVp/thS6WoYsMGREKGv+m12Aej1EzdPJZc7ahMpVI+O70B
-yAPRakDee+2lt3f196nS
-=mmDg
+iQEcBAEBCAAGBQJRaBStAAoJEMbwO6tnXQ0sRycIAKzpKZOGdKHbrqh39n0HGZJQ
+jWASgti+bxfw00SCyggNt2eHDCxqg2K/aF5bHxR45mKqIKYWGWpOSB01mX3Bh8OY
+bUOVqTqMpwlDSi973uEBocFSIn8M3Lr0cSTu7b8tRVYRDgw1QjWVKxregTeRJj+V
+ywd14KlK4K88agVzWvxSwtd016r1OyVmxa+6oyr+qDe/3ccp1NTAYd4snjA4Qwo3
+pShDu3BEk4VMZwYOwqJacazlpjtlCpD/Jl7vvYCFQVyTqRXHk4ziHyOQDYW6zg6N
+/hqtodKuPfY9eufl4p9dk6U41KAokVbw2FgI7+C+odB2XSVC1GUMyede4ndk7Zg=
+=xCrv
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
new file mode 100644
index 000000000000..73cee86b6c57
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.10.1-arm-sip.patch
@@ -0,0 +1,22 @@
+See Gentoo bug #322351.
+
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -101,6 +101,8 @@
+     ${KDEPIMLIBS_INCLUDE_DIRS}
+ )
+ 
++# Pull in ARM configuration options if needed
++STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
+ set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
+ set(SIP_CONCAT_PARTS 8)
+ if (WIN32)
+@@ -108,7 +110,7 @@
+ else ()
+     set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
+ endif ()
+-set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
++set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
+ 
+ # Use an extra option when compiling on Python 3.
+ if (PYTHON_VERSION_MAJOR GREATER 2)
diff --git a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
deleted file mode 100644
index f967c451e7df..000000000000
--- a/kde-base/pykde4/files/pykde4-4.4.4-arm-sip.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt pykde4-4.4.3/python/pykde4/CMakeLists.txt
---- pykde4-4.4.3.orig/python/pykde4/CMakeLists.txt	2010-03-29 14:57:40.000000000 +0200
-+++ pykde4-4.4.3/python/pykde4/CMakeLists.txt	2010-05-31 15:49:17.095615617 +0200
-@@ -75,6 +75,9 @@
-     ${KDEPIMLIBS_INCLUDE_DIRS}
- )
- 
-+# Pull in ARM configuration options if needed
-+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "")
-+
- SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
- SET(SIP_CONCAT_PARTS 8)
- IF (WIN32)
-@@ -82,7 +85,7 @@
- ELSE (WIN32)
-     SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
- ENDIF (WIN32)
--SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug)
-+SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK})
- 
- # Use an extra option when compiling on Python 3.
- IF (PYTHON_3)
diff --git a/kde-base/pykde4/pykde4-4.10.1.ebuild b/kde-base/pykde4/pykde4-4.10.1.ebuild
index 402b938337d5..8b77703202b1 100644
--- a/kde-base/pykde4/pykde4-4.10.1.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.1.ebuild,v 1.5 2013/04/02 20:51:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.1.ebuild,v 1.6 2013/04/12 14:06:12 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -58,7 +58,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die
diff --git a/kde-base/pykde4/pykde4-4.10.2.ebuild b/kde-base/pykde4/pykde4-4.10.2.ebuild
index c07dc91c1b4d..4b78a9fc0cee 100644
--- a/kde-base/pykde4/pykde4-4.10.2.ebuild
+++ b/kde-base/pykde4/pykde4-4.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.2.ebuild,v 1.1 2013/04/06 00:04:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.10.2.ebuild,v 1.2 2013/04/12 14:06:12 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -58,7 +58,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.4.4-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die