Version bump wrt bug #453676.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 142 insertions, 5 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 419a973a9934..de14c360cc8a 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/ktorrent
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.194 2013/01/29 12:42:03 kensington Exp $
+
+*ktorrent-4.3.1 (29 Jan 2013)
+
+  29 Jan 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/ktorrent-4.3.1-underlinking.patch, +ktorrent-4.3.1.ebuild:
+  Version bump wrt bug #453676.
 
 *ktorrent-4.3.0-r1 (05 Jan 2013)
 
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index f56f26933a8a..3accac5100f7 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -2,15 +2,22 @@
 Hash: SHA256
 
 AUX ktorrent-4.3.0-mountedstoragecheck.patch 504 SHA256 a78ff11858dbe8e0e76ab5f7d6a6a80927465b071a5ef2f54107121013bece2d SHA512 0f9428f3af512be66212ffffbd0d2d8b416ac7fa62d1bdf0b878ca4c1cd12ed96bb8df5e89f628cfa6bce0f41b3831e12aff499905fe4067b0db5912d4f6ff7f WHIRLPOOL f6da553741a328b1a801d1b573d5069e51a7cba53b6534e25b0fe1da4144de2197be41bf712019fcf7352f64418384dcdb3e716db4f5d4d9a2dc9357e495e9b6
+AUX ktorrent-4.3.1-underlinking.patch 875 SHA256 2fdeef15ec630dda946c30de345980bfe491c0ae02c2af762d77cf7b43b58657 SHA512 3b06d14a615d7ab2aa8b4a29e1c0fa49f3ecc696767ced00036522fa69b6c17fa1bf039eb3a6684f7fd6542ff180f64670a682b9c885d26bf80b30d1e642de68 WHIRLPOOL 7f2dd7cf757f73fe61c6a74672f5544056412448a840c576af41fc736b98cd2c1cb3aad97d58a3ac836682d13ef68f6bd49b901bcf4959ea2329fe9de0523fb7
 DIST ktorrent-4.3.0.tar.bz2 2983013 SHA256 6e3a7d12d351cad0e40b87562556f07ce9ee1378048f99073c6bac7b971483ed SHA512 45886353b8f7d96c151e8da94d1409b01d2c8e0960aa8c0eebcf43ce4426089c53aa736607f3e1e124960999bb23634b38a55146bd2d9224a22981cfbfd577a1 WHIRLPOOL a83a18608e38123b9f8012950f24085d896c5fb3b68267366069fd0d834804a05401509f0d8b398dfa99b2ad45743dc25d9e1b52a59d4042b6a568835ab12522
+DIST ktorrent-4.3.1.tar.bz2 2943708 SHA256 66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1 SHA512 bf1fa144295cb00fccce3a511afe845bc7bf42d77d70205f5893686e7b1fa78c5799c46c7e4e04435ab6fdd4bc9b3b4a25bffb2c5538a25af36302c60742900e WHIRLPOOL 61303c19f0160bba9bdd288415d86519594f26c5c062f394cee7924093506a9cc6236fd8eedec16c6f799f71a15cb4af15c4b7c079831dccb4e498b833c2234e
 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
+EBUILD ktorrent-4.3.1.ebuild 3223 SHA256 27a2fffd7ee1e978a88844d790e41da0831993cdbda194c3bb5e29664cf4da1b SHA512 255e76704ae09db3b6cb85c7fd6f8af28e6cdd9043256cf36041c22c7c3cd6cfe8315d080cdfabbc549d91ff603efd29057634aa04dd5e43b4583d4427f92fe2 WHIRLPOOL 572df6c6c588c1201f69c0a4bf973d34c3c78d51132bb816b39b5d0c439f694624645f108f3aec1d73bfb3adc92fb80e3054223bce281d5f4735594c2dc6b2b7
+MISC ChangeLog 28626 SHA256 2e2a27c3671fd8fa57cebce7772a8cf405eec9866809d2c180a0465bf3016bfb SHA512 a859d8c1b9a5d351f40968222c4a50493c8613670392b9761ba1495b9c947b2a43428dae35e6dcc50bfb8507b79ab27fc341e69de029d3670a068a6735d0d014 WHIRLPOOL 9c4d5ab26df73f899657c425348f4d18e483dcee518f1409e14eb864156d4eb6151849ba54119f49af3d099bd18759e1a7d425b4e42c6835b0316fe2a2d640d8
 MISC metadata.xml 1335 SHA256 03bcf134822cb32ccb14111798853e7d17e389fe65b4eee22652d3beed3009b4 SHA512 8cc4fafe5a3b35aea8f9eacab76506be46dc01fb0cd60ac0e0655bc0a8173c7c44d8b0afc174ea9a37fd6b3652336ec2437e227bc70f6caf756f11af6062314e WHIRLPOOL 3a41be0bef809008c722ee5f4c73f9d466cb4c536f07c29753f7fd76cf4912498b63e3b2b5dff97885816d554c9973692ccdab621e8fd9e9d6ca4a30e2065664
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDoa4kACgkQ23laikJhg1Rp6QCglHeX0t07H64GwZM0qui4Ldn+
-vnAAoIUQCrAg2YMnMSsfD2LQ/xJLzyZB
-=jtvc
+iQEcBAEBCAAGBQJRB8LOAAoJEMbwO6tnXQ0sU7MH/14UyhujShlz4JV05u7+lr8F
+aNnZp1ZF7jkU0qWHaIiMsgDKD/lrS0j+FXznTxfAxJY1mnqzdz2ikPivlmzJF4eU
+XE4fey6Hkcg3lkmyNdnUMoHbioIB7CKGD8e+o/dOhQwNPHgVirsiFT9e9jEuP1YV
+txthE7D/UQNNILo5EQdvwnbflbdWId9qbnoWJd1yVakK2Ni9To1flmgC4naclRNW
+Os20aU6xQ034nf++XjYFJi2XfISZtDF3qjUM6su8yjq7ADfTbmm6M1E9DswPOXTq
+NbUm6F8l/mP90+QjESfx40b5wEd8ev2p5n/zavyksHdnd5onbiLJ0bhmChl706Q=
+=sia2
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch b/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch
new file mode 100644
index 000000000000..84e6fa72e6b0
--- /dev/null
+++ b/net-p2p/ktorrent/files/ktorrent-4.3.1-underlinking.patch
@@ -0,0 +1,21 @@
+From 3ef62c439027acc0a166101419fff4bc0c69013d Mon Sep 17 00:00:00 2001
+From: Christoph Feck <christoph@maxiom.de>
+Date: Fri, 19 Oct 2012 10:56:22 +0200
+Subject: [PATCH] SVN_SILENT link
+
+---
+ plugins/ipfilter/tests/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/ipfilter/tests/CMakeLists.txt b/plugins/ipfilter/tests/CMakeLists.txt
+index 3b40887..90d6d42 100644
+--- a/plugins/ipfilter/tests/CMakeLists.txt
++++ b/plugins/ipfilter/tests/CMakeLists.txt
+@@ -1,3 +1,3 @@
+ set(ipblocklisttest_SRCS ipblocklisttest.cpp ../ipblocklist.cpp)
+ kde4_add_unit_test(ipblocklisttest TESTNAME ipblocklisttest ${ipblocklisttest_SRCS})
+-target_link_libraries(ipblocklisttest ${QT_QTTEST_LIBRARY} ktorrent)
++target_link_libraries(ipblocklisttest ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${LIBKTORRENT_LIBRARIES})
+-- 
+1.8.1.2
+
diff --git a/net-p2p/ktorrent/ktorrent-4.3.1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.1.ebuild
new file mode 100644
index 000000000000..3b2f7384e782
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-4.3.1.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.1.ebuild,v 1.1 2013/01/29 12:42:03 kensington Exp $
+
+EAPI=5
+
+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}/${P}-underlinking.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
+}