Fix accountwizard autoconfig feature. Backport patch from 4.11 (KDE bug #321927)

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 39 insertions, 11 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index aba4a62371ad..6fe3757aaa62 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.145 2013/07/02 16:47:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.146 2013/07/04 08:20:28 mschiff Exp $
+
+*kdepim-runtime-4.10.5-r1 (04 Jul 2013)
+
+  04 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org>
+  +files/kdepim-runtime-4.10.5-fix-autoconfig.patch,
+  +kdepim-runtime-4.10.5-r1.ebuild, -kdepim-runtime-4.10.5.ebuild:
+  Fix accountwizard autoconfig feature. Backport patch from 4.11 (KDE bug
+  #321927)
 
 *kdepim-runtime-4.10.5 (02 Jul 2013)
 
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index daafd978dfaf..d461b8760931 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -3,22 +3,19 @@ Hash: SHA256
 
 AUX 4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch 909 SHA256 ab132ee0abe2b2d847344b53ddad902fef720975327a6110faf70bd60837087e SHA512 f549ee9acd4914ee3f7e241af6e15f4f9c6f7bb25f016fa8d80b0d764c622f563d55a5a16098747c09bbde2392477cfcb31e21f84f1d00a4b09da7c52b164d0c WHIRLPOOL cef4d0796d0dd0da271aec96e8ea2823d3cfad8cfe194bcf9538346949c5bb902f2dae7abedc360995115e8a53b198674912938c6762e8d31f55147d963fb276
 AUX 4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch 4012 SHA256 6d22b29e0594df9fedd2fce966262fcae307eb9ad7d67040d928f35a1cef234c SHA512 70fb1256867d9526169aa1ec2aeefb1c42cf82fca842bd342b9859f6ba3f252f941d218a76374aa09e0ef8068b2d3a460f9ea4e23cddc43565841021b7aec62a WHIRLPOOL 4e554bd3576f4ac1bd58de4fb5f805732c8653dc2eb50b50ca811fb7431f3b1a81f0d04404aaeb16bb660eaf199a41aae37ac4755d7ad160ddd0343baf2b5203
+AUX kdepim-runtime-4.10.5-fix-autoconfig.patch 745 SHA256 2149f6b4c5da38cc152caf623bb56a087ef83f6850a70c7068dba1e3e713d867 SHA512 68489aff384729183f24618c8b5fe3a9c61118671eeed9b7afcfaf4d51331db299dbaa88a063b338eeb1f31c50e98f9c08389f6f8bac43b84936c2066ea4e4ac WHIRLPOOL ee7ec08ed73bca753c5928e6e5c4f852e45eddaf35523e8db5a1210173365a33f5c9347b552749bc483ee415ad012e9852e31aec65f0bf53176c62f385627d9b
 DIST kdepim-runtime-4.10.4.tar.xz 1126964 SHA256 99976fa9a6c2233cae08b944231ec386b634fa3d1b7af9b77f4d9e02a65f87b4 SHA512 1810df4c42334ef04cc63c4f26023e89eb2e0839daf521a5daa6ddd70c77140a4699f29474d0598c8ddf06de8c93f3b0dd6429fe11b49df067f6637ce5195419 WHIRLPOOL ca93c5ce219d0e570048b7dd3829a229d0e37d131a70eadab2d4463c5c5d2c946b6b381cbffaaadfa70a55e62d0035592fcdfe061087b2bb08f7a90659454ce6
 DIST kdepim-runtime-4.10.5.tar.xz 1210604 SHA256 83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc SHA512 6535104af64b810a83966ce79e6b63c51d1136c611c2ce32e3e8cda6df8cc9fb18d687c29254ad6503433344156db904b6a8017dae5ca3ab53a9564a40f28835 WHIRLPOOL 76f7c3213646cc51027dfedb544f449bdacc72ae03b932cdcf98e55ace80f0513c62dfb3f818d109953f7d8322136014324d2250905bb67621ecf40dc37ee6f1
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6 SHA512 37f0de7b37ef1d4b116c258e35644f99a6734082cdd5a984962246dc58ab9124020cdd31350a06058e067b0ea3fcddbd864beef6dbb13ca529b637a2a51071ad WHIRLPOOL c1fe887ebc1162aab17cda15f294b94ec06e3690221647fabe0fe2ab7ae718f2624bf100cc068771744ec4a951c539004ee2139bae965e32ac49002c66929b71
 EBUILD kdepim-runtime-4.10.4.ebuild 1226 SHA256 32ca5ae60be13ead9e72aa97f52e009d909c9bad63fdf02e4cf1cfded342aa27 SHA512 ffdbf18293476fed0a96c3b0954336048a4504ad610c624ef08c72deee2cceef67edec815d37c65e79c41cdbc4633e61147b9386d5a7182b71a9540f4001b6f9 WHIRLPOOL 9ddd347788695b4966071c429260fe6ee96cb269f6f923a53ae1c5ebaa0fb83109a9358ae9d89c77d4c5d1ae49ceb5c214b6ec63ca916adffe5a059bf9e8a7d8
-EBUILD kdepim-runtime-4.10.5.ebuild 1223 SHA256 547a1ba52ada6f368ffba9504d09a08f4925089338531ce755447c5eb33847ba SHA512 36dc7c5093829e3d4b3e67b95fc60b4240a204a3435afbf9acabcdad78758fd914d16229d6c63e26d43bb8e4a1c85558dd202e40ebb9ef3b2dad3c6c5b535d49 WHIRLPOOL 38903409478fae504ce15eeb18e2a1e91f059960499e0c19d7d9f8a8c15f804d6e8d89b245867f33dffefff8b7bb9c5bda824cfaebc8279d04a686419f24ebf4
+EBUILD kdepim-runtime-4.10.5-r1.ebuild 1285 SHA256 3be7887102666b94719fd92b73c0a6505c5c7a7f8a7688f528f539249431cce1 SHA512 bd0f7c67fbb7864f6184410fcd0e7acbad5ffd41eb1904edee1fd2ab238871bcfd2d13777b3a260da279d0365a18d76275c30af0ceb293b57aa936a2039e9e2d WHIRLPOOL fb62e1fa99935b79726c19b3e91015dd880a3c17f147b92c02d21d8f151e8e716c02e5f193cfed0257c378372f9ede2827fab8f6a38c7e33a4f4a0e149879781
 EBUILD kdepim-runtime-4.4.11.1-r1.ebuild 1024 SHA256 7fa5be5b71d5100a04b9f3852a981381f24ecd1197b76369299112559a8de07c SHA512 d05c77d4e4169d1aa39430453ddfd758608180c601ba0a75e949ab8b49882fc10bba3bdf6210fced4adf19009b5169470ef0b2a8b320e83327d78f8a5ec9d0a6 WHIRLPOOL 973599ade410e7f9087a425805e9445b17da2e76ecf07b5e019bb025ef41175d37a0a982967acacfe2d59a5dff555606a8839b498ae7493cbef1f23d4db6238f
-MISC ChangeLog 20419 SHA256 042b7c29b3c615cced99aaf8df64ce0cf79a463c99cd4169e5bc98772885829a SHA512 841851bd2b10e096d937300fa1b73842cf043b34e980d709bd34e69ee67ef09ec870cfb4d54de8126bef25d7aab9603707bca85c25d1b49cffb0898126932edd WHIRLPOOL 3aa0b38314f9b25847420b1c4ab80374de3bd43686a3500f0acde6b8d6d046b2edd8741b9c45d37526421ddbd8074a0610322ba2da05f24714e5b030433b6e36
+MISC ChangeLog 20722 SHA256 b6cc8a543ddd28f1ebf8e8667afe1a4eb153995f0398b18edc172f53d2e2d187 SHA512 1757b3259e85c5a526876d3b06ea7a124344affac554532879b99177ed7f1fa2ff8995d6b4293b5ca9ebcf189ab80eb114bb3581aba4c54a3e1c10988917499d WHIRLPOOL e5e1db1aa0288d2f206e594cf97e1c2de9d2894ef3f8e5f3f52679fe9c34011f9c56128a649204fc61a3fbb47553735cc4449d26429ce80e90803d6ec1eb8b30
 MISC metadata.xml 257 SHA256 16c3510993601ba7d4245f98c8245cc60f46bfd16a3ca0307493f95c0f8654bf SHA512 d0b7e979f03eab35ddd6f131688b03b18e2720375b62ad616e1fae3d1f02e4bb380106a4e40c36ae63c31cb6b9ff5639f865e033e43eff82c577d2729b1c17a9 WHIRLPOOL f7ac249ee583ea9f3bf4a7bc020cd01a26d4403185ed85fd98c33ae664df910947120dc77ceb6f7376d85afabd39f3ca97276c4cac567860d263932c99a750de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR0wSSAAoJEO+t9ga+3I3a3ugIAKtI8oLSIKbZP8KuE/WLf5T+
-P3I4bj4dV8lbgKIkxS5/blYV8o+tJeNGT/N0ObF/gkGbzTPcav7HTlAROmoy/avg
-xfVBhvDSGxvfPQI4ezWSt6Gh9urt6j6cZW5hwVsTylo7eamCoKwd0+xaYBaLZQ4I
-sq0E4SDYLI/wler6uaak8BtGBqmd3tzxKOe1kzFV6zrUUzTentrX1O7M9nwQ2FUg
-hX6aaNTDMxBwzv0v3iej3vP0Xj+092XDLSfS2EWhIbuFnTNO3Rt2YdaynCgaFyA8
-7exw/UnFiHyTY6lPH3m98+i6q8S/mvgH3YFfk8uLfrYUEw5g/aJyOZLWoGR0MV4=
-=ei8o
+iD8DBQFR1TBNKWxsyjWmQTQRCG43AJ9Sa6Pc7sNsnS6hUkpMu7zYnWIdIQCfRusO
+n397RplzOttv2SW/YXmB6VI=
+=6Zzn
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch
new file mode 100644
index 000000000000..3ced22093a23
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.10.5-fix-autoconfig.patch
@@ -0,0 +1,22 @@
+commit bb58cdc9dd1a166e886b091602483f20f61c3130
+Author: Montel Laurent <montel@kde.org>
+Date:   Thu Jul 4 08:31:35 2013 +0200
+
+    Fix Bug 321927 - autoconfig support not working properly
+    
+    FIXED-IN: 4.11
+    BUG: 321927
+
+diff --git a/accountwizard/ispdb/ispdb.cpp b/accountwizard/ispdb/ispdb.cpp
+index 0c04cf2..24d274f 100644
+--- a/accountwizard/ispdb/ispdb.cpp
++++ b/accountwizard/ispdb/ispdb.cpp
+@@ -68,7 +68,7 @@ void Ispdb::lookupInDb()
+   {
+   case IspAutoConfig:
+   {
+-    url = KUrl( "http://autoconfig." + mAddr.domain.toLower() + "/mail/config-v1.1.xml" );
++    url = KUrl( "http://autoconfig." + mAddr.domain.toLower() + "/mail/config-v1.1.xml?emailaddress=" + mAddr.asString().toLower() );
+   }
+   break;
+   case IspWellKnow:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.10.5.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.10.5-r1.ebuild
index 7a0525f37f98..fe9350b02c0a 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.10.5.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.10.5-r1.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/kdepim-runtime/kdepim-runtime-4.10.5.ebuild,v 1.1 2013/07/02 16:47:22 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.10.5-r1.ebuild,v 1.1 2013/07/04 08:20:28 mschiff Exp $
 
 EAPI=5
 
@@ -35,6 +35,7 @@ RDEPEND="${DEPEND}
 add_blocker kdepim-common-libs 4.7.50
 
 src_configure() {
+	epatch "${FILESDIR}/${PN}-4.10.5-fix-autoconfig.patch"
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package google LibKGAPI)
 		$(cmake-utils_use_find_package kolab Libkolab)