commit: 7cb99f95b6efeb2bea7575699ff1cb1e77481483 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Thu Mar 7 11:02:25 2019 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Mar 7 11:03:28 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb99f95
sys-apps/apparmor: remove 2.12.0 and 2.13.1-r0 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> sys-apps/apparmor/Manifest | 1 - sys-apps/apparmor/apparmor-2.12.0.ebuild | 64 ---------------------- sys-apps/apparmor/apparmor-2.13.1.ebuild | 64 ---------------------- .../apparmor/files/apparmor-2.10-makefile.patch | 25 --------- 4 files changed, 154 deletions(-) diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index 1556178a53f..af8cbc892af 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,2 +1 @@ -DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7 diff --git a/sys-apps/apparmor/apparmor-2.12.0.ebuild b/sys-apps/apparmor/apparmor-2.12.0.ebuild deleted file mode 100644 index 03c5bca122b..00000000000 --- a/sys-apps/apparmor/apparmor-2.12.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd 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}/${PV}/+download/${PN}-${MY_PV}.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-${MY_PV}/parser - -PATCHES=( - "${FILESDIR}/${PN}-2.10-makefile.patch" - "${FILESDIR}/${PN}-2.11.1-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}" DISTRO="unknown" USE_SYSTEM=1 install - - dodir /etc/apparmor.d/disable - - newinitd "${FILESDIR}/${PN}-init" ${PN} - systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service - - use doc && dodoc techdoc.pdf - - exeinto /usr/share/apparmor - doexe "${FILESDIR}/apparmor_load.sh" - doexe "${FILESDIR}/apparmor_unload.sh" -} diff --git a/sys-apps/apparmor/apparmor-2.13.1.ebuild b/sys-apps/apparmor/apparmor-2.13.1.ebuild deleted file mode 100644 index fad630e257f..00000000000 --- a/sys-apps/apparmor/apparmor-2.13.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit systemd toolchain-funcs - -MY_PV="$(ver_cut 1-2)" - -DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system" -HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"; -SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.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.13.1-makefile.patch" - "${FILESDIR}/${PN}-2.11.1-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}" DISTRO="unknown" USE_SYSTEM=1 install - - dodir /etc/apparmor.d/disable - - newinitd "${FILESDIR}/${PN}-init" ${PN} - systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service - - use doc && dodoc techdoc.pdf - - exeinto /usr/share/apparmor - doexe "${FILESDIR}/apparmor_load.sh" - doexe "${FILESDIR}/apparmor_unload.sh" -} diff --git a/sys-apps/apparmor/files/apparmor-2.10-makefile.patch b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch deleted file mode 100644 index 397534aa733..00000000000 --- a/sys-apps/apparmor/files/apparmor-2.10-makefile.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/Makefile -+++ b/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 -+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 - - YACC := /usr/bin/bison - YFLAGS := -d -@@ -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} -
