gentoo auto-resync : 27:06:2023 - 01:33:47

5 files changed, 10 insertions, 204 deletions

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 107aaffd31ba..ddc10d671f55 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,11 +1,7 @@
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
-DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
-DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
-EBUILD apparmor-utils-3.0.10.ebuild 2280 BLAKE2B f96f75d673edba6ac46b2de6a17e3a609805a6ca1598d774dff4b9e7c3ca3051d856dcb487350210d0c3dba58ea2ffe8b36cc4b1545e82c9976bc8115f741f31 SHA512 f2f75f5196392ec540856aed20ceedaf2b9bf222fb664238360802bd9f09fda9a45e4531ba570f9bd6d44c173b3d37333ca1357be0bdc8ceb330c3e25bcdfbe1
-EBUILD apparmor-utils-3.0.3.ebuild 2270 BLAKE2B 6cbc487e75d50e8915696d5436cb3193a0f5a602bb8e83a86b78a1fd55afb2aabaa5edc15a3c3b8ec9c5ff0739d7a487eda6928c57505ebda42d3d11fb9fc5fd SHA512 5b72d153dda80c45f8e8ea542454da818016fb3c867d0c1f9f1488d7926564fbbe5a6005658fe0a9300bcc0222b585552e9d7649e12aaf56007adf0a37f1c00b
-EBUILD apparmor-utils-3.0.4.ebuild 2277 BLAKE2B a8e87dbc8ca4ec8091d6a01e88c88bd01e8261c6783449526257b58d0559608db9d2674712e20cc5dda20cf956259e515a890a7dcde72ac9a40282c9d2b5c30e SHA512 8a93dbbf151e24554a40c7bd6dfa9041c5ebaf5e924f77b30c9f7d7f8a4a78300827a2942b0a548c98bd0662d5ec4251fe4dd82ed443eaa392c55a83677763c0
+EBUILD apparmor-utils-3.0.10-r1.ebuild 2072 BLAKE2B 67c6e628bcd39fe3fa62b49faa94d301c9c9db6e59762500dbca9d810dd240773d1a7a91fb1302539ed7688a90f2b4fce7e1fe2469499c08ab30cdcaa0085498 SHA512 7fba774f41e340752002d65322cb67da6cf6a69a2b06d0548646c49fa9df54b18daadd9dc5503e6ba48f1dcb85ab8633b7f09bba217dd5b44d182afc4aa67474
 EBUILD apparmor-utils-3.0.8.ebuild 2277 BLAKE2B a8e87dbc8ca4ec8091d6a01e88c88bd01e8261c6783449526257b58d0559608db9d2674712e20cc5dda20cf956259e515a890a7dcde72ac9a40282c9d2b5c30e SHA512 8a93dbbf151e24554a40c7bd6dfa9041c5ebaf5e924f77b30c9f7d7f8a4a78300827a2942b0a548c98bd0662d5ec4251fe4dd82ed443eaa392c55a83677763c0
-EBUILD apparmor-utils-3.1.4.ebuild 2280 BLAKE2B f96f75d673edba6ac46b2de6a17e3a609805a6ca1598d774dff4b9e7c3ca3051d856dcb487350210d0c3dba58ea2ffe8b36cc4b1545e82c9976bc8115f741f31 SHA512 f2f75f5196392ec540856aed20ceedaf2b9bf222fb664238360802bd9f09fda9a45e4531ba570f9bd6d44c173b3d37333ca1357be0bdc8ceb330c3e25bcdfbe1
+EBUILD apparmor-utils-3.1.4-r1.ebuild 2072 BLAKE2B 67c6e628bcd39fe3fa62b49faa94d301c9c9db6e59762500dbca9d810dd240773d1a7a91fb1302539ed7688a90f2b4fce7e1fe2469499c08ab30cdcaa0085498 SHA512 7fba774f41e340752002d65322cb67da6cf6a69a2b06d0548646c49fa9df54b18daadd9dc5503e6ba48f1dcb85ab8633b7f09bba217dd5b44d182afc4aa67474
 MISC metadata.xml 499 BLAKE2B ae7166545eb4d691cb446ee37d1e0e251c02f7f19f57bf9d4f31f55e78c707226767e0721e167a32acfb164e65d2203efcd3e54571693066cc03a98d5125425d SHA512 54421c54122fcfa7b849a8e08359d546dc1084a694b1123793d7c6cb6fa21e3e44e93d71a719da4ae0c3ad1ce85a0d53a28e0531654d79cf856db11f03621b8b
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
index 24b253ee6dba..702656d7f4f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.10.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit perl-module python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -20,22 +20,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	dev-lang/perl
 	~sys-libs/libapparmor-${PV}
 	${PYTHON_DEPS}"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}]
 	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
 	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
+	dev-python/psutil[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/apparmor-${PV}
 
@@ -66,9 +60,7 @@ src_compile() {
 
 src_install() {
 	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+	emake DESTDIR="${D}" VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
 
 	install_python() {
 		local -x PYTHONDONTWRITEBYTECODE=
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
deleted file mode 100644
index 9f9ce15e6b31..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-
-	sed -i utils/aa-remove-unknown \
-		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		local -x PYTHONDONTWRITEBYTECODE=
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --optimize 2 --version=${PV}
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
deleted file mode 100644
index 7b0f7036c5aa..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-
-	sed -i utils/aa-remove-unknown \
-		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		local -x PYTHONDONTWRITEBYTECODE=
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --optimize 2 --version=${PV}
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
index 24b253ee6dba..702656d7f4f3 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.1.4.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.1.4-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
-inherit perl-module python-r1 toolchain-funcs
+inherit python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -20,22 +20,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"
 
 COMMON_DEPEND="
-	dev-lang/perl
 	~sys-libs/libapparmor-${PV}
 	${PYTHON_DEPS}"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 "
 RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-libs/libapparmor-${PV}[python,${PYTHON_USEDEP}]
 	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
 	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
+	dev-python/psutil[${PYTHON_USEDEP}]"
 
 S=${WORKDIR}/apparmor-${PV}
 
@@ -66,9 +60,7 @@ src_compile() {
 
 src_install() {
 	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+	emake DESTDIR="${D}" VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
 
 	install_python() {
 		local -x PYTHONDONTWRITEBYTECODE=