Change slot to have correct one based on app version instead of kde version. Version bump for new beta.

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo x86_64

5 files changed, 130 insertions, 5 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 14d77f566657..1829488fb178 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.95 2008/12/01 22:09:01 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.96 2008/12/03 22:43:38 scarabeus Exp $
+
+*ktorrent-3.2_beta1 (03 Dec 2008)
+*ktorrent-3.1.5-r1 (03 Dec 2008)
+
+  03 Dec 2008; Tomas Chvatal <scarabeus@gentoo.org>
+  +ktorrent-3.1.5-r1.ebuild, +ktorrent-3.2_beta1.ebuild:
+  Change slot to have correct one based on app version instead of kde
+  version. Version bump for new beta.
 
   01 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> ktorrent-2.2.8.ebuild:
   Stable on sparc, security bug #244741
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 8ef32a4c5a3e..8cd92390843f 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -2,8 +2,11 @@ AUX ktorrent-2.2.5-avahi-check.patch 1263 RMD160 f184a508351a90e376b5bbf4642551e
 DIST ktorrent-2.2.7.tar.bz2 2653798 RMD160 c7e563bcb273318eb26a32339ec536389b94f257 SHA1 ee671eca8d7b2f90ad6023f966219db7e3fec368 SHA256 71d1afed988e20fb784caf3c9625f598525730f4da31af1bff07ecfc48127b73
 DIST ktorrent-2.2.8.tar.bz2 2715406 RMD160 eda2304caf3407ec8bc85cd358dfa7a9b854ddc3 SHA1 c816700e776d219432f20e7116c8e9f4f1af681a SHA256 33bdcb57a906694c6f83cfeebfa569846b52ab089bbd6d5e80e8bda74161f783
 DIST ktorrent-3.1.5.tar.bz2 2130026 RMD160 f9f1826760905a377406eb47e4f2802c9dc2b515 SHA1 d6acc7edac2a80c7aba512cc301a7ca2e59c0a79 SHA256 f99c6bc734a28a687ceb37f68ec49dd22418b6d19a90483898228af8014ccb07
+DIST ktorrent-3.2beta1.tar.bz2 2670434 RMD160 b06f2bd61a60973de6938c2e30bfa7f71bd58110 SHA1 d6410d5c6bc48e7b13557c52f21320c94bf504be SHA256 84048298231274e2d5a3ceec2dcf06822f9080356a2a38d650bf710a3b66979e
 EBUILD ktorrent-2.2.7.ebuild 1867 RMD160 428dcdb827e0b5ec910e60675072599225e5b541 SHA1 80dee77aff9af18398460a77b45b2f5bb3175794 SHA256 b93f9885fc7a011c29f7f63f03b6f8871b7dd0eac7aa2d23ecbc20d909ba2133
 EBUILD ktorrent-2.2.8.ebuild 1869 RMD160 143876d26bd8e37377a8ad8a2921450073076c61 SHA1 e7ef72062333b31f154f3d0f7911486d8f9e82a1 SHA256 c6f2557ab5a34f38433f52acd9b9575c1ff665ac35aee23d7dfc799f3ecd704c
+EBUILD ktorrent-3.1.5-r1.ebuild 1724 RMD160 775c122c9565f3d95ac42f9e6d8fcdf67de77301 SHA1 181bc3f40310f5a7bfaf34ac7966d908eba6146d SHA256 ce78db84c5427eb7cc3b17d2cf10daaa4420819fad6335069f36bc0811188d8e
 EBUILD ktorrent-3.1.5.ebuild 1568 RMD160 257f0c9eda498790194f2c3169276914cd04a400 SHA1 87bb5929b6d2c785773c9d935bbc41b6e647d020 SHA256 1636ff37a313b0773441065a0be5a876fd4915624ee611f8f03b9eff74c9507b
-MISC ChangeLog 14383 RMD160 1d65293a9089b483a6b67980afb8adc95bd75248 SHA1 33615737ccff9afd36f96013a3dcef63782f5c2b SHA256 f9cb4384fc773768a997b405478d07d37e317306227105fe0e0fc7a82977796d
-MISC metadata.xml 914 RMD160 1b87fd2aabe82ca7729515721da4a833a067a792 SHA1 fd362f21bd61c7dc48991e5be57659a525f0adad SHA256 4a8a59bd6aba8d6d42d9250b0e6a0502ea6c223b7aa05271ef6639dd663a79db
+EBUILD ktorrent-3.2_beta1.ebuild 2260 RMD160 18bdc0916f4bacbcaeb53417fab5decc94f98558 SHA1 802b88d8f5d278078ee9c54ffd9a74ac571f0276 SHA256 2fd2e13c233530441c141e7ddf193d21f088fc88527a328afea5e234ae236943
+MISC ChangeLog 14670 RMD160 0fc68962f285642232fe0433dea0129afb03686e SHA1 fedba82127bc33a1cf17f3fc7bad0ca74d724e55 SHA256 da00734e8c94739bf0d57a25e0f40ff362e3261abd8ed56127d9ded16b1ea154
+MISC metadata.xml 1048 RMD160 cc7e160d01855cc79c401910e8cb3708737c32d8 SHA1 795aafc1ebe72b454ed798f51b39cf8314e586df SHA256 ca63e11238a24090a4aaed1bb6f9a71589af4ddef1e65bef52dd170611647c0c
diff --git a/net-p2p/ktorrent/ktorrent-3.1.5-r1.ebuild b/net-p2p/ktorrent/ktorrent-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..00fb6ef109c1
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-3.1.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-3.1.5-r1.ebuild,v 1.1 2008/12/03 22:43:38 scarabeus Exp $
+
+EAPI="2"
+
+NEED_KDE=":4.1"
+KDE_LINGUAS="ca cs da de el es et fr gl it ja lv nb nds nl nn pl pt pt_BR ru sv 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 ~x86"
+SLOT="3"
+IUSE="+bwscheduler +infowidget +ipfilter +logviewer +mediaplayer +scanfolder +search +stats +upnp webinterface"
+
+DEPEND="app-crypt/qca:2
+	dev-libs/gmp
+	sys-devel/gettext
+	!kdeprefix? ( !net-p2p/ktorrent:0 )
+	!net-p2p/ktorrent:4.1"
+# 4.1 blocker is due to slot change. We wont slot based on kde version but based
+# on application version. This was stupid mistake.
+RDEPEND="${DEPEND}
+	infowidget? ( >=dev-libs/geoip-1.4.4 )"
+
+src_configure() {
+	local mycmakeargs
+
+	mycmakeargs="${mycmakeargs}
+		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+		-DENABLE_DHT_SUPPORT=ON
+		$(cmake-utils_use_enable bwscheduler BWSCHEDULER_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 logviewer LOGVIEWER_PLUGIN)
+		$(cmake-utils_use_enable scanfolder SCANFOLDER_PLUGIN)
+		$(cmake-utils_use_enable search SEARCH_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 mediaplayer MEDIAPLAYER_PLUGIN)"
+	kde4-base_src_configure
+}
diff --git a/net-p2p/ktorrent/ktorrent-3.2_beta1.ebuild b/net-p2p/ktorrent/ktorrent-3.2_beta1.ebuild
new file mode 100644
index 000000000000..6deb888e9df1
--- /dev/null
+++ b/net-p2p/ktorrent/ktorrent-3.2_beta1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-3.2_beta1.ebuild,v 1.1 2008/12/03 22:43:38 scarabeus Exp $
+
+EAPI="2"
+
+NEED_KDE=":4.1"
+KDE_LINGUAS="ca cs da de el es et fr gl it ja lv nb nds nl nn pl pt pt_BR ru sv uk zh_CN zh_TW"
+inherit kde4-base
+
+MY_PV="${PV/_/}"
+MY_P="${P/_/}"
+
+DESCRIPTION="A BitTorrent program for KDE."
+HOMEPAGE="http://ktorrent.org/"
+SRC_URI="http://ktorrent.org/downloads/${MY_PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="3"
+IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +kross +logviewer +mediaplayer +plasma +rss +scanfolder +search +stats +upnp webinterface"
+
+DEPEND="app-crypt/qca:2
+	dev-libs/gmp
+	sys-devel/gettext
+	!kdeprefix? ( !net-p2p/ktorrent:0 )
+	plasma? ( kde-base/plasma-workspace )
+	!net-p2p/ktorrent:4.1"
+	# 4.1 blocker is due to slot change. We wont slot based on kde version
+	# but based on application version. This was stupid mistake.
+RDEPEND="${DEPEND}
+	infowidget? ( >=dev-libs/geoip-1.4.4 )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	# plasma is automagic so make it normal dep.
+	use plasma && VALUE="true" || VALUE="false"
+	sed -i \
+		-e "s:macro_log_feature(PLASMA_FOUND:SET ( PLASMA_FOUND ${VALUE}) #:g" \
+		CMakeLists.txt || die "sed failed"
+}
+src_configure() {
+	local mycmakeargs
+
+	mycmakeargs="${mycmakeargs}
+		-DCMAKE_INSTALL_PREFIX=${PREFIX}
+		-DENABLE_DHT_SUPPORT=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 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 stats STATS_PLUGIN)
+		$(cmake-utils_use_enable upnp UPNP_PLUGIN)
+		$(cmake-utils_use_enable webinterface WEBINTERFACE_PLUGIN)"
+	kde4-base_src_configure
+}
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index f55f61c1b989..98c8e730a983 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -8,9 +8,11 @@
     <name>deathwing00</name>
   </maintainer>
   <use>
-    <flag name="bwscheduler">Enable the bwscheduler plugin</flag>
+	<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="ipfilter">Enable the ipfilter plugin</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>