gentoo resync : 18.08.2019

3 files changed, 2 insertions, 85 deletions

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index d88a51669b55..dd22f53c42f2 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,6 +1,5 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
-DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
+DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
 EBUILD apparmor-utils-2.13.1.ebuild 2005 BLAKE2B 8720ce38ccd2a2cc79e5d44b6c7702ae458e0cac065d4b051a999f15310a8b2348c8a00cf841deaa3005740fb824aaff56e2c7251a7f2839bcaecc8f91858df1 SHA512 41dddd15eb3a096e383c4e581db78c416baa1a8b3fbd3b50eabcd6a1d1e1304676e0c6fffdd6a0187f9fad38c50d06240149a5808c0ecd7d310bcb7c417acc35
-EBUILD apparmor-utils-2.13.2-r1.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3
-EBUILD apparmor-utils-2.13.2.ebuild 2065 BLAKE2B 825ae1b508723e7bb43ae74a537676383375240534d05940fff86781a5db01892ae12a4055821b0bde19eb6848edf508543e8baa9bdf0b5f394dd147ab3d020f SHA512 ca3b9532991e691d29ad557d3d966642c070a841655f0bd09b0edb191cd000c7ebc755e225b81e6f0705fae0e55611a32ae8c0f8517e15eb147471ca3ce07872
+EBUILD apparmor-utils-2.13.3.ebuild 2181 BLAKE2B 4a71db4b196914bc0341ce1b12ac517aeba5231735622e18f4f6b9f2d3e33ee41ec6f81cf65c6f25ddafc5489ee05cb26ac579451124009126203a23dd14a3a6 SHA512 63c68749843ec4fd3ec2a749aef2fd422ede91026b9a5922dd96be0b7899ad76611dee0f45c8134561ec12041f69311cde9e8d0ed3f64f417b419dde85a11aa3
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
deleted file mode 100644
index 7cde6f4759f8..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-inherit eapi7-ver 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"
-IUSE=""
-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]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	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
-}
-
-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() {
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --version="${PV}"
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,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-2.13.2-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild
index 4ce56c968e57..4ce56c968e57 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.3.ebuild