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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 7887F787)

3 files changed, 65 insertions, 1 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/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
+}