Update build system not to die by default. Per bug #266597.

Package-Manager: portage-2.2_rc30/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 19 insertions, 32 deletions

diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 7b1756aa0af9..4f6ce861acfa 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.113 2009/04/17 07:55:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.114 2009/04/23 15:51:41 scarabeus Exp $
+
+  23 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> kget-4.2.2.ebuild:
+  Update build system not to die by default. Per bug #266597.
 
   17 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> kget-4.2.2:
   Restore ~hppa keywords
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index 7152b480ca00..3d8c5c58e882 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST kdenetwork-3.5.10.tar.bz2 9336764 RMD160 f888f53746f1e734d3c15c09eac1c2b9c0564b20 SHA1 eb280bffaf4642bfda442cc6a9fb38dc4163b720 SHA256 a511aafe2356d6041de1c617085e6d4cf5b3cab38c390dc044c9bd86b3f0d4e9
 DIST kdenetwork-3.5.9.tar.bz2 9339308 RMD160 3df73e0cd2b628cb49d12da3af663288aebdfd71 SHA1 a4901468e94d3433468ebf1f2213b93b37496cca SHA256 fc196f4e340255af1ab15d9346c40e77fcdd1d61114f6f999670c0a6cd23cc14
 DIST kdenetwork-4.2.2.tar.bz2 7174894 RMD160 e9bcf31475785ed2ecc7148cba7e1650cdc6ea3d SHA1 335a09012602400318d6e703fdcc390f5a2f7761 SHA256 18c55e54f772b25133a223fad3cef0187f098991ddca6785389cf088aa3816f5
 EBUILD kget-3.5.10.ebuild 446 RMD160 67eb4e27c8cb1a8af3faa34116c0750a609992ca SHA1 eebdbc6670bb9e0fa9db1e1d310d948f1eafa85d SHA256 cfe406763ea435a5f2aa853e762cc942aacb136bb49aed4eb5081efd66c29350
 EBUILD kget-3.5.9.ebuild 407 RMD160 eb43d0bb5675a137be02dd11e8408fba0a7469e3 SHA1 5c23cd2cbbdf6d466999d7db76dbcbda7467f756 SHA256 6896f3e30c4d71591073110e7655b680c671531d59a8ccaa5c6f30c6ef8d92b6
-EBUILD kget-4.2.2.ebuild 2041 RMD160 60aeab9a9d216e7206a721538cd95cc3680e736e SHA1 022a942626f7f0d69766322607f1c53a7dcaba97 SHA256 3ae4143df61216b23e358e67b29c8d7461fbc23e7b4cf4cb2a1c8ee66d91b950
-MISC ChangeLog 13286 RMD160 2253c123cdd0164a024dd3c5a562fcb8b68af46c SHA1 a00caa737e378e5bd880b501206680527cf08112 SHA256 2ad0089df7cb35330b61065f234e85cfda29555473787c1ddbe4771f0f5ee189
+EBUILD kget-4.2.2.ebuild 1853 RMD160 ed93ee7000298cd48744ece9e9eeda948652c6c8 SHA1 e128037e94a7399bba25c590f77da981de37ea53 SHA256 d0bab7230864ac4292383b1efd6729f8d3ca37598c3b7b03898d1604c7e8c5b1
+MISC ChangeLog 13423 RMD160 340c5703fc28f1cd0fc98a1914c12f724de4aac2 SHA1 96a0bcbc9a6f5e022f51948cf2b90c994acbf162 SHA256 bb2801a5520edc0bc8010e63e77f5fa5d1a3b1869d110734e862d9b4d6151c95
 MISC metadata.xml 343 RMD160 726f6a73aeb2b9fe613a09499b42264b28343e32 SHA1 7bc184b8a8c02369e6d41df70ce3437a7e211cf3 SHA256 cab3c0898129a375f1bb65362bdf1cddb0e025c5fb9c1cd553cebf49eb7a81be
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknoNd8ACgkQ5BmOA85PVLhIcgCggUlMbmtsfBAHzAYePr1eQ8/L
-q40An1KMs4E3eXbVqTzu62Bw7fJNt5SK
-=F12v
------END PGP SIGNATURE-----
diff --git a/kde-base/kget/kget-4.2.2.ebuild b/kde-base/kget/kget-4.2.2.ebuild
index 0775e397db92..817785b27a47 100644
--- a/kde-base/kget/kget-4.2.2.ebuild
+++ b/kde-base/kget/kget-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild,v 1.3 2009/04/17 07:55:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild,v 1.4 2009/04/23 15:51:41 scarabeus Exp $
 
 EAPI="2"
 
@@ -27,21 +27,6 @@ RDEPEND="${DEPEND}
 	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
 "
 
-pkg_setup() {
-	if use bittorrent && use bittorrent-external; then
-		echo
-		eerror "USE flag 'bittorrent' conflicts with these USE flag 'bittorrent-external'"
-		eerror
-		eerror "You must disable these conflicting flags before you can emerge this package."
-		eerror "You can do this by disabling one of these flags in /etc/portage/package.use:"
-		eerror "    =${CATEGORY}/${PN}-${PV} -bittorrent-external"
-		echo
-		die "Conflicting USE flags found"
-	fi
-
-	kde4-base_pkg_setup
-}
-
 src_prepare() {
 	if ! use bittorrent && ! use bittorrent-external; then
 		sed -i -e '/bittorrent/s:^:#DONOTCOMPILE :' \
@@ -56,12 +41,21 @@ src_prepare() {
 }
 
 src_configure() {
+	if use bittorent-external && use bittorent ; then
+		einfo "Using the external plugin."
+		einfo "Disable bittorent-external useflag if you want iternal one."
+	fi
+	if use bittorent-external; then
+		mycmakeargs="${mycmakeargs} -DEMBEDDED_TORRENT_SUPPORT=OFF"
+	else
+		mycmakeargs="${mycmakeargs}
+			$(cmake-utils_use_enable bittorrent EMBEDDED_TORRENT_SUPPORT)"
+	fi
 	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_enable bittorrent EMBEDDED_TORRENT_SUPPORT)
-		$(cmake-utils_use_with plasma Plasma)
+		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with sqlite Sqlite)"
+		$(cmake-utils_use_with sqlite)"
 
 	kde4-meta_src_configure
 }