From 2e30d0aa69c380b47a0c76a56a6e5fb17b71b888 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 12 Aug 2019 10:27:49 +0300
Subject: [PATCH] abiword: Remove office-layer check now that it is in the
 layer

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 recipes-abiword/abiword/abiword_3.0.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-abiword/abiword/abiword_3.0.2.bb b/recipes-abiword/abiword/abiword_3.0.2.bb
index 90f8e3f..de3829d 100644
--- a/recipes-abiword/abiword/abiword_3.0.2.bb
+++ b/recipes-abiword/abiword/abiword_3.0.2.bb
@@ -16,7 +16,7 @@ DEPENDS  = " \
     asio \
     evolution-data-server \
     libxslt \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'redland rasqal', '', d)} \
+    redland rasqal \
 "
 RDEPENDS_${PN}_append_libc-glibc = " \
     glibc-gconv-ibm850 glibc-gconv-cp1252 \
@@ -44,7 +44,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 
 PACKAGECONFIG ??= " \
     collab-backend-xmpp collab-backend-tcp \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'office-layer', 'libical', '', d)} \
+    libical \
 "
 PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
 PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"