[gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/files/, sys-apps/apparmor/

[Michael Palimaka]

commit:     06e069ec26d5ca1415a572fb08492218844490ab
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 18:09:50 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 25 18:10:28 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e069ec

sys-apps/apparmor: remove 2.8.x

Package-Manager: portage-2.3.0_rc1

 sys-apps/apparmor/Manifest                         |  2 -
 sys-apps/apparmor/apparmor-2.8.3.ebuild            | 46 ----------------------
 sys-apps/apparmor/apparmor-2.8.4.ebuild            | 46 ----------------------
 .../apparmor/files/apparmor-2.8.2-makefile.patch   | 34 ----------------
 4 files changed, 128 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 92dc5c7..e3a788d 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,4 +1,2 @@
 DIST apparmor-2.10.1.tar.gz 4494037 SHA256 07a76f338304baadc4ad69d025fe000b1ab4779a251ae8f338afdc13ef1e0f24 SHA512 93992c25f77bb46389160df8324c811b4c2f0fad4b425902b30ce31d6e1f3a0efe6b359c6f8348ef646f8b527584e1f19eb4f46b27fb1ba742489ad09d171278 WHIRLPOOL d59d935db520d3c59bd0398727a1151b3280c2bf56e8f978c3595f50ff06cb70aaddc0313a7d16705b8eadeb2018aeef7ce585423c3a6ed7c34dfd4e06df9c25
 DIST apparmor-2.10.tar.gz 2421759 SHA256 4d0e224257a29671b694bd9054edf0dd213aa690fd02844ecf3329b86ac506f4 SHA512 f659bc0efca3b0cf30dd5420427f0756a86bb9d5bbb12abe82aa60eb4a7ead7848a2b2d9d9ca9cea28161a9e998c9923cdea55d38755144e3d34da1a5ad52fdd WHIRLPOOL 762e2e12c6b6a9110c91a11578ef4d83a9a774b3a882a3a08ab4a5af3a16e53f66211fc6b4e68c8ef2a47ec0c312287864584640b0d2fe3c327d95525be710f8
-DIST apparmor-2.8.3.tar.gz 1534245 SHA256 84c2ca7fb6d170e5bb56270f01c9b78e78a991b9eee7fa53a9e6409ef0845c7e SHA512 c1102206fc93e09865a8cbb239164298af298175d7043efa10ab7227c23e7aef664d38fa3b67e82e2263fba9dbc0567fa659233226633b7e26ac80e2c02c78fb WHIRLPOOL 24ee03843c4cc08e63c4641784bd648f2b85e42b2528e03b3a7d80d5d6b96e1eec5ea9cfdd2d1243dc855c9a05d0661fa3336f8d95b460be3b2bceab51936086
-DIST apparmor-2.8.4.tar.gz 1539923 SHA256 98cb81b2e2e17a8034005d2612ba6c33893486fdf995626f3bb94a4a082371d6 SHA512 d9f15bbfb4cb8428cacc7669099a0ce8acf33cbf309a65fea601f1d23b6e741a403eb4f8d91a8897f1959862f8d2ca8843918e56f511f2230e88476037511177 WHIRLPOOL 0520a5295a1184754c4d4dafe8253f4c0b6c8d0145ee586f0ecdab2d86630b7d08f8fd8ae87658c5663d3410575838b01d8c1ad2faec74271153c0d7a510e35b

diff --git a/sys-apps/apparmor/apparmor-2.8.3.ebuild b/sys-apps/apparmor/apparmor-2.8.3.ebuild
deleted file mode 100644
index c0385ea..0000000
--- a/sys-apps/apparmor/apparmor-2.8.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.2-makefile.patch
-
-	# 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)" arch manpages
-	use doc && emake pdf
-}
-
-src_install() {
-	default
-
-	dodir /etc/apparmor.d
-
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
-
-	use doc && dodoc techdoc.pdf
-}

diff --git a/sys-apps/apparmor/apparmor-2.8.4.ebuild b/sys-apps/apparmor/apparmor-2.8.4.ebuild
deleted file mode 100644
index 66acf48..0000000
--- a/sys-apps/apparmor/apparmor-2.8.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-DEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.2-makefile.patch
-
-	# 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)" arch manpages
-	use doc && emake pdf
-}
-
-src_install() {
-	default
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
-
-	use doc && dodoc techdoc.pdf
-}

diff --git a/sys-apps/apparmor/files/apparmor-2.8.2-makefile.patch b/sys-apps/apparmor/files/apparmor-2.8.2-makefile.patch
deleted file mode 100644
index 0888c15..0000000
--- a/sys-apps/apparmor/files/apparmor-2.8.2-makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -31,7 +31,7 @@
- CONFDIR=/etc/apparmor
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
- LOCALEDIR=/usr/share/locale
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
- 
- YACC	:= /usr/bin/bison
- YFLAGS	:= -d
-@@ -153,7 +153,7 @@
- 	ln -s `$(CXX) -print-file-name=libstdc++.a`
- 
- apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
--	$(CXX) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
-+	$(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
- 	      ${LEXLIB}  $(AAREOBJECTS) $(AARE_LDFLAGS)
- 
- parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
-@@ -284,11 +284,9 @@
- .PHONY: install-indep
- install-indep:
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
-+	install -m 755 -d ${DESTDIR}/usr/libexec
- 	install -m 644 parser.conf $(INSTALL_CONFDIR)
--	install -m 755 -d ${DESTDIR}/var/lib/apparmor
--	install -m 755 -d $(APPARMOR_BIN_PREFIX)
--	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
-+	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
- 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
-