gentoo resync : 19.03.2019

3 files changed, 34 insertions, 32 deletions

diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 7505feed0490..780936c89557 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,6 +1,6 @@
 AUX libapparmor-2.10-symbol_visibility.patch 219 BLAKE2B 37bb9ceabfedde6f21e313fcc6a85563fdeca86863e681fa40689b5ce8cb5bdf87947c19b176d7f96edac562b6420a0ae6aae717967782e1bd1bb6ffd4782671 SHA512 93c5e19a6cdfce232a71f9b33b1e96dff44b947c06fc6e348a31038ef78bec7b90e49698681a4010bffd4274ff17a304542b549a8840458b3ab17d4ef1b53d36
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
-EBUILD libapparmor-2.12.0.ebuild 2166 BLAKE2B e5396ddf8010202fd4cb71764625ab814e19cec3c62942e20b32c2762b32308aa0cb6ddace1e7ab5cef36a64df8ed090d044c9aadef618b4a034f513a6be030f SHA512 a9b5186d731847b296c8cb61bd2d2b38a538e31351578591b21d6bb8d7983314ccc283588516e62138e892e578317510f471265e5411a0fc36e826dbbaf2640a
-EBUILD libapparmor-2.13.1.ebuild 2111 BLAKE2B 09a6b3dc488e07a75d84cb2c78dac623460c0003b48146ff8e363433e16306082eaf3b512559b74b716a6b5554f1e6d1ee990e1d6d6fb5fc3c67d897e9108b80 SHA512 97c6a19df8d59e3c1af83e4705d355c72239ed0e0de6fba13fd4c51e27125a4d604e77986f3e5033b2e43eac4d0748baa0b11ad41564676ac9b45a698f83794f
+DIST apparmor-2.13.2.tar.gz 7369240 BLAKE2B 1e2a559375c02c7ab8e79cc2e9275a9f271490ef003a8da3e544bfdd80b47ddef7a7da0bf73b41e6fe9bff219a6e4fda7d04e6df71bb127530828160704cb7fe SHA512 2e5f84ced12c9de1a862e1a3258e8424f1f0d3c986947aec9d88a9258729a584953d00591c8902aa41e664acf9a639dab96d025c3a1ed3f91f0edce8d028b58f
+EBUILD libapparmor-2.13.1.ebuild 2110 BLAKE2B 681c3db4ce5392941600301e2ec506e4314295e28dc177c08dc94e7baa39e503dbd08f897ddc24327b766b31d12170bf7e0ea6f28abe5a2f071edb182d86419a SHA512 36b5442b2c352e993c3c87f6f6398ebb7c8212680058b92dbe09f32053c38e5b6607cf6ce1982a766f7cea797bc9c31af32c0f4ff0fa189a5f1732fcfee2535a
+EBUILD libapparmor-2.13.2.ebuild 2072 BLAKE2B 253db03a4eb4c1f65c678d58b9dea13759f013d4ce71756c0a14bc292a2c7d0a71f4512b40a40fc707a7b96a3d44d63ad5f6bc52bf75db22baa6b4626ed40a38 SHA512 483719e140443d2b0b58bcbaea4cc15e94024b272eddb03f34c48d7919a8805a3a5219c49abf3da4dac4cb47088ed5a35e70de3f6050f614f972f1d995d9816c
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.13.1.ebuild b/sys-libs/libapparmor/libapparmor-2.13.1.ebuild
index 87e4a0672149..76587f57c1d1 100644
--- a/sys-libs/libapparmor/libapparmor-2.13.1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild b/sys-libs/libapparmor/libapparmor-2.13.2.ebuild
index 0743c002fa40..bf0107144e10 100644
--- a/sys-libs/libapparmor/libapparmor-2.12.0.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.2.ebuild
@@ -1,31 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 GENTOO_DEPEND_ON_PERL="no"
 
-inherit autotools-utils distutils-r1 perl-functions versionator
+inherit autotools distutils-r1 eapi7-ver perl-functions
 
-MY_PV="$(get_version_component_range 1-2)"
+MY_PV="$(ver_cut 1-2)"
 
 DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${MY_PV}.tar.gz"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )"
-
 DEPEND="${RDEPEND}
 	sys-devel/autoconf-archive
 	sys-devel/bison
@@ -34,34 +32,34 @@ DEPEND="${RDEPEND}
 	perl? ( dev-lang/swig )
 	python? ( dev-lang/swig	)"
 
-S=${WORKDIR}/apparmor-${MY_PV}/libraries/${PN}
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+PATCHES=( "${FILESDIR}/${PN}-2.10-symbol_visibility.patch" )
 
 RESTRICT="test"
 
 src_prepare() {
 	rm -r m4 || die "failed to remove bundled macros"
-	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
-	autotools-utils_src_prepare
+	default
+	eautoreconf
 	use python && distutils-r1_src_prepare
 }
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		$(use_enable static-libs static) \
 		$(use_with perl) \
 		$(use_with python)
-	)
-
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile -C src
-	autotools-utils_src_compile -C include
-	use doc && autotools-utils_src_compile -C doc
-	use perl && autotools-utils_src_compile -C swig/perl
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
 
 	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		pushd swig/python > /dev/null
 		emake libapparmor_wrap.c
 		distutils-r1_src_compile
 		popd > /dev/null
@@ -69,15 +67,15 @@ src_compile() {
 }
 
 src_install() {
-	autotools-utils_src_install -C src
-	autotools-utils_src_install -C include
-	use doc && autotools-utils_src_install -C doc
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
 
 	if use perl ; then
-		autotools-utils_src_install -C swig/perl
+		emake DESTDIR="${D}" -C swig/perl install
 		perl_set_version
 		insinto "${VENDOR_ARCH}"
-		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
+		doins swig/perl/LibAppArmor.pm
 
 		# bug 620886
 		perl_delete_localpod
@@ -85,11 +83,15 @@ src_install() {
 	fi
 
 	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
+		pushd swig/python > /dev/null
 		distutils-r1_src_install
 
 		python_moduleinto LibAppArmor
 		python_foreach_impl python_domodule LibAppArmor.py
 		popd > /dev/null
 	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	find "${D}" -name '*.la' -delete || die
 }