Fix dependencies for monolithic KDE, thanks to Thorsten Becker in bug #146575.

Package-Manager: portage-2.1.1_rc1-r5

diff --git a/kde-misc/kblogger/ChangeLog b/kde-misc/kblogger/ChangeLog
index 77d0093f18b5b75c86b08ac5a72b2a13df488698..5c51eb3126695d582a65ab397259fb84585f8af4 100644 (file)
--- a/kde-misc/kblogger/ChangeLog
+++ b/kde-misc/kblogger/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-misc/kblogger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kblogger/ChangeLog,v 1.7 2006/08/16 04:03:10 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kblogger/ChangeLog,v 1.8 2006/09/06 17:54:47 flameeyes Exp $
+
+  06 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> kblogger-0.6.2.ebuild:
+  Fix dependencies for monolithic KDE, thanks to Thorsten Becker in bug #146575.
 
   16 Aug 2006; Joshua Jackson <tsunam@gentoo.org> kblogger-0.6.2.ebuild:
   adding ~x86, as something apparently went wrong with the commit..or lackthereof, David's keeping a eye one me ^.^

diff --git a/kde-misc/kblogger/Manifest b/kde-misc/kblogger/Manifest
index 8073d034ebb0dc14e573c92c539e0e22ebed4ed4..320e380fd234ac1f920dd57ead02142ca29efd76 100644 (file)
--- a/kde-misc/kblogger/Manifest
+++ b/kde-misc/kblogger/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST kblogger-0.6.2.tar.gz 709419 RMD160 e5c4752b3945a5cc224ce8003b5f81e35aa0820c SHA1 0f590e97024072440dae8da8ce795535b8c362b4 SHA256 83407621c0decffc303d785f8d1b948fbf1c03b38f4e632590ddd675c8e6b2c2
-EBUILD kblogger-0.6.2.ebuild 574 RMD160 02d2898ce202e13c7c118e13129fcb41bfd8c13b SHA1 cfe788807af8b06ae68938aa81cde56ba0fd6816 SHA256 974f3042b64ded18ac4dd24cdd77b2454584e44b71f93b5ac4dc4fb309fc5283
-MD5 3a1516c55fb4c61fa9af6492a086f8c8 kblogger-0.6.2.ebuild 574
-RMD160 02d2898ce202e13c7c118e13129fcb41bfd8c13b kblogger-0.6.2.ebuild 574
-SHA256 974f3042b64ded18ac4dd24cdd77b2454584e44b71f93b5ac4dc4fb309fc5283 kblogger-0.6.2.ebuild 574
-MISC ChangeLog 1332 RMD160 9c1566e2acf6a3cb9ee315e231068868f41fc54c SHA1 858d4aaca7151bdeed53d93025b5b199a8bd6ac8 SHA256 105e773c7841beca190a25156f79aa9ca1314011f05557aa7714e8ba09509910
-MD5 dbb3a6ba3c7c6694c1144383dde8b4fd ChangeLog 1332
-RMD160 9c1566e2acf6a3cb9ee315e231068868f41fc54c ChangeLog 1332
-SHA256 105e773c7841beca190a25156f79aa9ca1314011f05557aa7714e8ba09509910 ChangeLog 1332
+EBUILD kblogger-0.6.2.ebuild 601 RMD160 151aa3f3e70a131a5394c648d9ba3dcb3010e8e8 SHA1 c39951212310f23a9d2a9f3ea8af6d320c61761f SHA256 3cdf891f5ec38db2182ee2cfb793dd3803b7016d5263b14b1119c4f324418af1
+MD5 5f19bf7d1d19bfe92b62e751add07667 kblogger-0.6.2.ebuild 601
+RMD160 151aa3f3e70a131a5394c648d9ba3dcb3010e8e8 kblogger-0.6.2.ebuild 601
+SHA256 3cdf891f5ec38db2182ee2cfb793dd3803b7016d5263b14b1119c4f324418af1 kblogger-0.6.2.ebuild 601
+MISC ChangeLog 1493 RMD160 bdfc32f1d33be8a639e58de747c78f07b8027623 SHA1 0e745c6ef0305c099a06199038ce79c0698b0450 SHA256 2db959cc7942e6386c3c92b76a095a994b5b74a015642637740449c7bcd1d3f6
+MD5 959db058c38edbe67337131fdb914e9f ChangeLog 1493
+RMD160 bdfc32f1d33be8a639e58de747c78f07b8027623 ChangeLog 1493
+SHA256 2db959cc7942e6386c3c92b76a095a994b5b74a015642637740449c7bcd1d3f6 ChangeLog 1493
 MISC metadata.xml 247 RMD160 cfbcab66aac2f2a6947df91e47d55b96d483f747 SHA1 5acec8a39a7d01baea9795a5452ef6cf0f81718e SHA256 a65a72511860d36cafde4feaf0fd8656f3181b605cf165dd9d0984c141bb0859
 MD5 9b3a540894ad552b2bdb7538bdd95dee metadata.xml 247
 RMD160 cfbcab66aac2f2a6947df91e47d55b96d483f747 metadata.xml 247
@@ -18,9 +18,9 @@ MD5 25fc8f3fbec1a91f9ef3ed93c7a9bb97 files/digest-kblogger-0.6.2 244
 RMD160 a82a336352ee4fb55fc66f3f09127886b904d973 files/digest-kblogger-0.6.2 244
 SHA256 548db27d46700b2661d13787a55ffacd9360c92866d8ffacfad21d6de67fd20a files/digest-kblogger-0.6.2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4pkz2ZWR0Jhg/EsRAoAmAJ9DrfXvxWLPw3aaGoamLR9/aGj1gwCffrnP
-fBod43ULhcsewSzwrP/c5fg=
-=PN8J
+iD8DBQFE/wttAiZjviIA2XgRAiCDAKCjzrnLBqmePVzNTF/IihJ/jtIFawCgsEql
+zSxIka4L+Bgb87oxn+wOqeQ=
+=pB39
 -----END PGP SIGNATURE-----

diff --git a/kde-misc/kblogger/kblogger-0.6.2.ebuild b/kde-misc/kblogger/kblogger-0.6.2.ebuild
index 8129e9b91222bffda1da27390a0bfbd0ab023a38..33e8f40a8000f61dd523e4b653e22e81181f4e4a 100644 (file)
--- a/kde-misc/kblogger/kblogger-0.6.2.ebuild
+++ b/kde-misc/kblogger/kblogger-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kblogger/kblogger-0.6.2.ebuild,v 1.3 2006/08/16 04:03:10 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kblogger/kblogger-0.6.2.ebuild,v 1.4 2006/09/06 17:54:47 flameeyes Exp $
 
 inherit kde
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="kde-base/kicker"
+DEPEND="|| ( kde-base/kicker kde-base/kdebase )"
 RDEPEND="${DEPEND}"
 
 src_unpack() {