Version bump, import ebuild from kde overlay, bug 321395.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 115 insertions, 19 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index f7d10936aea2..2e99e0230910 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.147 2010/05/26 08:35:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.148 2010/05/27 23:04:38 spatz Exp $
+
+*ktorrent-4.0.0 (27 May 2010)
+
+  27 May 2010; Dror Levin <spatz@gentoo.org> +ktorrent-4.0.0.ebuild:
+  Version bump, import ebuild from kde overlay, bug 321395.
 
   26 May 2010; Pacho Ramos <pacho@gentoo.org> ktorrent-3.3.4.ebuild:
   Drop KEYWORDS for *9999* due ekeyword bug #321475
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index eb97158cbda1..f900014c8484 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST ktorrent-3.2.3-1.tar.bz2 2677779 RMD160 749204d4b330c6124421f38d893f2cd177c79bb3 SHA1 8cb3f8617fcf3cbfd5318d13fe0b9480067cd2e1 SHA256 01ddaf1d6fbdd220aab659721d63e40b25a020a1093a9a21f0968ae9bb1b8c68
 DIST ktorrent-3.3.4.tar.bz2 2786041 RMD160 93ae20f720e159ec53c4d1325c74fef0ec953db4 SHA1 732527854f734d5fcd038348273378d0b1f8158f SHA256 f31fb80569df7f102685c85becb73fa1cac239ae8e9399424abb8c0048289826
+DIST ktorrent-4.0.0.tar.bz2 2808075 RMD160 8514943dadff9816a038fac2a44c051bd112b16b SHA1 53376065ba78262acbb09eca186a34f75f02bea9 SHA256 890843b95dbdd8c3ada73cce4ccf64f9eb5ae110f499a107f2e84f38f3ad872e
 EBUILD ktorrent-3.2.3-r1.ebuild 2310 RMD160 dde50c52ed667c4ece749fd59324ee5284ff5b26 SHA1 007b8682df1b85993a80f585df95836fe9b2a774 SHA256 f23b702fc30168b1a79f3de240f9d247beee2c622ad178333d823c93cbedee07
 EBUILD ktorrent-3.3.4.ebuild 2705 RMD160 765af312291a0b0943fb751a10a7369d3c9fdca8 SHA1 efc8a8589bd207692aef860f432933a5a1136e88 SHA256 ec2998947a70100cafb8006b9d9d6dd3cde6f99d96b26d6461ea694e921d8f85
-MISC ChangeLog 22116 RMD160 3c48d42c090e02ef319c18c471f3f85d98b8743d SHA1 ccd99b48ab524a250ce424dc188c7e9785426551 SHA256 7bc3db8d5fd6bace32e28d8d4524f206d08f2bb69ed6dd865b7a375062df8002
-MISC metadata.xml 1152 RMD160 34f0a04734b39b0561e8b5294c3a0c36fb60a042 SHA1 f1a0e2f39b1f57b8eac633cf5e0c35686e5619f9 SHA256 aa7e9b14654d453d4521f370bce6d19cefd9933922bbba1eb2bcb9cc97c25182
+EBUILD ktorrent-4.0.0.ebuild 2603 RMD160 354261b2a56f9d97db3273e6ffab5e7055179207 SHA1 c3e6ad1280f12db9a13f63d5d9a91b0be012fc19 SHA256 e40c24381cc7f1f1a0da7b192166b801a64c8094f73ae724245857caab3f6426
+MISC ChangeLog 22277 RMD160 f7906199de05a8111773417f1ee2deb2089776e7 SHA1 f1e928ec2f2e4d9dbf0aeacf2f37ef2f5565568d SHA256 4e58486ad45c9287c67d983d62e68e1e16fe2bcaf2c3566df112165124eb1cc5
+MISC metadata.xml 1425 RMD160 57a8dc4f1f121a577f042faea242dcb4bada8f7a SHA1 85f5015342bc1ffbedc1da1171260c05ee6b4eb8 SHA256 589714ec7f93ed39929de5c133b7aa98714b4223298d98b7c0585e6263258c30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkv83VkACgkQCaWpQKGI+9T/0gCgiC4Qav83M1XET/tNyVFklj1/
-YMwAnAzaaeVq8OAZPjQMUrgJbIij9fTX
-=2Jaa
+iQEcBAEBCgAGBQJL/vqMAAoJEAWF714uGAc6Yd4H/AxQ/ISzs8hUM9cQJYRBaNVk
+FR8j7/R5i7rJVqxr0G+dO4gfr1SUEUJQVOm+GxyHZPwIuYtOtVKxlHOKPOCbET8E
+ABnHuAzIpxjFLx4HS3FxjCcJ38Z3jywZa5BlNNgxDDareWA5rz5BxGL0ZuFMLZpm
+QOA2lxIVot04FNtHhqWa/7w2vsfIFqoCNSJXhvJsqofWXeswgB48sWwcUU9bZnzz
+pk2214iLaRWQwLj6vMlMlRi/WCR2LKZxTxrJ6fAgGjyUeBN0s/6IRsU0gZSUw2qB
+3FDPBzHtya8E94XNP6bob/BEVMWkQUrVtgqQB0v74My6y/Ium45vwFzp2FnDgcU=
+=6fN2
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/ktorrent/ktorrent-4.0.0.ebuild b/net-p2p/ktorrent/ktorrent-4.0.0.ebuild
new file mode 100644
index 000000000000..12799d859238
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-4.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-4.0.0.ebuild,v 1.1 2010/05/27 23:04:38 spatz Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="ar be bg ca cs da de el en_GB es et eu 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 sk sl sr sv tr uk zh_CN
+zh_TW"
+
+inherit kde4-base
+
+DESCRIPTION="A BitTorrent program for KDE."
+HOMEPAGE="http://ktorrent.org/"
+SRC_URI="http://ktorrent.org/downloads/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+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-1.0_rc1
+	mediaplayer? ( >=media-libs/taglib-1.5 )
+	plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL} )
+	rss? (
+		>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	)
+	shutdown? (
+		>=kde-base/solid-${KDE_MINIMAL}
+		>=kde-base/libkworkspace-${KDE_MINIMAL}
+	)
+"
+DEPEND="${COMMONDEPEND}
+	dev-libs/boost
+	sys-devel/gettext
+"
+RDEPEND="${COMMONDEPEND}
+	infowidget? ( >=dev-libs/geoip-1.4.4 )
+	ipfilter? (
+		app-arch/bzip2
+		app-arch/unzip
+		>=kde-base/kdebase-kioslaves-${KDE_MINIMAL}
+	)
+	kross? ( >=kde-base/krosspython-${KDE_MINIMAL} )
+"
+
+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=(
+		-DENABLE_DHT_SUPPORT=ON
+		-DWITH_SYSTEM_GEOIP=ON
+		$(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/metadata.xml b/net-p2p/ktorrent/metadata.xml
index 8393ba1b2b34..4500d4db5451 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -8,19 +8,21 @@
 	<name>deathwing00</name>
 </maintainer>
 <use>
-	<flag name="bwscheduler">Enable the bwscheduler plugin</flag>
-	<flag name="downloadorder">Enable plugin for user selected download order</flag>
-	<flag name="infowidget">Enable the infowidget plugin</flag>
-	<flag name="ipfilter">Enable the ipfilter plugin</flag>
+	<flag name="bwscheduler">Schedule upload and download limits over a period of a week</flag>
+	<flag name="downloadorder">Specify the download order of a multi-file torrent</flag>
 	<flag name="kross">Enable kross scripting support</flag>
-	<flag name="logviewer">Enable the logviewer plugin</flag>
-	<flag name="mediaplayer">Enable the mediaplayer plugin</flag>
-	<flag name="scanfolder">Enable the scanfolder plugin</flag>
-	<flag name="search">Enable the search plugin</flag>
+	<flag name="infowidget">Displays general information about a torrent in several tabs</flag>
+	<flag name="ipfilter">Filter IP addresses through a blocklist</flag>
+	<flag name="logviewer">Displays the logging output</flag>
+	<flag name="magnetgenerator">Generates magnet URI's</flag>
+	<flag name="mediaplayer">Phonon-based media player</flag>
+	<flag name="rss">Syndication plugin for KTorrent, supporting RSS and Atom feeds</flag>
+	<flag name="scanfolder">Scan folders for torrent files and load them</flag>
+	<flag name="search">Search for torrents</flag>
 	<flag name="shutdown">Shutdown when done</flag>
-	<flag name="stats">Enable the statistics plugin</flag>
-	<flag name="upnp">Enable the uphp plugin</flag>
-	<flag name="webinterface">Enable the webinterface plugin</flag>
+	<flag name="stats">Shows statistics about torrents in several graphs</flag>
+	<flag name="upnp">Forward ports using UPnP</flag>
+	<flag name="webinterface">Allows control of KTorrent via a web interface</flag>
 	<flag name="zeroconf">Discover peers on the local network using the Zeroconf protocol</flag>
 </use>
 </pkgmetadata>