gentoo resync : 03.11.2017

3 files changed, 0 insertions, 74 deletions

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 4e86153d0a5d..93f237d06af0 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,10 +1,7 @@
-AUX apparmor-2.10-dynamic-link.patch 381 SHA256 527e91364b3482a9063a8e6802eec87c6e73fe3727960119dca6fcaa588f004d SHA512 b407e5a58ac52d6c69ddc5dd91cc1e65676fd3fbd91bd0d0591b926d6804a1d893b06bec09f2955ad77324e3177ebd05838b50b5be0eeda613378b9246ded47d WHIRLPOOL 4e746d9d43f13cbba54305479c8998a387814fac4399d01e7a5ec583a41b61db86ac3b89f13b07e6f36c9fda969db4e563a0844d597028b55749bbb98c554a7d
 AUX apparmor-2.10-makefile.patch 859 SHA256 f096dddaa00930585f50f5d0f22fb5ec1df1e3c2b91cfb9090bca2c07f15b2bd SHA512 dee07ecd82d1336692c9621688dc5bad3d17787544ff05e7a6f2d20f396071a33a093bdcc5d987f91df14af34bc8cdf3362cf38d0ce5e804afe76511d9da5eee WHIRLPOOL e92107009590906bc1cc831d6d27c47f83631186ec5c0edb1d8723c83ebf4248d2aa4795fa58da7ce79894b3d82e7625b8da9d8992c2ddd824c8cf1af7f87a1e
 AUX apparmor-2.11.1-dynamic-link.patch 391 SHA256 ae1e27145b5c5c1ee0bbefbce6417b0a388ae4f37a66ea9d646c8829b9b7460c SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c WHIRLPOOL f13a1b71b14aed5c71e57e95cc81bc53399a911cd3818de082b447a268dc218a00f383c1c3818da11aa5f0542aed07df3772d9eb55c47d023e310adea1a6520d
 AUX apparmor-init 1284 SHA256 6357f9645587de19c46d824215ca4c3be99c488e8da9bd0e403b69e33ba8ed07 SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148 WHIRLPOOL bf4da39d477c32ca5bad91ffda9938280694631cc80c4191e6ab42844b9f0e867f9c39a98a92b1a2b5a52d25c93e21142dba745026efd3e2c60ee6d8d0e61bff
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
-EBUILD apparmor-2.11.0.ebuild 1255 SHA256 c5f5110b8eee16e980c7c9a29d8e3e6802ef462ed0d649542ee1ea0ab2be4bdc SHA512 ac04e8a3b26c02a9180b237c2530dbe88d1d80c7096b53b20068a9fbfe7b431d0b4807292441d1874ae6502235659be0d033d3c5854d1df5c318ad6098595f83 WHIRLPOOL 6c8fbb727c7cacd34d4eec97cdd2b8a566245be81a51725a3af704314eeaa863809093b903a62211b7ecfaba8285406b07d380df2832c3c667541fc1bf84b53f
 EBUILD apparmor-2.11.1-r1.ebuild 1271 SHA256 e3608b3fb914afebbd2aa2986401f41c4d3b633f4ff5094103a2d9ff21ce43a9 SHA512 37183de377fd0decd3559a6da3e75c213fa9a5c5a413efa012295b7af39981dd50b7546bbfed9e4a57105c44d4a2d430925186a18b1b9c6de5fccb854d4bc0f8 WHIRLPOOL 38a36523ff818fb4e15297aee90caa3466f4c7d3fe2b08bd2e9a60bb197a74d6f624ee0ba52596c0389b62f6a31e66529b5f2aca8aac7a3369c9bdd7b67aba12
 MISC ChangeLog 3741 SHA256 e993988739c1edd3e6ad61e06dbd2dac5b0967595e44dca8d07185111b7efef0 SHA512 0d88c7d17aca58058cd07419085dd3bf45fe7738400c3ef0e6638841df198447885a17df6f279f881133945e3c2662c3186b1831dca4ddc45fc55430aa385d96 WHIRLPOOL 87421359cc81feab9dc70d519a65de5b70acf544b25c75e9c0dde7f855317e174372f4e978e10f54ee2686a4696cbd507263e16cd99443bb88e22ff8333ce2d1
 MISC ChangeLog-2015 816 SHA256 8adb7825141984a46d9827b45c51f963a65df2ff9e3c75932d8e202987a206be SHA512 9347843cd3c7414100e3efc03d4b54d37e7748a3da6b2edc8ba26d5af6c33956282a5ecb37c0c6d8f8f89477c2ec892065f93e29215da56800dc5278a64945cf WHIRLPOOL 2bb135bb2d4dd51e2a17982accda85ca30eaa00353f1239bb757f37e33172f91555508901784ff9043b8216448bbec763ab9ec84d1307a75ec613e7e3fe006f9
diff --git a/sys-apps/apparmor/apparmor-2.11.0.ebuild b/sys-apps/apparmor/apparmor-2.11.0.ebuild
deleted file mode 100644
index 99787fd94be7..000000000000
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10-makefile.patch"
-	"${FILESDIR}/${PN}-2.10-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
-
-	use doc && dodoc techdoc.pdf
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
deleted file mode 100644
index 24263d0892b2..000000000000
--- a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -87,7 +87,7 @@
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a
- AAREOBJECTS = $(AAREOBJECT)
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L.
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
-+AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread
- 
- ifdef USE_SYSTEM
-   # Using the system libapparmor so Makefile dependencies can't be used
-