gentoo resync : 05.04.2019

3 files changed, 92 insertions, 3 deletions

diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 5e888fd7327f..a20eec23052e 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,6 @@
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
 EBUILD apparmor-utils-2.13.1.ebuild 2007 BLAKE2B 3656ea0681e8664dc5829db0b221ca9479890663e8aabf45eecef60d0668023e5587505b5a7ed0383a16939d2bb8793014b6e85704118ac4de7702c23ea94a5e SHA512 af53cfeb38a9288b81254b49449c57ac132888fb9037d1496f8fd87155bce9390b980212818b4a0ee3d19323307f007126da97a3bba6466e4e27629ccfe6adca
-EBUILD apparmor-utils-2.13.2.ebuild 2007 BLAKE2B 3c84e2da39925225d1644a6c97a5eeb3330d7987235ff3c859184c59d929fa06ce5723bd1af9d7e0804fc0628889fe26c7d879bff6969a4295e3e9c0e7ffcf22 SHA512 29b835676313cf53405a1ba854d091af7c3464b209f962420d7a033f9e67feb2c2f66bbb011b85b98c947a416556fbbceee6c4effa230e393c3331f3d7e6f6fd
+EBUILD apparmor-utils-2.13.2-r1.ebuild 2183 BLAKE2B 0a54046c5abef22f20dd728b440d193a91c336d56cfcf7139025e6cf75e320bdd87edcb300cefcf0fd68fa594d8abcbac40a86397c2a7b4d3613e809b4277c2a SHA512 31cfd15ed8b1fb2ca8a27288451a918869a19f4e3ce598f972b5bb514db79216927d7c5fe1466caa10abf10080299cb0068e1f092684e8eaa4f315ca3ef16b30
+EBUILD apparmor-utils-2.13.2.ebuild 2067 BLAKE2B 9a99ac56d7e18d1f2ebd204a5d4b621228e047f0a69606aaed8c91cb39bfdcbd6bab63252e009c36c1e3a51158d3a546cebb3fbfc6cd725b2eeff4aff928bd55 SHA512 cdc94e238bc888af7c2da2f9a0357137ffb892dec2d0f33af18bb86e897bf84f0a7f3176b3f48bd668be00eb54761e605a9b1740fd7710ad2701701961bab94a
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
new file mode 100644
index 000000000000..96e9c45f4802
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,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
+
+	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() {
+		"${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.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
index b55e5853dc54..48e17afd736f 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.2.ebuild
@@ -20,11 +20,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-DEPEND="
+COMMON_DEPEND="
 	dev-lang/perl
 	~sys-libs/libapparmor-${PV}
 	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
 	~sys-libs/libapparmor-${PV}[perl,python]
 	~sys-apps/apparmor-${PV}
 	dev-perl/Locale-gettext