Remove old. Fix dependency in 201208 snapshot, should only depend on akonadi-social-utils. Move 20121207 snapshot from overlay, which works with akonadi-social-utils being rolled into kdepimlibs.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 42618354)

3 files changed, 24 insertions, 15 deletions

diff --git a/kde-misc/akonadi-facebook/ChangeLog b/kde-misc/akonadi-facebook/ChangeLog
index ba0d0b1de9fb..996e499e6f7b 100644
--- a/kde-misc/akonadi-facebook/ChangeLog
+++ b/kde-misc/akonadi-facebook/ChangeLog
@@ -1,6 +1,15 @@
 # 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.3 2012/11/23 04:32:50 creffett Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/ChangeLog,v 1.4 2013/02/08 03:24:05 creffett Exp $
+
+*akonadi-facebook-0_p20121207 (08 Feb 2013)
+
+  08 Feb 2013; Chris Reffett <creffett@gentoo.org>
+  +akonadi-facebook-0_p20121207.ebuild, -akonadi-facebook-0_p20120222.ebuild,
+  akonadi-facebook-0_p20120827.ebuild:
+  Remove old. Fix dependency in 201208 snapshot, should only depend on akonadi-
+  social-utils. Move 20121207 snapshot from overlay, which works with akonadi-
+  social-utils being rolled into kdepimlibs.
 
   23 Nov 2012; Chris Reffett <creffett@gentoo.org>
   akonadi-facebook-0_p20120827.ebuild:
diff --git a/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild b/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild
index 7aca72c00414..67c6e15b332d 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
+# Copyright 1999-2013 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.2 2012/11/23 04:32:50 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120827.ebuild,v 1.3 2013/02/08 03:24:05 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 $(add_kdebase_dep kdepimlibs '' 4.9.80) )
+	kde-misc/akonadi-social-utils
 "
 DEPEND="
 	${RDEPEND}
diff --git a/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120222.ebuild b/kde-misc/akonadi-facebook/akonadi-facebook-0_p20121207.ebuild
index 6c7c6084d69c..344211d916a5 100644
--- a/kde-misc/akonadi-facebook/akonadi-facebook-0_p20120222.ebuild
+++ b/kde-misc/akonadi-facebook/akonadi-facebook-0_p20121207.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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_p20120222.ebuild,v 1.1 2012/02/22 16:43:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-facebook/akonadi-facebook-0_p20121207.ebuild,v 1.1 2013/02/08 03:24:05 creffett Exp $
 
-EAPI=4
+EAPI=5
 
-KDE_SCM="git"
 inherit kde4-base
 
 DESCRIPTION="Facebook services integration in Akonadi"
 HOMEPAGE="https://projects.kde.org/akonadi-facebook"
-SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs semantic-desktop 4.9.58)
+	dev-libs/qjson
+"
 DEPEND="
-	$(add_kdebase_dep kdepimlibs semantic-desktop)
+	${RDEPEND}
 	dev-libs/boost
 	dev-libs/libxslt
-	dev-libs/qjson
+	x11-misc/shared-mime-info
 "
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}