From f3f838a6d3e7e4129e46babe595ecb0c1ae9e5aa Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 5 Nov 2024 16:12:27 +0000
Subject: [PATCH] python3-pyyaml: rearrange recipe

Sort the recipe into a more traditional order, and remove a duplicated
DEPENDS on libyaml.

(From OE-Core rev: 11739d4419b790c798ba9f2d2ef0086a8c39271d)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../python/python3-pyyaml_6.0.2.bb            | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
index a41d073af9..10e61274b0 100644
--- a/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
+++ b/meta/recipes-devtools/python/python3-pyyaml_6.0.2.bb
@@ -1,38 +1,39 @@
 SUMMARY = "Python support for YAML"
-DEPENDS += "libyaml python3-cython-native"
 HOMEPAGE = "https://pyyaml.org/"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6d8242660a8371add5fe547adf083079"
 
-inherit pypi python_setuptools_build_meta
+DEPENDS += "python3-cython-native"
 
 SRC_URI[sha256sum] = "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e"
-UPSTREAM_CHECK_PYPI_PACKAGE = "PyYAML"
 
-PACKAGECONFIG ?= "libyaml"
-PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml"
-
-RDEPENDS:${PN} += "\
-    python3-datetime \
-    python3-netclient \
-"
-
-inherit ptest
 SRC_URI += "\
     https://raw.githubusercontent.com/yaml/pyyaml/a98fd6088e81d7aca571220c966bbfe2ac43c335/tests/test_dump_load.py;name=test \
     file://run-ptest \
 "
 SRC_URI[test.sha256sum] = "b6a8a2825d89fdc8aee226560f66b8196e872012a0ea7118cbef1a832359434a"
 
-RDEPENDS:${PN}-ptest += " \
-	python3-pytest \
-	python3-unittest-automake-output \
-"
+UPSTREAM_CHECK_PYPI_PACKAGE = "PyYAML"
+
+inherit pypi python_setuptools_build_meta ptest
+
+PACKAGECONFIG ?= "libyaml"
+PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml"
 
 do_install_ptest() {
 	install -d ${D}${PTEST_PATH}/tests
 	cp -rf ${UNPACKDIR}/test_dump_load.py ${D}${PTEST_PATH}/tests/
 }
 
+RDEPENDS:${PN} += "\
+    python3-datetime \
+    python3-netclient \
+"
+
+RDEPENDS:${PN}-ptest += " \
+	python3-pytest \
+	python3-unittest-automake-output \
+"
+
 BBCLASSEXTEND = "native nativesdk"