[gentoo-commits] proj/kde-sunset:master commit in: net-p2p/ktorrent/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b49be16271b25665f08ebd4796a3d8b39a5bbbc0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 27 14:49:04 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 27 15:15:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b49be162

net-p2p/ktorrent: Drop IUSE=kross, cleanup obsolete versionator stuff

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild | 24 +++++++-----------------
 net-p2p/ktorrent/metadata.xml             |  1 -
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
index aff6802f..e1dbe444 100644
--- a/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
+++ b/net-p2p/ktorrent/ktorrent-4.3.1-r1.ebuild
@@ -1,22 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 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"
 
-	SRC_URI="http://deb.debian.org/debian/pool/main/k/${PN}/${P/-/_}.orig.tar.bz2 -> ${MY_P}.tar.bz2"
+	SRC_URI="http://deb.debian.org/debian/pool/main/k/${PN}/${P}.orig.tar.bz2 -> ${P}.tar.bz2"
 	S="${WORKDIR}"/"${MY_P}"
 
 	KEYWORDS="~amd64 ~x86"
@@ -27,18 +19,17 @@ fi
 
 inherit kde4-base kde4-functions-extra
 
-DESCRIPTION="A BitTorrent program for KDE"
+DESCRIPTION="Powerful BitTorrent client by KDE"
 HOMEPAGE="http://ktorrent.pwsp.net/"
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer
+IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +logviewer
 +magnetgenerator +mediaplayer plasma rss +scanfolder +search +shutdown +stats
 +upnp webinterface +zeroconf"
 
 COMMONDEPEND="
-	<net-libs/libktorrent-${LIBKT_VERSION_MAX}:4
-	>=net-libs/libktorrent-${LIBKT_VERSION_MIN}:4
+	>=net-libs/libktorrent-1.3.1:4
 	infowidget? ( dev-libs/geoip )
 	mediaplayer? ( >=media-libs/taglib-1.5 )
 	plasma? ( $(add_kdeplasma_dep libtaskmanager) )
@@ -59,7 +50,6 @@ RDEPEND="${COMMONDEPEND}
 		app-arch/unzip
 		$(add_kdeapps_dep kdebase-kioslaves)
 	)
-	kross? ( $(add_kdeapps_dep kross-interpreters) )
 "
 
 PATCHES=(
@@ -78,13 +68,13 @@ src_prepare() {
 }
 
 src_configure() {
-	mycmakeargs=(
+	local 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)
+		-DENABLE_SCRIPTING_PLUGIN=OFF
 		$(cmake-utils_use_enable logviewer LOGVIEWER_PLUGIN)
 		$(cmake-utils_use_enable magnetgenerator MAGNETGENERATOR_PLUGIN)
 		$(cmake-utils_use_enable mediaplayer MEDIAPLAYER_PLUGIN)

diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index cf6bd528..a821aea8 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -7,7 +7,6 @@
 		<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="kross">Enable kross scripting support</flag>
 		<flag name="logviewer">Enable the logviewer plugin</flag>
 		<flag name="magnetgenerator">Generates magnet URI's</flag>
 		<flag name="mediaplayer">Enable the mediaplayer plugin</flag>