From 0ccd7429aabfe5c1c9246477acf1af84a147715c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Tue, 23 Jul 2024 17:03:46 +0100
Subject: [PATCH] libcap-ng: clean up recipe

This package is split into two recipes, one of the actual C library and
one for the Python bindings.

- Move common inherits into the common .inc.
- Clean up install in the python recipe
- Remove obsolete setuptools dependency
- Remove obsolete explicit .debug packaging
- Update homepage as freecode.com redirects to the top of SourceForge

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../libcap-ng/libcap-ng-python_0.8.5.bb        | 18 ++++--------------
 meta/recipes-support/libcap-ng/libcap-ng.inc   |  4 +++-
 .../libcap-ng/libcap-ng_0.8.5.bb               |  2 --
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
index 4790134ae9f..f8a6b2c3177 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng-python_0.8.5.bb
@@ -4,26 +4,16 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/libcap-ng:"
 
 SUMMARY .= " - python"
 
-inherit lib_package autotools python3targetconfig
+inherit python3targetconfig
 
-# drop setuptools when version > 0.8.3 is released; it's needed only for distutils
-DEPENDS += "libcap-ng python3 swig-native python3-setuptools-native"
+DEPENDS += "libcap-ng python3 swig-native"
 
 S = "${WORKDIR}/libcap-ng-${PV}"
 
 EXTRA_OECONF += "--with-python3"
 
-do_install:append() {
-    rm -rf ${D}${bindir}
-    rm -rf ${D}${libdir}/.debug
-    rm -f ${D}${libdir}/lib*
-    rm -rf ${D}${libdir}/pkgconfig
-    rm -rf ${D}${datadir}
-    rm -rf ${D}${includedir}
+do_install() {
+    oe_runmake 'DESTDIR=${D}' install -C ${B}/bindings/python3
 }
 
-# PACKAGES = "${PN}"
-
 FILES:${PN} = "${libdir}/python${PYTHON_BASEVERSION}"
-FILES:${PN}-dbg =+ "${PYTHON_SITEPACKAGES_DIR}/.debug/_capng.so"
-
diff --git a/meta/recipes-support/libcap-ng/libcap-ng.inc b/meta/recipes-support/libcap-ng/libcap-ng.inc
index 12b4002d117..85b51c4dc67 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng.inc
+++ b/meta/recipes-support/libcap-ng/libcap-ng.inc
@@ -1,7 +1,7 @@
 SUMMARY = "An alternate posix capabilities library"
 DESCRIPTION = "The libcap-ng library is intended to make programming \
 with POSIX capabilities much easier than the traditional libcap library."
-HOMEPAGE = "http://freecode.com/projects/libcap-ng"
+HOMEPAGE = "https://github.com/stevegrubb/libcap-ng"
 SECTION = "base"
 LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
@@ -13,6 +13,8 @@ SRC_URI = "https://people.redhat.com/sgrubb/libcap-ng/libcap-ng-${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "3ba5294d1cbdfa98afaacfbc00b6af9ed2b83e8a21817185dfd844cc8c7ac6ff"
 
+inherit lib_package autotools
+
 EXTRA_OECONF:append:class-target = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
 EXTRA_OECONF:append:class-nativesdk = " --with-capability_header=${STAGING_INCDIR}/linux/capability.h"
 
diff --git a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
index 3dbe3e2ffd9..b482368a41b 100644
--- a/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
+++ b/meta/recipes-support/libcap-ng/libcap-ng_0.8.5.bb
@@ -1,7 +1,5 @@
 require libcap-ng.inc
 
-inherit lib_package autotools
-
 EXTRA_OECONF += "--without-python3"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.47.3