6 files changed, 102 insertions, 121 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index bd7192b4c2c5..91f46831c1f4 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gwenhywfar/Manifest b/sys-libs/gwenhywfar/Manifest
index 443da94a90d7..de669d317f1c 100644
--- a/sys-libs/gwenhywfar/Manifest
+++ b/sys-libs/gwenhywfar/Manifest
@@ -1,11 +1,9 @@
 DIST gwenhywfar-4.20.0.tar.gz 2379537 BLAKE2B 7e3439959f61c28d8845ee8355b21b71446f3108f5e344ee600eda58cdccb31cfe93a45cdc9ef8b682fbb3171d20658766918924b48150fea5f2abc1eaa76af1 SHA512 bc1d47c39654940198396f1bdb9f4a87ff4e0e6b07cb4525c10f7f8e6ce93445d5b9d85586a47c93c558e86eb826f7006eca29b93fad6371dfe72830bf9b88e1
 DIST gwenhywfar-4.20.2.tar.gz 2350327 BLAKE2B 1209bc46fe16e4a76886327bdcc0c9dde7bc135851bea27caa1795f8d652b968842e5191817e255044034827fc2f7e8c392f45ce52c85eb4d9382609f7238e53 SHA512 9012b82b4aa5229576951ebc835621f18a19f817a689f149b120710fadf8cc3d60481a6724967db44fb04c5eedf3e96d7ec919933ff325c9b4b8dad9c7fe870b
 DIST gwenhywfar-4.99.25rc9.tar.gz 2333734 BLAKE2B 03c9e2fefef592cf0efc20596f0d49d8e1eb9fbea5dce6f8eb6c7d1fc04cd1f0c1adbe386cf22c78dc4de6bba337b1f7e2ad3ca58f8b5cfce8353843d685e424 SHA512 5a94673360299859fca1cea3193c8f03b7d8aa54d1faedddddf54c69892d1f7eefcbe66eb3795145c2b444720cd296bd64e18ec5def10c9409551dcb6d8f7f57
-DIST gwenhywfar-5.0.0.tar.gz 2353970 BLAKE2B 40599f1ffa055a15ee8ebd51cb604826b1b139a4c4207c38e22df8eb13f2d3715b00bd9dd2323c52e98926ed1babe632c6c9da5a7df2a0317e66451d781a96fd SHA512 50811ca363133c36ff1c2637c3eab41d6553a04f0f4393b51a76ba5f7ff31cfcc80298a14aa4a9ac55e2270a5f5a7db2530e6b66b89a39ac23d4090958d3ec0c
-DIST gwenhywfar-5.1.1.tar.gz 2352798 BLAKE2B de400f12f28382724cafc6a77f56dd56798f10966048d4b65eae684f4c9df30b748644d3b02f45b9c8848f5a556a2b2062dd7c573ee4fb73bc097dc7fe1303c3 SHA512 39adc333f6245822c7f5cb675dfbb226837e6045c822eeb8a752d56be53671fdc4168e538c2d054ef1667ec0ebd9fce9ac9769e26c5619e161699103986d3a2b
+DIST gwenhywfar-5.1.2.tar.gz 2354910 BLAKE2B e73519d33da9268f90ae2924b177c4ef684c9d991faa1f788f8c30ea669fa27d645481e6e41673b22d2796376aaab9cec72de6874b89c2fe141102cfbac2d2e4 SHA512 20374ed6c134b310f375eb286d83bf6074e397e3c6e22b0370d06fb870b9506f171a9276cad9a809331d8917e3bca1eca30a5d5776818ca7f5b06100474a7e0f
 EBUILD gwenhywfar-4.20.0.ebuild 2795 BLAKE2B a963883b4d788f173460456221ca3450982d7f777dfed73c992c9099a52bd8ae7d442812812744e9f9bfc70e7b6ff6016f63d76a927631c3529fb4377ddf41e1 SHA512 b791ebb321a00f02ccb6b7d894b7d64ccb6924d0c0f194a17ac0665ffca86fceb88efe491f40c82467cd26008dc3d1996e3ff8e775e41a4aba519d3923d3a5ef
 EBUILD gwenhywfar-4.20.2-r1.ebuild 2723 BLAKE2B c7640c0c22779ce813fe64d398dc1c1464830a03a9e8abf7ec8569ae21ded84d4e07fc1168d8001626a26b6c087110307a3acf20631616a9bf0afbdbf180ebe2 SHA512 9c9fa5af0789d0005d5e10501d44d1fdc306362893b83913c4f8fd1532053624502a86bcc9d3ae615dcafdc8957d9361d3ecc11b272d85cfae83985dcbfaa633
 EBUILD gwenhywfar-4.99.25_rc9.ebuild 2776 BLAKE2B 1c134583202bfbc2fa4acba6c18909701b8ec6dee3c859443ccc599193462263eec51f0bd17ae2886d636152612bc0d83d568d057cae01157744d9cde7d5cc33 SHA512 1d762e5b90e4b872a1b6e116f0cc62a0cab3bea6db6924cd98ab06630378c979bfd164aa3a3983c8abfb3a7a3e36ebcb58a3738ccfc3097f9eb1c038c128bdfa
-EBUILD gwenhywfar-5.0.0.ebuild 2778 BLAKE2B fb8f4db9bd1bfb9109084848421081f1d82f558346454beb5af50d22af8212126cfe0bdae4daa55f2fa3bbf8993b83b1305a05ca8788c6dd918bdb5c3cbefe75 SHA512 6dbba7ad4cf8320110989b189b63def57d518f5613ed7f77d87c2883d1f0586b2c9b446087624f68deccd60b9afe80981fd81146a779ddf5ca907f2f363cc282
-EBUILD gwenhywfar-5.1.1.ebuild 2778 BLAKE2B 9a0994586f0dc300a17ba282601150ebad184f787c5fb40bf3d0b38774766079845fd098b672325e3b93a65c6ce4ddd4d525fb8252ee11f5cc3f3ed978bf43d0 SHA512 a68e69d629d0b8cbe1fc93a767d61fcd953ca865b83e504afcaedcfc995b2a64136c524b886edf97fdc7c4a5b9ba6dd1f03275af54b62c500dd4c2c71414dc7c
+EBUILD gwenhywfar-5.1.2.ebuild 2778 BLAKE2B e8eacfe9a328d341556681ef1d8be6935cb3217b89305a144ec50319090a2edbb1bfd49498091de2b9131b6000b83b2f26ad1dde58f17fa9807b360a116a901f SHA512 c55235201feae315d947fb83347013263654125407bbc18822d8dfd984d0dfc59da01cf26572ba13cea09e8845fae55179433434d79ac89e6ea8ba0baf8481c0
 MISC metadata.xml 691 BLAKE2B 9130a34b5011ee2a5b446794a036961e6e83e3083ba580a4d77da2686d9cc75620f0b38cc21d5c4014361d698cf4ff24084ae93b46cdecaaf1e7c522d4f5d3d4 SHA512 3eb26d730501a60512fca15ea05d27e9c74bd020961b09c406837cc2de8558b6abca63336857c0206c41825101afa9f3eef91280afbd7147733cb811e5469213
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.1.1.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.1.1.ebuild
deleted file mode 100644
index 3605ffdf1dad..000000000000
--- a/sys-libs/gwenhywfar/gwenhywfar-5.1.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_rc/rc}"
-inherit qmake-utils
-
-DESCRIPTION="Multi-platform helper library for other libraries"
-HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/233/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/79" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
-
-REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-COMMON_DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-libs/libgpg-error
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-libs/gnutls:=
-	virtual/libiconv
-	virtual/libintl
-	virtual/opengl
-	designer? ( dev-qt/designer:5 )
-	fox? ( x11-libs/fox:1.6 )
-	gtk? ( x11-libs/gtk+:3 )
-	qml? ( dev-qt/qtdeclarative:5 )
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtmultimedia:5[widgets]
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	sensors? ( dev-qt/qtsensors:5 )
-	serialport? ( dev-qt/qtserialport:5 )
-	webkit? ( dev-qt/qtwebkit:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( !<app-office/gnucash-3.7[aqbanking] )
-"
-
-# broken upstream, reported but got no reply
-RESTRICT+=" test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	disableQtModule() {
-		local module
-		for module in ${@}; do
-			sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die
-		done
-	}
-
-	use designer || disableQtModule designer uitools
-	use qml || disableQtModule qml qmltest
-	use sensors || disableQtModule sensors
-	use serialport || disableQtModule serialport
-	use test || disableQtModule testlib
-	use webkit || disableQtModule webkit webkitwidgets
-
-	local guis=()
-	use fox && guis+=( fox16 )
-	use gtk && guis+=( gtk3 )
-	use qt5 && guis+=( qt5 )
-
-	local myeconfargs=(
-		--enable-ssl
-		--with-docpath="${EPREFIX}/usr/share/doc/${PF}/apidoc"
-		$(use_enable debug)
-		$(use_enable doc full-doc)
-	)
-	use qt5 && myeconfargs+=(
-		--with-qt5-moc="$(qt5_get_bindir)/moc"
-		--with-qt5-qmake="$(qt5_get_bindir)/qmake"
-	)
-
-	guis_config="--with-guis=${guis[@]}"
-	econf "${myeconfargs[@]}" "${guis_config}"
-}
-
-src_compile() {
-	emake
-	use doc && emake srcdoc
-}
-
-src_install() {
-	default
-	use doc && emake DESTDIR="${D}" install-srcdoc
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-libs/gwenhywfar/gwenhywfar-5.0.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
index fcf317f80675..15912e502337 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-5.0.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-5.1.2.ebuild
@@ -8,7 +8,7 @@ inherit qmake-utils
 
 DESCRIPTION="Multi-platform helper library for other libraries"
 HOMEPAGE="https://www.aquamaniac.de/sites/aqbanking/index.php"
-SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/228/${MY_P}.tar.gz"
+SRC_URI="https://www.aquamaniac.de/rdm/attachments/download/234/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/79" # correspond with libgwenhywfar.so version
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 10f17fd6eb56..fe7cba9ea732 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,4 +1,5 @@
 AUX libapparmor-2.10-symbol_visibility.patch 219 BLAKE2B 37bb9ceabfedde6f21e313fcc6a85563fdeca86863e681fa40689b5ce8cb5bdf87947c19b176d7f96edac562b6420a0ae6aae717967782e1bd1bb6ffd4782671 SHA512 93c5e19a6cdfce232a71f9b33b1e96dff44b947c06fc6e348a31038ef78bec7b90e49698681a4010bffd4274ff17a304542b549a8840458b3ab17d4ef1b53d36
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
+EBUILD libapparmor-2.13.3-r1.ebuild 2133 BLAKE2B 6374cecb54ac8292643d6e1bf3f8e52c9db840601c5bef2b90e3d3dc52b1f84b11fb0bcd49032764a7a81d944709a3c844373baa0e24759492070d97316aa7b9 SHA512 cafbdac2319d12e73054e51933638765472bd4bf0400ca38aba30080ecdb5a706bafe58a2403622b3081d7d74684799dea5196fecbfb4d009ef0553fa716ac72
 EBUILD libapparmor-2.13.3.ebuild 2075 BLAKE2B e5e3629d88cc385eaa092cdfa67970653f2d0701e8883b85eb02edde2a4e4ccc91cb4ded02b554c634c549e3916e38d84f9aaad10fc81c697d359c386ed7d22a SHA512 8a7eacc77473a236ea038f3a280c8fd39c125eaec84cd1f84d86a7843d27abf25f8f3ef772aad34527724120f56c39c5b304da17a99e6ac70459462b97b0e5df
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-libs/libapparmor/libapparmor-2.13.3-r1.ebuild b/sys-libs/libapparmor/libapparmor-2.13.3-r1.ebuild
new file mode 100644
index 000000000000..e47d13d2ba59
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-2.13.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools distutils-r1 perl-functions
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+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 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~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
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+PATCHES=( "${FILESDIR}/${PN}-2.10-symbol_visibility.patch" )
+
+# depends on the package already being installed
+RESTRICT="test"
+
+src_prepare() {
+	rm -r m4 || die "failed to remove bundled macros"
+	default
+	eautoreconf
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with perl) \
+		$(use_with python)
+}
+
+src_compile() {
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
+
+	if use perl ; then
+		emake DESTDIR="${D}" -C swig/perl install
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		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
+}