gentoo resync : 29.12.2022

3 files changed, 38 insertions, 21 deletions

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 6e8d4533c085..776cd4388911 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,5 +1,5 @@
-DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
-EBUILD libapparmor-3.0.1.ebuild 2069 BLAKE2B 2298671fe021e1abee75376d0439c5a94ffef875495cf621facb87830d1fb69839f1fcd4d13810ce1ee7d6918e31765ec1399bf921529af475f5c4bbdd8f77d6 SHA512 d1d37cac0f6cd23cfe0abc8851b18e3f5b2e123e8a93a43684d6bae1999921f76fd023f4d5a026abfb3d78fcdee0186c65e897294e2095534f88b71e07f5c582
-EBUILD libapparmor-3.0.3.ebuild 2070 BLAKE2B 97f3707333cd6d18e797d370f13aac29618faba7697b02c7185e030447f9782176ff71e6983a5a29649990e663f7465189075cb12807e809b685ef52941a221f SHA512 9cea8403cda7dfe3564054d1bb41e4285a8eac124cc69c5714b96b1f73765afe903feb255aa95cd9f53050b1e2e5e6c3a2652806bbd24dbcfed8b41b947179f5
+DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
+EBUILD libapparmor-3.0.3-r1.ebuild 2129 BLAKE2B 3cc2641747dbf0f96fa6430a0d7ea3e341792a25c8b75adcb04a81e022f9746a33cdbbb7035568ced8356c9a3c07f7347328714bb03d63cfb752865b25415265 SHA512 66e961cf404dbd7562956051e70ff39863975b006fe3359a9b4a70e7ce66309d59a5ab49538c43e7c84c425743150ce4faed203999bd02800e136492dae05f18
+EBUILD libapparmor-3.0.4.ebuild 2344 BLAKE2B f9298dafbb6165ec55df508c94d640bd1f1734836076262ec58aa890fe471671733e03bec979292fa1916769c0aba27b36dd30ea68c4cae047701c30a0a1a929 SHA512 677e4731bb07a64ba50a00aca4e1eada454bb9d85f3e130b0bb177d6800f996e63c99989c9fafed67d28599c642d0cab5073b50bd9bd690e70ca8e51c73f7d93
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
index f88e11c0fe65..f039ed3fe314 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 GENTOO_DEPEND_ON_PERL="no"
 
 inherit autotools distutils-r1 perl-functions
@@ -36,12 +36,14 @@ BDEPEND="
 S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
 
 # depends on the package already being installed
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
 	rm -r m4 || die "failed to remove bundled macros"
+
 	default
 	eautoreconf
+
 	use python && distutils-r1_src_prepare
 }
 
@@ -59,10 +61,10 @@ src_compile() {
 	use perl && emake -C swig/perl
 
 	if use python ; then
-		pushd swig/python > /dev/null
+		pushd swig/python > /dev/null || die
 		emake libapparmor_wrap.c
 		distutils-r1_src_compile
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
@@ -83,15 +85,19 @@ src_install() {
 	fi
 
 	if use python ; then
-		pushd swig/python > /dev/null
+		pushd swig/python > /dev/null || die
 		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	dodoc AUTHORS ChangeLog NEWS README
 
 	find "${D}" -name '*.la' -delete || die
 }
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto LibAppArmor
+	python_domodule LibAppArmor.py
+}
diff --git a/sys-libs/libapparmor/libapparmor-3.0.3.ebuild b/sys-libs/libapparmor/libapparmor-3.0.4.ebuild
index c7bd9822dee5..c3350162a3e4 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.3.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 GENTOO_DEPEND_ON_PERL="no"
 
 inherit autotools distutils-r1 perl-functions
@@ -39,9 +39,15 @@ S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
 RESTRICT="test"
 
 src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
 	default
+
+	# We used to rm m4/ but led to this after eautoreconf:
+	# checking whether the libapparmor man pages should be generated... yes
+	# ./configure: 5065: PROG_PODCHECKER: not found
+	# ./configure: 5068: PROG_POD2MAN: not found
+	# checking whether python bindings are enabled... yes
 	eautoreconf
+
 	use python && distutils-r1_src_prepare
 }
 
@@ -83,15 +89,20 @@ src_install() {
 	fi
 
 	if use python ; then
-		pushd swig/python > /dev/null
+		pushd swig/python > /dev/null || die
 		distutils-r1_src_install
 
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	dodoc AUTHORS ChangeLog NEWS README
 
 	find "${D}" -name '*.la' -delete || die
 }
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto LibAppArmor
+	python_domodule LibAppArmor.py
+}