summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2011-08-30 20:37:00 +0000
committerMatt Turner <mattst88@gentoo.org>2011-08-30 20:37:00 +0000
commitd131e01131604ebe71b376aca50f3d6cac235011 (patch)
tree3ce774c38d799b3cf944fd44e6109ac6950b3d4c
parentStable channel version bump (diff)
downloadgentoo-2-d131e01131604ebe71b376aca50f3d6cac235011.tar.gz
gentoo-2-d131e01131604ebe71b376aca50f3d6cac235011.tar.bz2
gentoo-2-d131e01131604ebe71b376aca50f3d6cac235011.zip
Don't install selinux files with USE=-selinux. Thanks to Agostino Sarubbo for noticing in bug 380783.
(Portage version: 2.1.10.3/cvs/Linux x86_64)
-rw-r--r--sys-auth/pam_mount/ChangeLog6
-rw-r--r--sys-auth/pam_mount/pam_mount-2.11.ebuild5
2 files changed, 8 insertions, 3 deletions
diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog
index 7efb1f58ad9d..b2afdc64388d 100644
--- a/sys-auth/pam_mount/ChangeLog
+++ b/sys-auth/pam_mount/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-auth/pam_mount
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.57 2011/08/25 23:44:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.58 2011/08/30 20:37:00 mattst88 Exp $
+
+ 30 Aug 2011; Matt Turner <mattst88@gentoo.org> pam_mount-2.11.ebuild:
+ Don't install selinux files with USE=-selinux. Thanks to Agostino Sarubbo for
+ noticing in bug 380783.
25 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> pam_mount-2.11.ebuild:
QA: run eautoreconf to avoid maintainer-mode rebuild.
diff --git a/sys-auth/pam_mount/pam_mount-2.11.ebuild b/sys-auth/pam_mount/pam_mount-2.11.ebuild
index 5318fc9abe50..42f89ac72835 100644
--- a/sys-auth/pam_mount/pam_mount-2.11.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.11.ebuild,v 1.3 2011/08/25 23:44:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.11.ebuild,v 1.4 2011/08/30 20:37:00 mattst88 Exp $
EAPI=4
@@ -41,6 +41,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ default
+ use selinux || rm -r "${D}"/etc/selinux
dodoc doc/*.txt
}