Add option to depend on >=kdepimlibs-4.9.80 since akonadi-social-utils was merged into kdepimlibs for 4.10

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 13 insertions, 12 deletions

diff --git a/kde-misc/akonadi-facebook/ChangeLog b/kde-misc/akonadi-facebook/ChangeLog
index 1728c0702cda..ba0d0b1de9fb 100644
--- a/kde-misc/akonadi-facebook/ChangeLog
+++ b/kde-misc/akonadi-facebook/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/akonadi-facebook
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/ChangeLog,v 1.2 2012/08/28 06:12:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/ChangeLog,v 1.3 2012/11/23 04:32:50 creffett Exp $
+
+  23 Nov 2012; Chris Reffett <creffett@gentoo.org>
+  akonadi-facebook-0_p20120827.ebuild:
+  Add option to depend on >=kdepimlibs-4.9.80 since akonadi-social-utils was
+  merged into kdepimlibs for 4.10
 
 *akonadi-facebook-0_p20120827 (28 Aug 2012)
 
diff --git a/kde-misc/akonadi-facebook/Manifest b/kde-misc/akonadi-facebook/Manifest
index 6d51bf56fd49..c378eaf2150f 100644
--- a/kde-misc/akonadi-facebook/Manifest
+++ b/kde-misc/akonadi-facebook/Manifest
@@ -5,17 +5,13 @@ AUX akonadi-facebook-0_p20120827-fix-includes.patch 734 SHA256 30694c741dd966c01
 DIST akonadi-facebook-0_p20120222.tar.xz 36420 SHA256 8e69c81b8d806bdaef0c8befb38ea4a28d354d512340d3955aa03bc9506a9da0
 DIST akonadi-facebook-0_p20120827.tar.xz 53912 SHA256 410b6a8e6531667214566ecb865e9588f4cc27c6bbd6ddb334a94ee00c3e9428 SHA512 b8fdbd290f3a7b109e1a5c728a2db9f850a99cc9062504d1548eb8c2b5929f5f7ba01cfb0999d865c864b5e645f1acdf2c68dfe4ff435740ac7b8ed9dae9673e WHIRLPOOL bed57ec2a7f37bbcd9f9cac4079aafb3ac7be560ad4c9eb5ea8918f2f774d405ae941987d7245ca4d5b10349aea6dd06470033de87091ad972be740ff736a9f7
 EBUILD akonadi-facebook-0_p20120222.ebuild 657 SHA256 a87653575bc19c70c75cae0a327a0013f6b5753e15fec4a0c683e1c5a0d8778e SHA512 ce6be23e0e1a9e28a2e32049543da0aee420f7ae630eddcdcf873d7ca05ef6dbcb9d1ca9b2f938796390d314b85ca48d10ddc212da1ce79c12d5ace8497aa854 WHIRLPOOL 5980060f7586834de48b2394dc7461150e6d0c62c8fe0e7240e96f46d0f6fa979ecd1b9fbab39ea9e787c9ebff025d774b94c9ddc80f588c09080b4171a0d6bb
-EBUILD akonadi-facebook-0_p20120827.ebuild 756 SHA256 53f1559f1ec815bc083de01ca3840069f2668a45b3430f369bb391f37cbd8f21 SHA512 edeaab93a774f1a23bc26e35e998502410f2c13427382fc9dba7a2e090ee044ff22a655be12f1cd735938f377a4ff1434e17dcc234fafbd9f176e0c39c4c7dbd WHIRLPOOL b4a90b2d3a82a7f25a1fd7dfa242ed9eb5708947ff5a83e16a947afac47177ad4f466f00ef975963b9b262c65a2b4b86524197c525cb390c0811fb26f46094d0
-MISC ChangeLog 696 SHA256 d324a607e10537ec61d065db958127d80b145fc4999a1f6539a27381cb5fadd4 SHA512 572c7d0b7d380313b6b79ce8564c7558e958f1bbae7b0ad0562fd243445c7c038072098e70c0d9145f7bf44d81b8020908cba67bdd611b8a4ea6bb2bcbf49f3b WHIRLPOOL e2cb1248e148aacfcf2ddd416d9e9c72babc0746fc0cf0106ef6289c22232bba38ccbfc835dec261601aae14dbcedfb075d38e8a833384ed95ae31e2dc67a104
+EBUILD akonadi-facebook-0_p20120827.ebuild 807 SHA256 11ee519974076fef43e876a6c6dec95f2f0d6a20e8daccfa424530e33d236a53 SHA512 3600e00029738bd478d5209e974c47adbd8925b59b0bfebd5adcbbd66e9c79f7771879b5dd7cf31f088b1279014a5c80e3dabb8c170abeb404417caf0401307f WHIRLPOOL 71a07badf800407b5666ec9d4a99eaa54cd9c6911eecdbc02b2d797c782d267ebe7b6bbd6ce8865b7230de730d8427ef3d8863fa70328c2eca6328d60b1acd72
+MISC ChangeLog 902 SHA256 f8aea3ab2a649934c2b2feba7a14040ab598fd5d709cd3ceef1666a5c5510d41 SHA512 564d9d593446fcf2d953ca3ac564a876c08e1878e3b692b63accdba9aefddd67d15bfd4b856ff6c3f1286bb664a5c239ca762e0afd0148051c8c46b69b686493 WHIRLPOOL 9503694700515eb63e400cd8bc65ee753af9d11e997f2940487aea322991ba913a183715cec3da9b37729eeca92d86ca799152ec0aff8ecf266757a1b12803bf
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQPGFiAAoJEO+t9ga+3I3aV9cH/ixYT4OGd1HJtCoopwzUwazd
-ljUquNpTEvpmkc5QIZtZCCUb8QqteJkYv8t6xqncyb9MAbFDjhl9ismzi+2Y3QnN
-06mo4xE0waqEqPXrpHyvMQpHnxnq7G4n5+3NFFjniyudZhMnbEtVYsffTMIQLGA/
-gozvGKDPAyr5G7Ngetj1I2ifj8zz4r7C9iR4QcgGy0ge0MU7NVwT38rr46ywp+GR
-fGsFesuWkr1I7kMSE+KkTIJ+HMfEmopP47y/X0b8URKG5DXXlZYXLnapwDBb2xtB
-eHTo4LKlg6wqMtZbakuNZMpZ9xPApoFXiDn6tBav2b9sZXhPcqEcpJ3KF6VcjkQ=
-=kFfC
+iEYEAREIAAYFAlCu/HUACgkQ23laikJhg1S97ACeMqnBg22Zf9U9lJJbPhC7WEJG
+FLwAoIoN7tsOKzlvLUnF+wGDSRHpxQ93
+=75GY
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild b/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild
index 1f6805e9cb9c..7aca72c00414 100644
--- a/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild
+++ b/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild,v 1.1 2012/08/28 06:12:40 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild,v 1.2 2012/11/23 04:32:50 creffett Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ IUSE="debug"
 RDEPEND="
 	$(add_kdebase_dep kdepimlibs semantic-desktop)
 	dev-libs/qjson
-	kde-misc/akonadi-social-utils
+	|| ( kde-misc/akonadi-social-utils $(add_kdebase_dep kdepimlibs '' 4.9.80) )
 "
 DEPEND="
 	${RDEPEND}