Backport two-line fix for data loss bug 464318, straight to stable

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x7887F787

4 files changed, 81 insertions, 17 deletions

diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index e7a6b62a5cf5..7d3a7299774a 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.264 2013/04/06 00:04:37 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.265 2013/04/10 15:08:42 dilfridge Exp $
+
+*kget-4.10.1-r1 (10 Apr 2013)
+
+  10 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/kget-4.10.1-delhome.patch, +kget-4.10.1-r1.ebuild:
+  Backport two-line fix for data loss bug 464318, straight to stable
 
 *kget-4.10.2 (05 Apr 2013)
 
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index 90315f5357a0..9af8b9c56fdb 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kget-4.10.1-delhome.patch 661 SHA256 cec170bf0ceb70820055773539bef372216b3378a2c2ea7eb4b540596d869c51 SHA512 3db5ca4b21f1bc190ecaf987e3eefd098a18a6b26b00e6734117c0118a2c80692403dca3aeef36d94add5755a1d91868d709f5667803e9bb594a063cca5d0fcb WHIRLPOOL fa35d4c21c9e5865b4f9b93c4857113ef8a77b9adeb492ff203d02bdd19c36b12542d621fb12aef04bc69228e9087ca611ea17a3567bf33ed736f1bb2d0d80c1
 DIST kdenetwork-4.10.1.tar.xz 9051764 SHA256 d8e1566f444387f9bbc2a02aa75cea280ce6ae7703bac1c5f6b0d1c66c2c931a SHA512 603e1ed814afc00d9630d83aa1343eafaa3096ebf6750b7d9af3a6708cd030ce005d223d638e94262db6409fbe390044f875048b0d427767893e79a98fa49241 WHIRLPOOL 50a34449b64e3b7f50e9a6f6fd01c5dde28a94ad18a2e95238fa80dbbee7dba1aa40fadf7be8cecb8a1358fde8f87dca625e6d3cd58d6876f47f859e4e19b41c
 DIST kdenetwork-4.10.2.tar.xz 9052096 SHA256 88a6fea9b34ec30b1c289595cca71d184f7fe52bb7e3f14f77391d958ce4524e SHA512 e995bb6ef7bf5435bda18cde5b04e6ed98c1613d8c6a469732235282acfae6200db1f9f8b4c7f260f3fe99407e9015cc3a427f02a12a89f2ae1aee9503bcf56a WHIRLPOOL 8d4871816f05280aa0c9b2b4eb952eb9321e5acb96a7c3036449af7892bd5c3cabe33a592ab771d0b32f5a32530f95756ac2e5248d663525beb3dcc399563067
+EBUILD kget-4.10.1-r1.ebuild 1228 SHA256 bd0d70b0cae1539a9a8a5d991d9d236fbcfebe48b8e172407a5efc662af79128 SHA512 56eeb2c451f0b6b5f6bc431a005e5967a1b812949ca5fceb5fbd006083a6579cdc9b338428057d2a54dfecf935705fcc3c54f94ab2fe9268b29e02d0b28efd80 WHIRLPOOL 8a1473440429fc47d7d499c564cd236a29fa9023375be45e4c5302f8dbaa91518ff2ab4f618b79346507592f6f5345c95f76558a393995420964de60c97bf021
 EBUILD kget-4.10.1.ebuild 1173 SHA256 756457ef5c7b104de5dde051f6c97fe09b21cf9e0f242b7ab28e7950059b8c41 SHA512 6bab964fd04cd6e6fe72d5cd9e25789e14704d799599d790dfa6c2cf5aa5f43707f4ae0baccbf1b9bb5d02f7f072732e478cefafe061275bf0b1655a1ac7acb3 WHIRLPOOL dd3df311b641bc486f44e8c6332bd07fe30312bad88938ad60a15bdcea695d2df6751bf19c0efc529ff6770483974906041538c69e11c99c69b3976fa0123472
 EBUILD kget-4.10.2.ebuild 1183 SHA256 278eb357dcec2e5e6a3e1d82508d5d4e5b8477e36eb631ff7ab0f69554ca7d15 SHA512 03bcb5386b73852257cdfeedd6d0b428f6760dec9e9a25cdd75fecf6c518b5d1deb5891229cc65abba1689be8281ca67ec6ed12db2faf6f6162fd9a2d3f724a0 WHIRLPOOL 182d92d6e687f7bcd50a8dcf50a4337e4b96bf005b8eaaed09d08c6f4f9afe216f55579e70378c7174fdd552cf656f987d7bf25c945016665b1104ae006d161e
-MISC ChangeLog 30594 SHA256 5617f46d7e000efcc725ea8d73f873c63a6b64a74a4a8d4b7dc7d5c313ffd6a9 SHA512 c70f0574e18f95404622656c402f7fb458d6a14f6cb8bd1b5067912e4ff38ab17b47eeedc1e7ccc99e4bef59c9457840a1e0e23026256a129fe5b9b900f57d85 WHIRLPOOL d8fc52c2f5f147b4e483a3e962a58c6e1424546e7b8212e0a032e27df7697ae6a44485f226450f67606e5c664ed0c3a2e07c91b3a9b7990495c7fca82e4d099b
+MISC ChangeLog 30812 SHA256 8228f4f5202fc0eeb1b84916f92848ef1f974ee26211075a07f9145811c1d9ad SHA512 881907ca9cd20e67b8cafd97a233dff21e6a3a82917d981ddab1d8c04fad0c903aa4d087a525e4ab813cc6afaee3b2fff1170bdfc3028b1b4a1d41e2ac929055 WHIRLPOOL c576ba1316183e743b3b6aa4246355f60742b0552f63b6ff1461759f75b1d26c5a0c52ef60d653cb08d6ec59464f4016a38934fdd1ee941cd9546d2b67860c79
 MISC metadata.xml 373 SHA256 e4cd567dbf7a7ced44643ff336123876e50c7dc9f5edce8eb1c44d42d2c2d095 SHA512 05e171bd476928e2cdd983649be1bb44de28bd38c15207e4cca7666b42b1668c0ebeac705cb8ce902c5785c5d4e2da9a06a2062c99457e8ca645830e99b3110c WHIRLPOOL 129e717de4a59ea7e633ae333ce735078742922e6064e74ccc8c0fe1763a792d2d75c1ab6331fbf58ea2e7232fcef39e6abe949b7689f78708cfa4f46fca07af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRX2dEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOctW0P/266Bb+gSYRsjTfOY2KALtnc
-SIlno+C33Og6vvEho+iQOflQZB/mGghZ2vZ119K2Ds/wv8/ktwBT9xH7VyFUzRLN
-1xx7uxZsNLO2t1TN1rbVlSeckdI/38iWOwSMX4KgmA9g0kWWavxDKPeZmX0C6/sl
-1tbZYoBEVXYD64Xm/j1EiP19mKecrynuGxLjdptCEzELre8uF6lKYkrmF2mlPReq
-zLOjLRWlF/Kax4Dk+Hj+ErsR+g1dz4qHlZY2vcVQDgWAnLlXYvyIbXdhUzvKGnVy
-vUpma0br6dKCEpesb5Cbq/1PZI0ocl7+5IEkHJHjO/4sDNvgu9UwHOQnRxJsaU4Q
-mMlTe0+BxJs54/XDg8TIH3TxbLZ2aapEPE9m3EJ82Tfp3+UWZLUXBToTKMAgleZq
-9CEK8ZHpglvKDYjM69a1HDlCUVUZdc8qVQyaLLAtPLOGrk7WENgiF2QEndrRKwJG
-CmKXbfoo3cOLCMMqezvIN6qq6VqmfU3GVKi+WUjTMEUCvHdJyxCSCTQbu3ObwOVw
-U6aN+L0biHq5HVURipdX0YlaI/54FVKjl4iG3uZcNJ9WjRLBK4AnKRGfj3hbQips
-AD3YkA9o3TJNxh0vjWFQAXZ4hMyAEIXMp4MbWvV6Uh6cdSKH+Y9uoGp5aH+fZLVO
-XS3Bd0Nf+6fFZn5FUaw4
-=31xs
+iQIcBAEBCAAGBQJRZYEtAAoJEEb+UGWnxTyHvHsP/1joJN6nVu+lZ4y2TWRuaIJz
+lzXowUn5HGmbGrFNXL2RPSUCIOc9RWV3BYc10vypGM7uG14l/WBZWt5bI9qFDtj/
+elMuEixdBKJKGruRy+xR3pqz3RnPKileBxxTmOjZ7jYlgA5NlFnSG3LlMF/EWg5a
+X914AAaGrOKV5cuRtz/BagDkPAxxyTMZHa1qcg+QJjqYGNniJOOXRvqZNvVpuFbT
+99WZ+rUA511HKyTTyaGwJpoKltX6M7sa7o7nXhM/QUdN893TtfJcUL9WywgoAaY4
+tKPyW6vgxCitF1JHHabaXK1KUYNez/vwina1vNYEiD5m7W1QJUaXtlVdmC+8JXPU
+VEpmVRUyxS07ofXdiw/Wn88oesYxEvaPzl7tnVHOHxSxX/47nOL9j0dXl+viuBkF
+d7TYvWSogyaKMmAAKnkzRA/CDoT+Oh6IPbFbmjMsXYnrKtiNsVOzRILJS66vvjQj
+8U5pTdgJB+ydkkdMrF1EEArZYXNCaB6mGw7IC3HPeahsrRlZcheKI6bfKF1vD49x
+XeYrPzkRCsGsyhmoiukPGgUeFx5klHlmd7XxHdXcuAAgrT1oGV9t+VUCUmU9j8Bm
+Vidagz/u/BjCu69H0+H/Qy/y7T9SDP4eV+xwYtfu+1QWvkwVrnYSDv8M7mGKx8Q0
+0lGaOtoRQSCt1ML5pswr
+=9kUa
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kget/files/kget-4.10.1-delhome.patch b/kde-base/kget/files/kget-4.10.1-delhome.patch
new file mode 100644
index 000000000000..8d1e3c12081e
--- /dev/null
+++ b/kde-base/kget/files/kget-4.10.1-delhome.patch
@@ -0,0 +1,14 @@
+Backport of fix for Bug 464318 - kde-base/kget deletes home
+(is in 4.10.2)
+
+--- branches/KDE/4.10/kdenetwork/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp	2013/03/07 10:29:45	1343275
++++ branches/KDE/4.10/kdenetwork/kget/transfer-plugins/multisegmentkio/transfermultisegkio.cpp	2013/03/07 10:33:10	1343276
+@@ -166,6 +166,8 @@
+     if (change & Tc_FileName) {
+         QList<KUrl> urls = m_dataSourceFactory->mirrors().keys();
+         QString filename = urls.first().fileName();
++        if (filename.isEmpty())
++            return;
+         foreach (const KUrl url, urls) {
+             if (filename != url.fileName())
+                 return;
diff --git a/kde-base/kget/kget-4.10.1-r1.ebuild b/kde-base/kget/kget-4.10.1-r1.ebuild
new file mode 100644
index 000000000000..10eac1538c7d
--- /dev/null
+++ b/kde-base/kget/kget-4.10.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.10.1-r1.ebuild,v 1.1 2013/04/10 15:08:42 dilfridge Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+KDE_SCM="svn"
+inherit kde4-meta
+
+DESCRIPTION="An advanced download manager for KDE"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug bittorrent mms semantic-desktop sqlite webkit"
+
+RDEPEND="
+	app-crypt/qca:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep libkonq)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
+	mms? ( media-libs/libmms )
+	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+PATCHES=( "${FILESDIR}/${P}-delhome.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with bittorrent KTorrent)
+		$(cmake-utils_use_with mms LibMms)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
+	)
+	kde4-meta_src_configure
+}