[kde-base/kget] Update deps, add some USE flags, remove some..

4 files changed, 31 insertions, 23 deletions

diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index 61db5970ba0..d467b3226fc 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,5 +1,5 @@
 AUX kdenetwork-r1138807-fix-virtual-scandlg.patch 1112 RMD160 1d5b7bf5539ea9a34690c62c79361bbd66ce98fa SHA1 d2827387cc01adb30af875eb1f2a799c036601be SHA256 0e0a2a28cd576d4acb7137b6ab9b9d9dad78476233e4ecd21b54bd08b1c85dac
 EBUILD kget-4.4.9999.ebuild 829 RMD160 ecfabe995f3b564d4abdb2e170dae8fb9438bc6c SHA1 f714d2ac9e6f09fc397d000e932b090d4e444025 SHA256 10a7dbca3e4f832c82de11e746b98ed253b370e62119c023dc14c718acde236a
-EBUILD kget-4.5.9999.ebuild 1052 RMD160 bcdf64d7905b08f466b9ca0a18d0362a3ea7eaa9 SHA1 b019c90416c94a133ff8ec022fca0b60d5949dca SHA256 3a15828118f19532785c2dcd3ce7b280ee0ac0097ca9fb430fb6510456b38ab2
-EBUILD kget-9999.ebuild 1052 RMD160 bcdf64d7905b08f466b9ca0a18d0362a3ea7eaa9 SHA1 b019c90416c94a133ff8ec022fca0b60d5949dca SHA256 3a15828118f19532785c2dcd3ce7b280ee0ac0097ca9fb430fb6510456b38ab2
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+EBUILD kget-4.5.9999.ebuild 1183 RMD160 f18bd3cd26f6cb2014e59eec645cbbf2d1bb4e0e SHA1 0c8258dda785c7b084353496e262f1dc4667d468 SHA256 ebf42ac25ab60a614995d6c290cdf2b459c7736d40914d2fcf9e7b2c5c0f8900
+EBUILD kget-9999.ebuild 1183 RMD160 f18bd3cd26f6cb2014e59eec645cbbf2d1bb4e0e SHA1 0c8258dda785c7b084353496e262f1dc4667d468 SHA256 ebf42ac25ab60a614995d6c290cdf2b459c7736d40914d2fcf9e7b2c5c0f8900
+MISC metadata.xml 373 RMD160 01f0c31c2ad8a6a7a4c6b30b6ec4024d6b020708 SHA1 aea6eff2e7a6d86b321ffa209e829d81a9dbf64c SHA256 e4cd567dbf7a7ced44643ff336123876e50c7dc9f5edce8eb1c44d42d2c2d095
diff --git a/kde-base/kget/kget-4.5.9999.ebuild b/kde-base/kget/kget-4.5.9999.ebuild
index 575c114b80e..8d8def45373 100644
--- a/kde-base/kget/kget-4.5.9999.ebuild
+++ b/kde-base/kget/kget-4.5.9999.ebuild
@@ -6,21 +6,23 @@ EAPI="3"
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
+WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="An advanced download manager for KDE"
 KEYWORDS=""
-IUSE="debug +plasma semantic-desktop sqlite"
+IUSE="debug bittorrent semantic-desktop sqlite"
 
 RDEPEND="
 	app-crypt/qca:2
-	dev-libs/gmp
-	dev-libs/libpcre
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkonq)
 	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
 	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
@@ -28,20 +30,20 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	kde4-meta_src_prepare
-
-	# Don't use external libbtcore, it's not really ready yet
-	sed -e 's:find_package(BTCore):macro_optional_&:' \
-		-i kget/transfer-plugins/bittorrent/CMakeLists.txt || die "sed failed"
+	# Disable bittorrent as supported mimetype
+	if ! use bittorrent; then
+		sed -e '/MimeType=/s|application/x-bittorrent;||' \
+			-i kget/desktop/kget.desktop || die
+	fi
 }
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_BTCore=OFF
-		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with bittorrent KTorrent)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
 	)
-
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kget/kget-9999.ebuild b/kde-base/kget/kget-9999.ebuild
index 575c114b80e..8d8def45373 100644
--- a/kde-base/kget/kget-9999.ebuild
+++ b/kde-base/kget/kget-9999.ebuild
@@ -6,21 +6,23 @@ EAPI="3"
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
+WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="An advanced download manager for KDE"
 KEYWORDS=""
-IUSE="debug +plasma semantic-desktop sqlite"
+IUSE="debug bittorrent semantic-desktop sqlite"
 
 RDEPEND="
 	app-crypt/qca:2
-	dev-libs/gmp
-	dev-libs/libpcre
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
 	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep libkonq)
 	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep solid)
+	bittorrent? ( >=net-libs/libktorrent-1.0.3 )
 	sqlite? ( dev-db/sqlite:3 )
+	webkit? ( >=kde-misc/kwebkitpart-0.9.6 )
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost
@@ -28,20 +30,20 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	kde4-meta_src_prepare
-
-	# Don't use external libbtcore, it's not really ready yet
-	sed -e 's:find_package(BTCore):macro_optional_&:' \
-		-i kget/transfer-plugins/bittorrent/CMakeLists.txt || die "sed failed"
+	# Disable bittorrent as supported mimetype
+	if ! use bittorrent; then
+		sed -e '/MimeType=/s|application/x-bittorrent;||' \
+			-i kget/desktop/kget.desktop || die
+	fi
 }
 
 src_configure() {
 	mycmakeargs=(
-		-DWITH_BTCore=OFF
-		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use_with bittorrent KTorrent)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with sqlite)
+		$(cmake-utils_use_with webkit KWebKitPart)
 	)
-
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kget/metadata.xml b/kde-base/kget/metadata.xml
index 8d1e86a9cef..b43e54bba9a 100644
--- a/kde-base/kget/metadata.xml
+++ b/kde-base/kget/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
+<use>
+	<flag name="bittorrent">Enable bittorrent transfer plugin through <pkg>net-libs/libktorrent</pkg></flag>
+	<flag name="webkit">Enable KdeWebkit browser plugin using <pkg>kde-misc/kwebkitpart</pkg></flag>
+</use>
 </pkgmetadata>