From 6ce347c9b6f218b9a579284b84a3b2abf222a94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 2 Feb 2020 21:11:21 +0100
Subject: [PATCH] translate-toolkit: upgrade 2.3.1 -> 2.5.0 and move to
 setuptools3/python3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../translate-toolkit_git.bb                  | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/recipes-support/translate-toolkit/translate-toolkit_git.bb b/recipes-support/translate-toolkit/translate-toolkit_git.bb
index 6e8a3c82..2cc4987c 100644
--- a/recipes-support/translate-toolkit/translate-toolkit_git.bb
+++ b/recipes-support/translate-toolkit/translate-toolkit_git.bb
@@ -3,32 +3,27 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=98efdc0d236de427ac1ff87d5108bd36"
 HOMEPAGE = "http://toolkit.translatehouse.org/"
 
-inherit setuptools
+inherit setuptools3
 
 SRC_URI = "git://github.com/translate/translate.git"
-SRCREV = "44fadd143869f3b03bb93a401891fe539543b2b2"
+SRCREV = "2ac3101666208d2186c096f9865e00cf1b257fc0"
 S = "${WORKDIR}/git"
-PV = "2.3.1"
+PV = "2.5.0"
 
 do_install_append() {
-    # move files to correct location
-    # 1. /usr/share/lib(64) -> ${libdir}
-    if [ -d ${D}${datadir}/${baselib} ] ; then
-        mkdir -p ${D}/${libdir}
-        cp -r ${D}${datadir}/${baselib}/* ${D}/${libdir}
-        rm -rf ${D}${datadir}/${baselib}
-    fi
-    
     # if empty datadir -> delete
     rmdir ${D}${datadir} || true
 
-    # 2. ${D}${STAGING_DIR}/${HOST_SYS} -> ${D}
+    # ${D}${STAGING_DIR_HOST} -> ${D}
     # this is a bad hack aligning installed locations - but have not found a better way
-    if [ -d ${D}${STAGING_DIR}/${HOST_SYS} ] ; then
-        cp -r ${D}${STAGING_DIR}/${HOST_SYS}/* ${D}
-        staging_base=`echo ${STAGING_DIR} | cut -d "/" -f2`
-        rm -rf ${D}/$staging_base
+    if [ -d ${D}${STAGING_DIR_HOST} ] ; then
+        echo
+        echo "Copy files from ${D}${STAGING_DIR_HOST} -> ${D}"
+        cp -r ${D}${STAGING_DIR_HOST}/* ${D}
+        staging_base=`echo ${STAGING_DIR_HOST} | cut -d "/" -f2`
+        echo "Delete leftover $staging_base"
+        rm -r ${D}/$staging_base
     fi
 }
 
-RDEPENDS_${PN} += "bash"
+RDEPENDS_${PN} += "bash python3-core"