Add upstream patch to fix problems with unmounted network media, fixes bug 450358. Credit for finding this to blackd <p.kosseff@gmail.com>.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 42618354)

4 files changed, 140 insertions, 4 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 71873d2c0e38..419a973a9934 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/ktorrent
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.192 2012/12/14 15:45:06 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.193 2013/01/05 18:06:06 creffett Exp $
+
+*ktorrent-4.3.0-r1 (05 Jan 2013)
+
+  05 Jan 2013; Chris Reffett <creffett@gentoo.org>
+  +files/ktorrent-4.3.0-mountedstoragecheck.patch, +ktorrent-4.3.0-r1.ebuild,
+  ktorrent-4.3.0.ebuild:
+  Add upstream patch to fix problems with unmounted network media, fixes bug
+  450358. Credit for finding this to blackd <p.kosseff@gmail.com>.
 
   14 Dec 2012; Michał Górny <mgorny@gentoo.org> metadata.xml:
   Remove redundant USE=upnp description; it matches the global flag meaning.
diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch b/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch
new file mode 100644
index 000000000000..bdb494c4956a
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-4.3.0-mountedstoragecheck.patch
@@ -0,0 +1,25 @@
+--- a/ktorrent/core.cpp
++++ b/ktorrent/core.cpp
+@@ -1206,6 +1206,10 @@
+ 
+ 	bool Core::checkMissingFiles(TorrentInterface* tc)
+ 	{
++        QStringList missing;
++        if(!tc->hasMissingFiles(missing))
++            return true;
++        
+ 		QStringList not_mounted;
+ 		while(!tc->isStorageMounted(not_mounted))
+ 		{
+@@ -1226,10 +1230,6 @@
+ 			}
+ 		}
+ 
+-		QStringList missing;
+-		if(!tc->hasMissingFiles(missing))
+-			return true;
+-
+ 		if(tc->getStats().multi_file_torrent)
+ 		{
+ 			QString msg = i18n(
+
diff --git a/net-p2p/ktorrent/ktorrent-4.3.0-r1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..81252f61a9f7
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-4.3.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.3.0-r1.ebuild,v 1.1 2013/01/05 18:06:06 creffett Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+LIBKT_VERSION_MIN="${PV}"
+LIBKT_VERSION_MAX="99999999"
+if [[ ${PV} != 9999* ]]; then
+	inherit versionator
+	# upstream likes to skip that _ in beta releases
+	MY_PV="${PV/_/}"
+	LIBKT_VERSION_MIN=$(($(get_major_version)-3)).$(get_version_component_range 2-3 ${PV})
+	LIBKT_VERSION_MAX=$(($(get_major_version)-3)).$(($(get_version_component_range 2)+1))
+	MY_P="${PN}-${MY_PV}"
+	KDE_HANDBOOK="optional"
+	KDE_DOC_DIRS="doc"
+
+	KDE_LINGUAS="ar ast be bg bs ca ca@valencia cs da de el en_GB eo es et eu
+		fi fr ga gl hi hne hr hu is it ja km ku lt lv mai ms nb nds nl nn oc
+		pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
+		sr@latin sv tr ug uk zh_CN zh_TW"
+	SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}"/"${MY_P}"
+
+	KEYWORDS="~amd64 ~ppc ~x86"
+else
+	LIBKT_VERSION_MIN="${PV}"
+	LIBKT_VERSION_MAX="99999999"
+	KEYWORDS=""
+fi
+
+inherit kde4-base
+
+DESCRIPTION="A BitTorrent program for KDE."
+HOMEPAGE="http://ktorrent.org/"
+
+LICENSE="GPL-2"
+SLOT="4"
+IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer
++magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats
++upnp webinterface +zeroconf"
+
+COMMONDEPEND="
+	<net-libs/libktorrent-${LIBKT_VERSION_MAX}
+	>=net-libs/libktorrent-${LIBKT_VERSION_MIN}
+	infowidget? ( dev-libs/geoip )
+	mediaplayer? ( >=media-libs/taglib-1.5 )
+	plasma? ( $(add_kdebase_dep libtaskmanager) )
+	rss? ( $(add_kdebase_dep kdepimlibs) )
+	shutdown? (
+		$(add_kdebase_dep libkworkspace)
+		$(add_kdebase_dep solid)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+"
+RDEPEND="${COMMONDEPEND}
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		$(add_kdebase_dep kdebase-kioslaves)
+	)
+	kross? ( $(add_kdebase_dep krosspython) )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.3.0-mountedstoragecheck.patch" )
+
+src_prepare() {
+	if ! use plasma; then
+		sed -i \
+			-e "s:add_subdirectory(plasma):#nada:g" \
+			CMakeLists.txt || die "Failed to make plasmoid optional"
+	fi
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_PLUGIN)
+		$(cmake-utils_use_enable downloadorder DOWNLOADORDER_PLUGIN)
+		$(cmake-utils_use_enable infowidget INFOWIDGET_PLUGIN)
+		$(cmake-utils_use_with infowidget SYSTEM_GEOIP)
+		$(cmake-utils_use_enable ipfilter IPFILTER_PLUGIN)
+		$(cmake-utils_use_enable kross SCRIPTING_PLUGIN)
+		$(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN)
+		$(cmake-utils_use_enable magnetgenerator MAGNETGENERATOR_PLUGIN)
+		$(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN)
+		$(cmake-utils_use_enable rss SYNDICATION_PLUGIN)
+		$(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN)
+		$(cmake-utils_use_enable search SEARCH_PLUGIN)
+		$(cmake-utils_use_enable shutdown SHUTDOWN_PLUGIN)
+		$(cmake-utils_use_enable stats STATS_PLUGIN)
+		$(cmake-utils_use_enable upnp UPNP_PLUGIN)
+		$(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN)
+		$(cmake-utils_use_enable zeroconf ZEROCONF_PLUGIN)
+	)
+	kde4-base_src_configure
+}
diff --git a/net-p2p/ktorrent/ktorrent-4.3.0.ebuild b/net-p2p/ktorrent/ktorrent-4.3.0.ebuild
index 413dc512421c..b737faf720fd 100644
--- a/net-p2p/ktorrent/ktorrent-4.3.0.ebuild
+++ b/net-p2p/ktorrent/ktorrent-4.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.3.0.ebuild,v 1.5 2012/12/10 16:02:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.3.0.ebuild,v 1.6 2013/01/05 18:06:06 creffett Exp $
 
 EAPI=4