4 files changed, 18 insertions, 24 deletions

diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-efl/recipes-efl/efl/entrance/entrance.service
index 482868695..482868695 100644
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance/entrance.service
+++ b/meta-efl/recipes-efl/efl/entrance/entrance.service
diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index 585d552c2..02eb64ba9 100644
--- a/meta-efl/recipes-efl/efl/entrance_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -4,18 +4,35 @@ LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 SECTION = "e/apps"
 
-inherit e gettext
+inherit e gettext systemd
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
+  file://entrance.service \
 "
 S = "${WORKDIR}/${SRCNAME}"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc ${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-pam', d)}"
 
+PR = "r4"
 PV = "0.0.4+svnr${SRCPV}"
 SRCREV = "${EFL_SRCREV}"
 
 RDEPENDS_${PN} += "${PN}-themes sessreg xauth"
 CONFFILES_${PN} += "${sysconfdir}/entrance.conf"
+
 RCONFLICTS_${PN} += "xserver-nodm-init"
 RREPLACES_${PN} += "xserver-nodm-init"
+
+RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
+RREPLACES_${PN} += "xserver-nodm-init-systemd"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+
+SYSTEMD_SERVICE_${PN} = "entrance.service"
+
+do_install_append() {
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
+}
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf
index d06cfa138..c064333bf 100644
--- a/meta-systemd/conf/layer.conf
+++ b/meta-systemd/conf/layer.conf
@@ -20,8 +20,6 @@ BBFILES += "\
                    '', '${LAYERDIR}/invalid.bb', d)} \
   ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
                    '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
-  ${@base_contains('BBFILE_COLLECTIONS', 'efl-layer',\
-                   '${LAYERDIR}/meta-efl/recipes-*/*/*.bbappend', '', d)} \
   ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
                    '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
   ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
deleted file mode 100644
index 63c33fb57..000000000
--- a/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
+++ /dev/null
@@ -1,21 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PRINC := "${@int(PRINC) + 3}"
-
-inherit systemd
-
-SRC_URI += "file://entrance.service"
-
-RPROVIDES_${PN} += "${PN}-systemd"
-RREPLACES_${PN} += "${PN}-systemd"
-RCONFLICTS_${PN} += "${PN}-systemd"
-
-SYSTEMD_SERVICE_${PN} = "entrance.service"
-
-do_install_append() {
-        install -d ${D}${systemd_unitdir}/system
-        install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system
-}
-
-RCONFLICTS_${PN} += "xserver-nodm-init-systemd"
-RREPLACES_${PN} += "xserver-nodm-init-systemd"