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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

5 files changed, 147 insertions, 11 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/Manifest b/net-p2p/ktorrent/Manifest
index 4f0517c03d03..f56f26933a8a 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ktorrent-4.3.0-mountedstoragecheck.patch 504 SHA256 a78ff11858dbe8e0e76ab5f7d6a6a80927465b071a5ef2f54107121013bece2d SHA512 0f9428f3af512be66212ffffbd0d2d8b416ac7fa62d1bdf0b878ca4c1cd12ed96bb8df5e89f628cfa6bce0f41b3831e12aff499905fe4067b0db5912d4f6ff7f WHIRLPOOL f6da553741a328b1a801d1b573d5069e51a7cba53b6534e25b0fe1da4144de2197be41bf712019fcf7352f64418384dcdb3e716db4f5d4d9a2dc9357e495e9b6
 DIST ktorrent-4.3.0.tar.bz2 2983013 SHA256 6e3a7d12d351cad0e40b87562556f07ce9ee1378048f99073c6bac7b971483ed SHA512 45886353b8f7d96c151e8da94d1409b01d2c8e0960aa8c0eebcf43ce4426089c53aa736607f3e1e124960999bb23634b38a55146bd2d9224a22981cfbfd577a1 WHIRLPOOL a83a18608e38123b9f8012950f24085d896c5fb3b68267366069fd0d834804a05401509f0d8b398dfa99b2ad45743dc25d9e1b52a59d4042b6a568835ab12522
-EBUILD ktorrent-4.3.0.ebuild 3169 SHA256 472308089acd6ddb6fd116c80a592f4d55889273fd06f9bd508520882fa541f6 SHA512 0a7eabf1f1888f47f1481a3b0d41ef355e80b2bfdc879e69e43189e741c7be31a6e75825b0c4c9d497e5cee11fbf97bc8fdda7ddf4a69565a7d40c77b12b2fdd WHIRLPOOL 8fd280342ffc8733756c002603a5561b55d382d4dedb7b230c73c429c02889ba8dbb005477eb9607f7bfcf564fdd25a26f6e5d47357e520edf05f0a9398a2f75
-MISC ChangeLog 28101 SHA256 0094d9bddbd73c4f5e451c37fc1f9a08213272dcfb0a587305a57c129cfe4ce2 SHA512 69f37f7a0ebe7a68320c026c9aea9a3027bf5890987422ff8c6c536d9314f453715042a9475af6300ad1a2e496c6ced003e6b6709267282383e9fe10475d981d WHIRLPOOL 0fb35fc62e18361a99a7585355dfe16499ed298015af0303014d9cf2c988b3c6768624bd45b84f3569c170cb50f112742f2ab71da5371564c7df2a7706a2a757
+EBUILD ktorrent-4.3.0-r1.ebuild 3238 SHA256 98a5ddbb99251be8bca14227c8111cca81e72ac81394189e164f6abcb4be7866 SHA512 a483c48f4d06a7b27b1713cc1aa58e8b68a4685500f850c1d9f7c9e9fceca608b4ac0920e8743de844d15d766625dc958e36f624fa66294b75c46967b39d3b08 WHIRLPOOL f2026ea3721e5b01a6b4286e9f4263437785be6ec75fe0f686688124f703ee1cea0abaf5230fb90493618cd9891aacd81305852ad90724c8bebe6250d4687b51
+EBUILD ktorrent-4.3.0.ebuild 3167 SHA256 9aaecf48bff4957fc5f994bdf7f3621a6e76d2f69ffb2d0910d44b63da3b9354 SHA512 b8f5c72b01885be32699415484495ef6ceb724365367ed97a19278af5904c78b74a0ee443a6bfb5e8b828b54a1844b439c009743beeac4a67f4c429c157ccb72 WHIRLPOOL bb1d4b276c7bd47da1b117715a67066f76c753b80e86ce5fff83b91f7a860cd16f06d4c5034994bd2bf3e0f6b254683148c9b55c7bf480d1c7e4203c3de6460a
+MISC ChangeLog 28436 SHA256 5d02a69e6fd4968acb4500168a1284a2b03c55d6784721906ec2dd75666cb403 SHA512 3bc9324c3aef865fed2970c2aea59e05f54545ff39f1d882de426accd44717ad1dac076f0d251435db87aea4108218527ca15478b8262373e1b5bc4f00e6841f WHIRLPOOL 7bfe59910ec10356ca15f651c5f03f5783a53fd7aa27ff972de2d76c60db19e16adc6dfffc889c2267abeeb852ac52c55381e50f7e46cd77d06d20a0791036ea
 MISC metadata.xml 1335 SHA256 03bcf134822cb32ccb14111798853e7d17e389fe65b4eee22652d3beed3009b4 SHA512 8cc4fafe5a3b35aea8f9eacab76506be46dc01fb0cd60ac0e0655bc0a8173c7c44d8b0afc174ea9a37fd6b3652336ec2437e227bc70f6caf756f11af6062314e WHIRLPOOL 3a41be0bef809008c722ee5f4c73f9d466cb4c536f07c29753f7fd76cf4912498b63e3b2b5dff97885816d554c9973692ccdab621e8fd9e9d6ca4a30e2065664
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDLSZIACgkQfXuS5UK5QB2hiQP/SdAFhcuyb9zZ5J58/HOXuYeF
-lOpq0UnU+v6nxT7xLdZV+KYPNEK4KJZnLTM7CKLxl23S5lkzRxRHE6OEYYjFLlSJ
-WjSX8ue8GVO0Lua9Zw0k23NzGTLU4mE0s4WbTIToEMRXkbCiouBO5sZ+TVt5d01X
-uO93k7g5YNOJgTlNiXY=
-=8H1l
+iEYEAREIAAYFAlDoa4kACgkQ23laikJhg1Rp6QCglHeX0t07H64GwZM0qui4Ldn+
+vnAAoIUQCrAg2YMnMSsfD2LQ/xJLzyZB
+=jtvc
 -----END PGP SIGNATURE-----
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