Fix dep: respect monolith kde. Bug #155360.

Package-Manager: portage-2.1.2_rc2-r2

diff --git a/app-pda/libopensync-plugin-kdepim/ChangeLog b/app-pda/libopensync-plugin-kdepim/ChangeLog
index f14f2336a1da2b13a487c1bfd39711a491410be1..4c18664f60df5bfd28e1a7ef65649ecbd1f32841 100644 (file)
--- a/app-pda/libopensync-plugin-kdepim/ChangeLog
+++ b/app-pda/libopensync-plugin-kdepim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/libopensync-plugin-kdepim
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/ChangeLog,v 1.2 2006/11/10 18:48:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/ChangeLog,v 1.3 2006/11/27 15:51:24 peper Exp $
+
+  27 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  libopensync-plugin-kdepim-0.19.ebuild,
+  libopensync-plugin-kdepim-0.20.ebuild:
+  Fix dep: respect monolith kde. Bug #155360.
 
 *libopensync-plugin-kdepim-0.20 (09 Nov 2006)
 

diff --git a/app-pda/libopensync-plugin-kdepim/Manifest b/app-pda/libopensync-plugin-kdepim/Manifest
index 5105c7ea1bb84e5d265880d54e22f4a930e9111d..2dc8cfee80c1f5cf1a2bdc6f935797ed85f1db81 100644 (file)
--- a/app-pda/libopensync-plugin-kdepim/Manifest
+++ b/app-pda/libopensync-plugin-kdepim/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 DIST libopensync-plugin-kdepim-0.19.tar.gz 406413 RMD160 4df78c7a9145e5e5896f0378948ed1eae34133d6 SHA1 0225d090d29f4a5e841f12b0ba0319134b3cbf56 SHA256 80700bca80e3f7b2fd359f6d3152f6321d2e3d495f6f678df6f6b950f3c4363c
 DIST libopensync-plugin-kdepim-0.20.tar.gz 407285 RMD160 e40874b8307478b8b227de7591164d1c3b61576a SHA1 8094692b332176122fa83357878d258b50864d08 SHA256 dffe685364c64ceb52e5d226526572132b9f0e95634380a098b7d3a031fa44a1
-EBUILD libopensync-plugin-kdepim-0.19.ebuild 768 RMD160 93c3414b96535a8ef21c93bfe8cd162278900bc5 SHA1 cf9333b77647df0cd6f7cdf520271a99b1f5ab9c SHA256 f6a04f5c15c9c86369928a0e2e01f6d1b824217d527e453f95ff6a6907ac0aa7
-MD5 d7652f539711a5072ec6009f8dc4f80f libopensync-plugin-kdepim-0.19.ebuild 768
-RMD160 93c3414b96535a8ef21c93bfe8cd162278900bc5 libopensync-plugin-kdepim-0.19.ebuild 768
-SHA256 f6a04f5c15c9c86369928a0e2e01f6d1b824217d527e453f95ff6a6907ac0aa7 libopensync-plugin-kdepim-0.19.ebuild 768
-EBUILD libopensync-plugin-kdepim-0.20.ebuild 787 RMD160 63c7a7837d62e5c156714a0d35bbe1a09fb89212 SHA1 07de39eb8d1aae51ab8d15948862609a3336f202 SHA256 52e39c85704fa58b8e1d989ae185f3e9fd7d747fb56681127b0658cb83ef3189
-MD5 28c3d1995b14f102708a0e3c46b1fe5d libopensync-plugin-kdepim-0.20.ebuild 787
-RMD160 63c7a7837d62e5c156714a0d35bbe1a09fb89212 libopensync-plugin-kdepim-0.20.ebuild 787
-SHA256 52e39c85704fa58b8e1d989ae185f3e9fd7d747fb56681127b0658cb83ef3189 libopensync-plugin-kdepim-0.20.ebuild 787
-MISC ChangeLog 570 RMD160 7fe10f2c940d81c23ce241b35ad494ba59a48759 SHA1 dfac0933dcb4361b8e4ab1b4ba4f584080033124 SHA256 ed7490061359ae7808171c97ace45954824024880055c73cbf5efe0146d44ac1
-MD5 d024c51025de374c503634d92dfa3378 ChangeLog 570
-RMD160 7fe10f2c940d81c23ce241b35ad494ba59a48759 ChangeLog 570
-SHA256 ed7490061359ae7808171c97ace45954824024880055c73cbf5efe0146d44ac1 ChangeLog 570
+EBUILD libopensync-plugin-kdepim-0.19.ebuild 791 RMD160 123469d12245015ebe80c3044d2315530bb856d3 SHA1 9b3b2420265320266f74837c3a8d8dc809d91970 SHA256 4e13dfc2d402f9ec2bf5bc49522f2e7c17e6e8ffa31c79bea12c66ec2a3a40f8
+MD5 a7fc180ae0a19231370ae320c8739899 libopensync-plugin-kdepim-0.19.ebuild 791
+RMD160 123469d12245015ebe80c3044d2315530bb856d3 libopensync-plugin-kdepim-0.19.ebuild 791
+SHA256 4e13dfc2d402f9ec2bf5bc49522f2e7c17e6e8ffa31c79bea12c66ec2a3a40f8 libopensync-plugin-kdepim-0.19.ebuild 791
+EBUILD libopensync-plugin-kdepim-0.20.ebuild 811 RMD160 f67414854db73b9e44885aad87a80e335ab28806 SHA1 0bf6bd02a9f179ef35372e0c168741ff3a357109 SHA256 21cece8b4a0e93527c3e11d3137ebc54328b3d8cc9563809ce70c972c25fcb9c
+MD5 220495cc913096e1280e354b198bf47e libopensync-plugin-kdepim-0.20.ebuild 811
+RMD160 f67414854db73b9e44885aad87a80e335ab28806 libopensync-plugin-kdepim-0.20.ebuild 811
+SHA256 21cece8b4a0e93527c3e11d3137ebc54328b3d8cc9563809ce70c972c25fcb9c libopensync-plugin-kdepim-0.20.ebuild 811
+MISC ChangeLog 752 RMD160 17311a1240ea2d512915d78f41e72f795e2a455b SHA1 d77be7dfb60eb0c78aaefac5f34c1f5d62ef274c SHA256 32e17b7879cf6ccfb1d77bab4925af753d2d3ceb9e8614d0202d211126148a56
+MD5 ef7851bf12abc21081a47cd34f9e3b76 ChangeLog 752
+RMD160 17311a1240ea2d512915d78f41e72f795e2a455b ChangeLog 752
+SHA256 32e17b7879cf6ccfb1d77bab4925af753d2d3ceb9e8614d0202d211126148a56 ChangeLog 752
 MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
 MD5 45ae331a9c100ecabad1b4cd916f3d37 metadata.xml 304
 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 metadata.xml 304
@@ -28,7 +28,7 @@ SHA256 a7c8811e04e8e0f7065e44d58672df36ef7323234db2d5ef72eccb50c395d5b7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVMjdppoStNGKGywRAksyAJ4ouK6ppJvvR6kji0c+IE+dXtybKACgigtv
-JjOh1BVLi+BESuG+Xj9seow=
-=X51Q
+iD8DBQFFawmDppoStNGKGywRAmxHAJ9Tzc/xlHwznIJEvO1+eUcxKtDLSgCggrrR
+fto+PemksggcaTSK/36MOvg=
+=VrYc
 -----END PGP SIGNATURE-----

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.ebuild
index 343d802d42ed7b374ed26ad2736d28d653e6b6e4..da4ae251d118e1a1541af5fabc60edf60f8ed4c3 100644 (file)
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.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/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.ebuild,v 1.2 2006/11/10 18:48:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.19.ebuild,v 1.3 2006/11/27 15:51:24 peper Exp $
 
 inherit qt3
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 IUSE="arts"
 
 DEPEND="=app-pda/libopensync-${PV}*
-       kde-base/libkcal"
+       || ( kde-base/libkcal kde-base/kdepim )"
 
 RDEPEND="${DEPEND}"
 

diff --git a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.ebuild b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.ebuild
index b6ff3fc8e4d069765426b6ba720afed035c07dd2..39829836246ffbebec7c57ab3d3faf37916d5533 100644 (file)
--- a/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.ebuild
+++ b/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.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/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.ebuild,v 1.1 2006/11/10 18:48:23 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libopensync-plugin-kdepim/libopensync-plugin-kdepim-0.20.ebuild,v 1.2 2006/11/27 15:51:24 peper Exp $
 
 inherit qt3
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 IUSE="arts"
 
 DEPEND="=app-pda/libopensync-${PV}*
-       kde-base/libkcal"
+       || ( kde-base/libkcal kde-base/kdepim )"
+
 RDEPEND="${DEPEND}"
 
 # interactive and broken