Rebase failing patch wrt bug #520952.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

4 files changed, 48 insertions, 19 deletions

diff --git a/kde-base/pykde4/ChangeLog b/kde-base/pykde4/ChangeLog
index d7d10ee69232..4178e4dd91bb 100644
--- a/kde-base/pykde4/ChangeLog
+++ b/kde-base/pykde4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/pykde4
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.298 2014/08/20 16:02:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/ChangeLog,v 1.299 2014/08/28 11:31:52 kensington Exp $
+
+  28 Aug 2014; Michael Palimaka <kensington@gentoo.org>
+  +files/pykde4-4.14.0-arm-sip.patch, pykde4-4.14.0.ebuild:
+  Rebase failing patch wrt bug #520952.
 
 *pykde4-4.14.0 (20 Aug 2014)
 
diff --git a/kde-base/pykde4/Manifest b/kde-base/pykde4/Manifest
index abb28c277384..dc601f9c4ff3 100644
--- a/kde-base/pykde4/Manifest
+++ b/kde-base/pykde4/Manifest
@@ -4,28 +4,30 @@ Hash: SHA256
 AUX kpythonpluginfactorywrapper.c-r1 1255 SHA256 f89773e5b44515093a0434a2c8925097d0dc358b58fa11a125e732d191727576 SHA512 aa167083a56dc0f7d03c282cc4adec062f56d610ed39c55fbe1dea918d08427e86da392b25b0982c7db6c69adeb342bd6e53b290f24c1de028d9f945e0df1229 WHIRLPOOL 96a08f80bc88cf1d278dc7980a585d8e7b29945a6a9df1cdf6d685434996f861cc9b50a849848415298953a922892e7096d32b2d37aa8edc47755b9506d6b77d
 AUX pykde4-4.10.1-arm-sip.patch 630 SHA256 0697830f7207838640e3f47b13c5996260b7e1c742e965dff0ed6e2cfe66ffa2 SHA512 8d976e65cea346a7bf3b8af1e8d3fc8b59fbabd05515daa63b13943317b8d8b1f99e39fdb07c43d64017dafea94def1b6c4c95aefa37fe2ca025f93f28e67741 WHIRLPOOL d6d8a7d259afc2cae26dd905d72721523868142817edee868300a7a4f98311bce844739bb42b09ab0a91f2cb81a15db83a162b1d8deacfadf33c55df62ce40ab
 AUX pykde4-4.13.3-pyqt4-4.11.patch 560 SHA256 bc0084342c177b3dce7196a9be4bb159adba5b548d2601cc8537402153fba865 SHA512 aa8e65b87196425b1be52e5a3d002e07de74fda0e02e7b73a0db4ed3b6b67e814f702c21905baeea55afb0de356eb54c29590d691300de8ea4a46e82f25dfb85 WHIRLPOOL f50c59fbbd2a1d97d5427b2ae130d953c4710a1c072424dd412f741a723f8c07c31c7634bfc242655b1dd624221dc55721b5b36c16f8a01883bd7857c4b9cbe3
+AUX pykde4-4.14.0-arm-sip.patch 656 SHA256 625d9bb89212243d7c4e0d83464bd30f3f941789e01f0c04d5f799ef7afdfc41 SHA512 7c77099f6e96d80a730aca18dbfbdc4c722b8cb45f7193087e035f1fe12d83716209d09fb84e25dfa97fc54ad1957e514cf829f41ed173d95f4dd68d3ebbe62a WHIRLPOOL 5c76d96a07d0e87a56fbb253236ba9f6774148fc8e12ec0452c9487535aa2172811f426eecdc7bd3abf63a85f8e67609e234911ccfeea56412b80b7267ce8b6d
 DIST pykde4-4.12.5.tar.xz 2005104 SHA256 f03649015070ad9a2c6b0015af0c9972503012b3fe7f3d9b0c6d06fd3f479554 SHA512 b26ef3cac39e03141dc739bba03d8be4a095f74b31de0296fc1991e9cf60013a43bb03a4fb5a8673fc98d4824a5a10ed6fd18261d1b23bcf74059d28c780b834 WHIRLPOOL f176ccb420abee5768836bdab650152a335f06cc72b21bb559192c04a08f0ebc04c3d08c2150291ab2d93b931846cf4a0fcbb0bad7af8b39994aa011b216774c
 DIST pykde4-4.13.3.tar.xz 2005404 SHA256 94392ac9026c506428b20696efd4b9061dfdb034fb8741c1800b41fb8dd8d16b SHA512 4a431e25b178c65516abf8409646fb06ca7d7f46dcae4c994863257677158fb01af12ef61a7fa8bf12762c96113a7e42255e0f0cd5baedae595ec41a14a8d099 WHIRLPOOL c3a9dc61c13c9b33a0251c3eb701c7bf4040a37a736af5b17836a50d7a776840b76e65f78e323e48bf9dabdc9f118c8da2e4541b1d3a65fd1feb92a62ee744a2
 DIST pykde4-4.14.0.tar.xz 2006492 SHA256 a620805b4cdc81256cd1003c7f12059b11b8e5cab545d526757e76a0a7f9ce1b SHA512 22a4ec69c1a3bcb0920372d85fe82d3fe151b30240c27062ed53fbd4ef3fc19e9c911d0233880075e6a9af61aecacf300b7aae7dca2bf22a473a032513313df0 WHIRLPOOL 0fef2c052882ec3915f24a597d43514ef736091f37f54077e1cb19a9d12f8f54e1ca5d7a92fd693065a3ae21e56035e91c273c2160c807f37b9b14b2f3da3a41
 EBUILD pykde4-4.12.5.ebuild 4297 SHA256 5aef84bf386fe13ef85edc339e88359028901d86dd7805276ce17f937592ea50 SHA512 04826db535c19e69e29a97b03fefac295cb334caf8878d74125f7a3cfa311443655f2188223e217b2429845600af087cff4708fa913c5b708e3ea6dba6bcbc41 WHIRLPOOL 1d232fd64914d2ff2b7c3e5826259da5a2347d75ed5ad03c273b9d4319f437ff4897366bb894d070b2f419c23404dd5d96a83189c4fc29eab0409d5165b52f43
 EBUILD pykde4-4.13.3.ebuild 4258 SHA256 a83bd68b8a983cc68e70b32056538571a8bad405104bef0eebb997c56f185c2d SHA512 02dffafc383bab3eea2cde4ac88dc59143f18e0a33f3f73dc083a95c097b43e9dc14c34829b21f63fb0724eed41f7d018ec9637bcca53061b86f116a1973e83f WHIRLPOOL 2dbc9da1a0b985d8efe6e4d95c5f734e8c0da305a2abe520ad8b84d73d7ebc1d394bf48fcff748b48f1081fd46a94fabc7f3adedab1747a85b5cf342c36ad43f
-EBUILD pykde4-4.14.0.ebuild 4194 SHA256 222fa4ca756e77abe90d814b2101004fff28a10180ede761b85473bdd24018f1 SHA512 995f1cff2bc8b83b4ce6a5f1bc7313efd01e5f9d31271bcbfea44ddbf16f6134dc1633d89fc0a0c20bbe3c137f8c8eab24bd8a56e8d0a065c1c8e508e966f92a WHIRLPOOL 9f6aced4e098082b1404070498045a6a81330eb9310498dafd880a2e2a9cbc34a914f676765de2a70a164cf2e4e8647f90bef5f7cb32355bb0022cae8cbb8b9f
-MISC ChangeLog 38063 SHA256 e7b0570f334c7b38889f2a28926e0b3a092c93da3508e44ef970caf2ec09b159 SHA512 0eb29ee13316c3bf17ce5836b7e1cc7c002db80209ccaa916ed7d44a1e99fbf509425784d35a632642a1b7d04e0af9a15507003142162d5a87d556bc019e3cb8 WHIRLPOOL 47f5371dcaa1277c07f10a1840955af647335c72fca5e601b9bbabd04980358cbd6ad3f3b1186eecfeb6763872afe2f659f91dc8b36a5d7b437436c13b5be9aa
+EBUILD pykde4-4.14.0.ebuild 4200 SHA256 d1181f9afc41b55b77126fe5b34eb0770d733a866fc48a10e9f0e621fd0df72b SHA512 e32df58bc9ea7783a86e89d6988a348af28f9e139bfb0db98e4edfd5b394540cf134d8a27cb17435294f3a06df6b22c0f88f9b4a326fdcd6ead059045b224163 WHIRLPOOL e255e05936263cee5b952979dac6540c65ae6ba67b21153d3f1b188241da7480c5f4991e1fa31811e1e6a136dae3c58fd2910031be97931bd5c416dfc41d1ef0
+MISC ChangeLog 38226 SHA256 6a20515b2779d550a5678c4a83beb110563c53a0de8e399af4bad68aeb0076e6 SHA512 5a178b9166f1c84d99786c680141a0a71c4ab3145baffb96cd5a1c59c47bf5d2c6097b36c0f039e4ea3553624d98e1baef6a36b7427d6f88a53456db46c55e05 WHIRLPOOL 69033fd06b27109d933e30dd882e4fb6ea03867ce65818454c23de63731a8fa9062127c03786ba49ead0da19dfe5e79d48a23f56d826aab59a523592157b9d79
 MISC metadata.xml 382 SHA256 25b7cd412982aad7c20c6c613ee3d70ea82528fbd674476db1640d71174b27dd SHA512 1d90dac63896b5c49aac8d7ed5bffc81036ba7543c8674618da986ebd69abc45d5d7e2d0a33e39f34a2572b7942718338d26dbc0068b9671cfe260a18ec19563 WHIRLPOOL 04e9b0a99f7008c67727a2491115c18be708ff0e20a56ea677a8223f17e47c9e2f3e0385c5b0ceb9b6dfb755602d46c3d2db37e8ad1cafe9dad8d6d3cb15e37e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJT9MbiAAoJEGVpnaTzz9K9vCgQALI8kk8lOc8itaj4c3ZXCv4s
-t+aqz6Dz/sX0Q7ShDEzy3nakX9lEHiNgQzvp/DCDSA2CrYknjVS5ARFnUu5BaCHQ
-4Uky9pEIyefGmYSzecUCX0fO0kQGbi0FlwJW4wUx0jgbkQyALA0EYhykvxbJOfwY
-2scyST4Qjea49kVaThErPKhts7P6w+yS2ErAXNzHdF4VxK2pV4apCA9F1V56SpKc
-xOpFCgDdxm2mIohd0qzSMRwoWNF4jMaOYgqJhSOjSN057y9zU9aNGMFbIrdQzeFo
-XpZDGj4ZdePrP5TOPGLy/c/3fkNRdjD/fWVTDJMGctk8FSq3R7uh+ufMrPskBbxy
-dtdW/EVxTVLJrh6QWNR0CogU3GNhmt0cc08ds2ec3hkmue9Ad1/c5hu44fdzTL36
-mPq0AsY/9GIqUqpAw7vy5mul5WIpA94fVRTD+odKdoOy72rUcaJIqus8LD7OxRER
-zRH8YiB7eeajLTkUy4biTFvvX7Zss5gJPkzEUka6+eWJSyWBXpGTBNVkhKKZu1Ne
-vh7/S/grm4w3K2+AtOzOdyG2jfQyx2VdlZsX33YOd2KtQMn9GJBb9p+d3euL8mi/
-Gh59kK+NDWsriWG8TJjYzB51wO9UNLev78Vk5jiESwAdENhJ+P1NZW87AteUtZek
-UGst2CgkXyXg0IYQqG+Z
-=zoOQ
+iQJiBAEBCABMBQJT/xMtRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7NGFD/0dVvJo9/uE2Is05UI37rMZgUURlMXY2wQES3ow4Bso3KDrUNTOOcf1UiZA
+o5fKozrERXzBBt8/ebjdtetWMXnUdcOAHV2wx9Y4//jOJItC3pJCQXF5FfoC1lM+
+LQxt77EYytGUkrHYxD1Py+XO95leTp/y/P038zxGrCZLnVn4aABKuA5jErJ9ArBn
+bJNMbIzxCpTOI9PauHfAYuLmbzAL14gJvT+gNYcZBA+cTYXpCfaz06CO0qk7InQE
+D3SO0tJBfW3jTEpaf7cMiT8dCJ3SPEGnDLCD7Klh4Y56GwaEBCmvYBcVcO5p9La6
+u2vYp8l4HUyJi/cYcYRkb99joMXuYwYdsDghEigvZToXsY0/MFBny1Y5lfTcm3wS
+I1uKWKkqsNP4vaJH0y4auzpGZ1SpRxbD1UUauJCpvFqn7ubQvRDiBd5S3sxy+sEO
+kU3oTxSlyAUqRL22G/jQBvIlExf4HB4w7UMo5OX7wPPRgqTD09EXGOM5XtiGXcTy
+kZJqA/NEoq2tpX8MWU7uYix9w+moW7U/HN+jSMrQzlm2588AG33bCD3EjJ19Rj8G
+NP94fwsyFEjcams042EygEQAF0W75lqKShu+PhHTp2u44xrhANyMAP3pR4KKx3GA
+7FfVY/ywlPrmrLfAw/SAVcuwVNcuByvUvu1tqL0KPTWDIc5+rA==
+=IXDh
 -----END PGP SIGNATURE-----
diff --git a/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
new file mode 100644
index 000000000000..f6391a8ec714
--- /dev/null
+++ b/kde-base/pykde4/files/pykde4-4.14.0-arm-sip.patch
@@ -0,0 +1,23 @@
+See Gentoo bug #322351.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -99,6 +99,9 @@ include_directories(
+     ${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 ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip)
+ set(SIP_CONCAT_PARTS 8)
+ if (WIN32)
+@@ -106,7 +109,7 @@ if (WIN32)
+ 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})
+ 
+ set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
+ 
diff --git a/kde-base/pykde4/pykde4-4.14.0.ebuild b/kde-base/pykde4/pykde4-4.14.0.ebuild
index 97862cddbaa3..c794f3cf8435 100644
--- a/kde-base/pykde4/pykde4-4.14.0.ebuild
+++ b/kde-base/pykde4/pykde4-4.14.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.14.0.ebuild,v 1.1 2014/08/20 16:02:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/pykde4/pykde4-4.14.0.ebuild,v 1.2 2014/08/28 11:31:52 kensington Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@@ -56,7 +56,7 @@ src_prepare() {
 	fi
 
 	# See bug 322351
-	use arm && epatch "${FILESDIR}/${PN}-4.10.1-arm-sip.patch"
+	use arm && epatch "${FILESDIR}/${PN}-4.14.0-arm-sip.patch"
 
 	sed -e 's/kpythonpluginfactory /kpython${PYTHON_SHORT_VERSION}pluginfactory /g' \
 		-i kpythonpluginfactory/CMakeLists.txt || die