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

[Michael Palimaka]

commit:     01dab293acf4c1c779814b9a0b098a207b306ba1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 12:21:59 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 12:22:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01dab293

sys-apps/apparmor: revision bump resolves automagic distro detection

The automagic distro detection caused different files to be installed, for
example if /usr/bin/rpm was present.

Closes: https://bugs.gentoo.org/635908
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 .../apparmor/{apparmor-2.11.1.ebuild => apparmor-2.11.1-r1.ebuild}     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/apparmor/apparmor-2.11.1.ebuild b/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
similarity index 93%
rename from sys-apps/apparmor/apparmor-2.11.1.ebuild
rename to sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
index ce5c3943dfd..eb164b45cf3 100644
--- a/sys-apps/apparmor/apparmor-2.11.1.ebuild
+++ b/sys-apps/apparmor/apparmor-2.11.1-r1.ebuild
@@ -49,12 +49,11 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" USE_SYSTEM=1 install
+	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
 
 	dodir /etc/apparmor.d/disable
 
 	newinitd "${FILESDIR}"/${PN}-init ${PN}
-	rm "${D}"/etc/init.d/boot.apparmor || die
 
 	use doc && dodoc techdoc.pdf
 }