Deps cleanup. add missing splid dep - bug 337033 among others.

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

4 files changed, 25 insertions, 15 deletions

diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index f1e8d30966d5..83479cceb4a6 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.174 2010/09/06 00:31:37 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.175 2010/09/15 00:40:46 reavertm Exp $
+
+  15 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org> kget-4.5.1.ebuild,
+  metadata.xml:
+  Deps cleanup. add missing splid dep - bug 337033 among others.
 
 *kget-4.5.1 (06 Sep 2010)
 
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index 7bd0448cd2bd..495f4806ba89 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,6 +1,6 @@
 DIST kdenetwork-4.4.5.tar.bz2 8324754 RMD160 5cf43ba3e1b772a0fe1306f9553d5ad9cfa40a8b SHA1 5f321ce932d6b1fadf1935e527bd1848c317be7a SHA256 ca9ff22ce3fb44f4025fe864a4be8524efb252e817bd24e93e9c0dc6ea2ceee6
 DIST kdenetwork-4.5.1.tar.bz2 8156627 RMD160 afc70c381c5781e067cff9e95f5fb0b84c65015e SHA1 21c30bd592b22056f3e474d761fc2943ea280c33 SHA256 d670fcdaf2862742d89707b74fddd8baefa71c97c5612c0669a4fd4524cceb73
 EBUILD kget-4.4.5.ebuild 969 RMD160 f203c67e35f7c8ccabb8d87fd9e54b6569eb4479 SHA1 ac166cc38ff4a84542a968e6f7e01fb9f0073cfe SHA256 30853a049dbb9d0f1f654191cd0106dae082ef427c5f49df720114e937a4d80b
-EBUILD kget-4.5.1.ebuild 1194 RMD160 276a428c7aa361e0925390d721eb2c56ab1d6095 SHA1 37175f84d14ac13c861132aef4687d5941a20ec7 SHA256 9ecff784f6bd7a368f3c8cc515f21f41252a5348cb69a0d744fa770f125a9038
-MISC ChangeLog 20375 RMD160 85d411c999c66ad714207787d017afd48bf349d3 SHA1 0c575974b8ed0a63a1560600fcd1b81b3de88abb SHA256 603238dd0cd95b06fe6c00646d6d1fe7a19323d598eb73cb1842a20bc99b5da8
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+EBUILD kget-4.5.1.ebuild 1325 RMD160 de4cb1b07102c263fcdad91602c9c36fb74cfd48 SHA1 3015266fae340cdb1165ff6c792906dc717e2f20 SHA256 c8ad586505846cdc8998e3793dbaff6d4a77a32c97a9dc23e63d8c747b7c9c8d
+MISC ChangeLog 20529 RMD160 7abaa68659f785f7d49ed355e0aaec7129e1edb9 SHA1 b56cdb0da702b465cf46eb7c53c1a51718402e03 SHA256 5fc18b29db3ef070c11e314cb5c2854db864f8154b2f59642cd2c704224653d8
+MISC metadata.xml 373 RMD160 01f0c31c2ad8a6a7a4c6b30b6ec4024d6b020708 SHA1 aea6eff2e7a6d86b321ffa209e829d81a9dbf64c SHA256 e4cd567dbf7a7ced44643ff336123876e50c7dc9f5edce8eb1c44d42d2c2d095
diff --git a/kde-base/kget/kget-4.5.1.ebuild b/kde-base/kget/kget-4.5.1.ebuild
index aef3b67cfc16..2a5a1999f589 100644
--- a/kde-base/kget/kget-4.5.1.ebuild
+++ b/kde-base/kget/kget-4.5.1.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.5.1.ebuild,v 1.3 2010/09/14 12:54:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.5.1.ebuild,v 1.4 2010/09/15 00:40:46 reavertm Exp $
 
 EAPI="3"
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
+WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="An advanced download manager for KDE"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-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 8d1e86a9cefb..b43e54bba9aa 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>