Version bump including a backport of the kde-4.8 support, bug 392343

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 294 insertions, 9 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 015d7e7487d0..375388e254b0 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.172 2011/12/15 22:22:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.173 2011/12/30 23:14:15 dilfridge Exp $
+
+*ktorrent-4.1.3 (30 Dec 2011)
+
+  30 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +ktorrent-4.1.3.ebuild, +files/ktorrent-4.1.3-tasks.patch:
+  Version bump including a backport of the kde-4.8 support, bug 392343
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> ktorrent-4.1.2.ebuild:
   Stable for AMD64, wrt bug #394867
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index d54c5c4b6f81..37f1e349037d 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,20 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX ktorrent-4.1.3-tasks.patch 5426 RMD160 05325ce5415157d891ada79cbf731963297eda7a SHA1 757007823d357053fec41458b2b7bd2d0fe8c5de SHA256 60028f7fb84fc3b9b6e049d8184481b2464bb1d599c17e5102bfe3b9172a08b4
 DIST ktorrent-4.1.1.tar.bz2 2925355 RMD160 3bb704086e9072751c2ca3113eb5e0e3d3e36b68 SHA1 15e9f3fd8e0ec3e4cc0ebdafe1c479260d14d919 SHA256 e4117efb325a7f520e71f22aea902924accfd004c0426ef772dc694206c40ec0
 DIST ktorrent-4.1.2.tar.bz2 2956627 RMD160 caa4d89ddaaaece2c0571fe4856ed624e92410d0 SHA1 08fa8a622f83084fe90e1f6d394a3e6365463b73 SHA256 9dd2e55a25e0d00ee940b1f5e44f5027adf6f8f8030b8e4da67fdefad599d7ef
+DIST ktorrent-4.1.3.tar.bz2 2959837 RMD160 76b046bfa29793ef8453b3c5c00f6e8e584277f5 SHA1 39be3fdfd06b0b1fdaa7e9d524abb49fd4d07baa SHA256 2f852f4ffdda976af38b85bf532e7d353dcf7b7dd7135a66af834543eb420646
 EBUILD ktorrent-4.1.1.ebuild 3181 RMD160 5d30b5d8e99a2076011a07fd479cd323eb8114cd SHA1 d82929d3dca2ff5267b6e568beb6739c068ca7e8 SHA256 b9d2fd9756218d65ce4dc3ae0901a901443666de593157770b8e21219cb5cb0a
 EBUILD ktorrent-4.1.2.ebuild 3177 RMD160 08555fbbec53b1c5eed1b86592f85b66ef1ef7ea SHA1 f9450b51b1153ae775931bfe5a24bcfef3d11635 SHA256 9e1652682a18b4526ce350fecc37f76257eaec84f0b85d8578eeb91d7035e191
-MISC ChangeLog 25549 RMD160 082fe1d41d1863fff54f37bc3f17758d0b3afe06 SHA1 95432ee685f96ba20df7097bae36bc6693c96c31 SHA256 85378b0b5ba0a48e639aeb8244d0e707c26b77091ba7f6e36d5b527f285e5454
+EBUILD ktorrent-4.1.3.ebuild 3228 RMD160 21825a3c57f317c5574b074227f3c251abb40adc SHA1 95f92772863cd73197d624a7ed97802ec6e873ae SHA256 d6ee543b9ba4a52de835a6781bd8d0aad5eefb328753cabe8362f27245741d3f
+MISC ChangeLog 25776 RMD160 9fe486775ad6df5bb303231f87afc18b7dad02c2 SHA1 f61f886db8b09013b6fdff69d880e4d7bb92c068 SHA256 94036c2825b1ebd2af7f33933a22768a82871e7763ae782521717968e8775b45
 MISC metadata.xml 1389 RMD160 85af8086d711dc47de7d5cc61923b58ca7a42df2 SHA1 d13e12b8ff9d2cb59fdc53c88804b8d12af2f79e SHA256 e7fa6c95c77618daa38c5baf4c97621eb7cdb7b38e38f9f81f30804d77097cf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6nNMAAoJEOTDgjZ80txd6PwH/1BTtdZ7UB53xXwQaM9zyRuM
-oU+z5BxdRYlIcnoxqvmN6bbtQRhldGDykVtMbL3rDN9uyDjFGaVFFbyYCM98djqC
-EggBGX0TQ2SxvRajMOwmHiTb8oUHxqnQYT0kIn7L8b/8naJHkq/GKlZSVDWyYG11
-/4AXw+ecm0NlKvM6FO4sydUwVMsoEwvB1PB6eMjZNyyd2BDq9tSFbfmvduMK0NoG
-LIuWe7A683RJ6GE5/XsAIx6oPpUhFZiXnMphvgyRjAMSwEGpn+yJPauJ8yGnOQ1i
-HPa293jaC75H5C/jfUazL+WnAGONbJ/FN+jvcOqvn80ioXTqLFa4OZvJifV5TSA=
-=pE94
+iQIcBAEBCgAGBQJO/kZBAAoJEEb+UGWnxTyHVXgQAL9u3AMTAkOU9dK6cDIU2tZu
+SqJP+xIf3B9RGMtXUstErTcrR8rAlHwa05A+83EmrNCDes0Vp8jdUTHuT1AwI38b
+qrAxoT30V6+4AMmLAwjqZVCf2wF10GPXkC63LffHFHWe/fKEIt5JQflyERAJf1HL
+sspFoi/jlsFR0RxnvBE4OUDirqt6UgObofzOQ+vXTuFisVZ//PSp0zMZcnF/wN0Y
+gnTDsbKPWTconhSVNydKFSLEynUl+dIwaXQmSMKWyysR+5J7vtVfiVncGknRi1N8
+BAmI2p0p7xbrpQfCyQHKdbMphZiA0UzGs7k6mLISA3CqAigYhCUjko/GkRlDhNfu
+TSgoU6aCWKuuCe66iG1cyBxA/U5y/NiE6EfsHhJSdYQLgNQJufF9Ki+/S1rRUcL9
+2neSgCYbjN08KyFPSDfMskpIt786hCe1FMOk4AvH1wsyaQDH7tVin+yxyRe63wDD
+drYZ88f+dg+uP09r3bKtkXftocaUDa3hZR8ffZjHOxFgqnrAz/kEwyANMy6bKm5/
+xtZ7+JgJJtts6KHqnl/JC8KF6JurjxLuMW6yFdg7AIQVa8MsOwYfBqRexd/lsi3H
+awcqKzRwsAWQ2TMFUcrmgU5xwy3JcHOxtytLZuhromu+UzJkL07p7tgepmSCrMts
+C9p9P0jB8t+xqYpnExzT
+=uEmW
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/ktorrent/files/ktorrent-4.1.3-tasks.patch b/net-p2p/ktorrent/files/ktorrent-4.1.3-tasks.patch
new file mode 100644
index 000000000000..1ebf22412ac5
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-4.1.3-tasks.patch
@@ -0,0 +1,166 @@
+diff --git a/plasma/applet/CMakeLists.txt b/plasma/applet/CMakeLists.txt
+index 3a72241..4307cf2 100644
+--- a/plasma/applet/CMakeLists.txt
++++ b/plasma/applet/CMakeLists.txt
+@@ -5,25 +5,15 @@ if(NOT QT_VERSION_OK)
+ 
+ else(NOT QT_VERSION_OK)
+ 	
+-	set(TASKMANAGER_FOUND FALSE)
+-	FIND_PATH(TASKMANAGER_INCLUDE_DIR NAMES taskmanager.h  PATHS ${KDE4_INCLUDE_DIR}/taskmanager ${INCLUDE_INSTALL_DIR}/taskmanager.h)
+-	FIND_LIBRARY(TASKMANAGER_LIBRARY NAMES taskmanager PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
+-
+-	if(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-		set(TASKMANAGER_FOUND TRUE)
+-		message(STATUS "Found libtaskmanager: ${TASKMANAGER_LIBRARY} ")
+-		include_directories(${TASKMANAGER_INCLUDE_DIR})
+-		set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
+-		
+-		kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
+-		
+-		kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
+-		target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${TASKMANAGER_LIBRARY} ${LIBKTORRENT_LIBRARIES} ktcore)
+-		
+-		install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
+-		install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+-	endif(TASKMANAGER_INCLUDE_DIR AND TASKMANAGER_LIBRARY)
+-
+-	macro_log_feature(TASKMANAGER_FOUND "libtaskmanager" "libtaskmanager library and header files" "http://www.kde.org/" FALSE "" "libtaskmanager is needed for KTorrent Plasmoid")
++	
++	set(ktapplet_SRCS applet.cpp chunkbar.cpp fadingitem.cpp fadingnavigationwidget.cpp)
++	
++	kde4_add_ui_files(ktapplet_SRCS appletconfig.ui)
++	
++	kde4_add_plugin(plasma_applet_ktorrent ${ktapplet_SRCS})
++	target_link_libraries(plasma_applet_ktorrent  ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${LIBKTORRENT_LIBRARIES} ktcore)
++	
++	install(TARGETS plasma_applet_ktorrent DESTINATION ${PLUGIN_INSTALL_DIR})
++	install(FILES plasma-applet-ktorrent.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+ endif(NOT QT_VERSION_OK)
+diff --git a/plasma/applet/applet.cpp b/plasma/applet/applet.cpp
+index 59e7191..bf09479 100644
+--- a/plasma/applet/applet.cpp
++++ b/plasma/applet/applet.cpp
+@@ -21,6 +21,9 @@
+ #include "applet.h"
+ #include <QFile>
+ #include <QGraphicsLinearLayout>
++#include <QDBusConnection>
++#include <QDBusConnectionInterface>
++#include <QDBusMessage>
+ #include <KConfigDialog>
+ #include <KLocale>
+ #include <KRun>
+@@ -31,12 +34,11 @@
+ #include <Plasma/IconWidget>
+ #endif
+ #include <Plasma/Label>
+-#include <taskmanager/taskmanager.h>
+-#include <taskmanager/task.h>
+ #include <util/functions.h>
+ #include "chunkbar.h"
+ #include "fadingnavigationwidget.h"
+ 
++
+ using namespace bt;
+ 
+ namespace ktplasma
+@@ -174,7 +176,8 @@ namespace ktplasma
+ 		}
+ 	}
+ 
+-	void Applet::updateNavigation() {
++	void Applet::updateNavigation() 
++	{
+ 		navigation->setEnabled(connected_to_app && !sources.empty()
+ 			&& (sources.count() > 1 || !sources.contains(current_source)));
+ 	}
+@@ -193,12 +196,14 @@ namespace ktplasma
+ 		}
+ 	}
+ 	
+-	void Applet::updateSources() {
++	void Applet::updateSources() 
++	{
+ 		sources = engine->sources();
+ 		sources.removeOne("core");
+ 	}
+ 
+-	void Applet::setSource(QString source) {
++	void Applet::setSource(QString source) 
++	{
+ 		if (!current_source.isEmpty())
+ 			engine->disconnectSource(current_source,this);
+ 		clearData();
+@@ -340,20 +345,39 @@ namespace ktplasma
+ 
+ 	void Applet::iconClicked()
+ 	{
+-		TaskManager::TaskDict tasks = TaskManager::TaskManager::self()->tasks();
+-		for (TaskManager::TaskDict::iterator i = tasks.begin();i != tasks.end();i ++)
++		QDBusConnection session_bus = QDBusConnection::sessionBus();
++		QDBusConnectionInterface* dbus_service = session_bus.interface();
++		if (!session_bus.isConnected() || !dbus_service || !dbus_service->isServiceRegistered("org.ktorrent.ktorrent"))
+ 		{
+-			if (i.value()->className() == "ktorrent")
+-			{
+-				KWindowSystem::activateWindow(i.key());
+-				return;
+-			}
++			// can't find the window, try launching it
++			KUrl::List empty;
++			KRun::run("ktorrent", empty, 0);
++		}
++		else
++		{
++			QDBusMessage msg = QDBusMessage::createMethodCall("org.ktorrent.ktorrent", "/ktorrent/MainWindow_1", "org.kde.KMainWindow", "winId");
++			QDBusPendingCall call = session_bus.asyncCall(msg, 5000);
++			QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(call ,this);
++			connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(dbusCallFinished(QDBusPendingCallWatcher*)));
+ 		}
+-
+-		// can't find the window, try launching it
+-		KUrl::List empty;
+-		KRun::run("ktorrent", empty, 0);
+ 	}
++	
++	void Applet::dbusCallFinished(QDBusPendingCallWatcher* self)
++	{
++		if (self->isError())
++		{
++			// call failed, try launching it
++			KUrl::List empty;
++			KRun::run("ktorrent", empty, 0);
++		}
++		else
++		{
++			QDBusPendingReply<qlonglong> reply = *self;
++			KWindowSystem::activateWindow(reply.value());		
++		}
++		self->deleteLater();
++	}
++
+ 
+ 	void Applet::clearData()
+ 	{		
+diff --git a/plasma/applet/applet.h b/plasma/applet/applet.h
+index 29b3265..d396118 100644
+--- a/plasma/applet/applet.h
++++ b/plasma/applet/applet.h
+@@ -27,6 +27,7 @@
+ #include "fadingnavigationwidget.h"
+ 
+ class QGraphicsLinearLayout;
++class QDBusPendingCallWatcher;
+ 
+ namespace Plasma
+ {
+@@ -68,6 +69,7 @@ namespace ktplasma
+ 		void iconClicked();
+ 		void selectPrev();
+ 		void selectNext();
++		void dbusCallFinished(QDBusPendingCallWatcher* self);
+ 		
+ 	private:
+ 		void updateTorrentCombo();
diff --git a/net-p2p/ktorrent/ktorrent-4.1.3.ebuild b/net-p2p/ktorrent/ktorrent-4.1.3.ebuild
new file mode 100644
index 000000000000..a1a8fa69b87d
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-4.1.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.1.3.ebuild,v 1.1 2011/12/30 23:14:15 dilfridge Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+KDE_MINIMAL="4.5"
+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 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 lt lv mai ms nb nds nl nn oc
+		pl pt pt_BR ro ru se si sk sl sr sr@ijekavian sr@ijekavianlatin
+		sr@latin sv tr uk zh_CN zh_TW"
+	SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
+	S="${WORKDIR}"/"${MY_P}"
+
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~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}/${P}-tasks.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
+}