From dc5e42154f49260e2ad74ad193f949dd9cb402bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 22 May 2021 03:35:07 +0200
Subject: [PATCH] zsh: upgrade 5.4.2 -> 5.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* without autotools-brokensep install fails for several isssues. Started to fix
  them but stooped after third
* remove some odd/orphaned code in recipe

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../zsh/{zsh_5.4.2.bb => zsh_5.8.bb}           | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)
 rename meta-oe/recipes-shells/zsh/{zsh_5.4.2.bb => zsh_5.8.bb} (75%)

diff --git a/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
similarity index 75%
rename from meta-oe/recipes-shells/zsh/zsh_5.4.2.bb
rename to meta-oe/recipes-shells/zsh/zsh_5.8.bb
index aa372b70a3..6fc5f4d993 100644
--- a/meta-oe/recipes-shells/zsh/zsh_5.4.2.bb
+++ b/meta-oe/recipes-shells/zsh/zsh_5.8.bb
@@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec"
 
 DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz"
-SRC_URI[md5sum] = "dfe156fd69b0d8d1745ecf6d6e02e047"
-SRC_URI[sha256sum] = "957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9"
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz"
+SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27"
 
-inherit autotools gettext update-alternatives
+inherit autotools-brokensep gettext update-alternatives manpages
 
 EXTRA_OECONF = " \
     --bindir=${base_bindir} \
@@ -47,19 +46,8 @@ do_configure () {
     oe_runconf
 }
 
-do_install_append () {
-    rm -fr ${D}/usr/share
-    rmdir --ignore-fail-on-non-empty ${D}/usr
-}
-
 pkg_postinst_${PN} () {
     touch $D${sysconfdir}/shells
     grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells
     grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
 }
-
-FILES_${PN}-dbg += "\
-    ${libdir}/${PN}/${PV}/${PN}/.debug/*.so \
-    ${libdir}/${PN}/${PV}/${PN}/db/.debug/*.so \
-    ${libdir}/${PN}/${PV}/${PN}/net/.debug/*.so \
-"