[gentoo-commits] repo/gentoo:master commit in: sec-policy/apparmor-profiles/

["Sam James" <sam@gentoo.org>]

commit:     4c323d9678e0995f16a9112a60d6ac51e005b178
Author:     msathieu <msathieu <AT> outlook <DOT> com>
AuthorDate: Wed Nov  3 07:05:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 12 02:08:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c323d96

sec-policy/apparmor-profiles: update to 3.0.3

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mathieu Strypsteen <msathieu <AT> outlook.com>
Closes: https://github.com/gentoo/gentoo/pull/22788
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sec-policy/apparmor-profiles/Manifest              |  1 +
 ...-9999.ebuild => apparmor-profiles-3.0.3.ebuild} | 23 +++++++---------------
 .../apparmor-profiles-9999.ebuild                  |  4 ++--
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 38571173391..76c9ff7d636 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1 +1,2 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
+DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5

diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.3.ebuild
similarity index 54%
copy from sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
copy to sec-policy/apparmor-profiles/apparmor-profiles-3.0.3.ebuild
index 730d6bdf71f..b64a0b8aa1b 100644
--- a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.3.ebuild
@@ -1,31 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3
+MY_PV="$(ver_cut 1-2)"
 
 DESCRIPTION="A collection of profiles for the AppArmor application security system"
 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=""
-IUSE="minimal vanilla"
+KEYWORDS="~amd64"
+IUSE="minimal"
 
 RESTRICT="test"
 
-S=${WORKDIR}/${P}/profiles
-
-pkg_setup() {
-	if use vanilla; then
-		EGIT_REPO_URI="https://gitlab.com/apparmor/apparmor.git"
-		EGIT_BRANCH="master"
-	else
-		EGIT_REPO_URI="https://github.com/kensington/apparmor.git"
-		EGIT_BRANCH="gentoo"
-	fi
-}
+S=${WORKDIR}/apparmor-${PV}/profiles
 
 src_install() {
 	if use minimal ; then

diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
index 730d6bdf71f..8145d3cbdd0 100644
--- a/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3