summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-03 18:44:35 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-03 18:44:35 +0000
commit2edf958a01d6ea3e32abae5cc82c455ea5298f76 (patch)
tree94f81d602511cf3a613f64ca8f25da819124b413 /sys-apps
parentRemove old versions that don't work with newer rdoc versions. (diff)
downloadgentoo-2-2edf958a01d6ea3e32abae5cc82c455ea5298f76.tar.gz
gentoo-2-2edf958a01d6ea3e32abae5cc82c455ea5298f76.tar.bz2
gentoo-2-2edf958a01d6ea3e32abae5cc82c455ea5298f76.zip
Fix handling of selinux searching cache vars #397443 by Amadeusz Sławiński.
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/sed/ChangeLog8
-rw-r--r--sys-apps/sed/sed-4.2.1-r1.ebuild7
-rw-r--r--sys-apps/sed/sed-4.2.1.ebuild7
3 files changed, 14 insertions, 8 deletions
diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 3146af2ae2f1..d290dd870186 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/sed
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.112 2011/12/31 07:33:57 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.113 2012/01/03 18:44:35 vapier Exp $
+
+ 03 Jan 2012; Mike Frysinger <vapier@gentoo.org> sed-4.2.1.ebuild,
+ sed-4.2.1-r1.ebuild:
+ Fix handling of selinux searching cache vars #397443 by Amadeusz Sławiński.
31 Dec 2011; Mike Frysinger <vapier@gentoo.org> sed-4.2.1.ebuild,
sed-4.2.1-r1.ebuild:
diff --git a/sys-apps/sed/sed-4.2.1-r1.ebuild b/sys-apps/sed/sed-4.2.1-r1.ebuild
index 6a3efffa1e3a..be8e92d9391d 100644
--- a/sys-apps/sed/sed-4.2.1-r1.ebuild
+++ b/sys-apps/sed/sed-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1-r1.ebuild,v 1.2 2011/12/31 07:33:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1-r1.ebuild,v 1.3 2012/01/03 18:44:35 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -51,7 +51,8 @@ src_compile() {
bindir=/usr/bin
fi
- export ac_cv_{search_setfilecon,header_selinux_{context,selinux}_h}=$(usex selinux)
+ export ac_cv_search_setfilecon=$(usex selinux -lselinux)
+ export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
use static && append-ldflags -static
econf \
--bindir=${bindir} \
diff --git a/sys-apps/sed/sed-4.2.1.ebuild b/sys-apps/sed/sed-4.2.1.ebuild
index 8ebd8cd5dfa4..7538d1ba57df 100644
--- a/sys-apps/sed/sed-4.2.1.ebuild
+++ b/sys-apps/sed/sed-4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1.ebuild,v 1.10 2011/12/31 07:33:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.2.1.ebuild,v 1.11 2012/01/03 18:44:35 vapier Exp $
inherit eutils flag-o-matic toolchain-funcs
@@ -50,7 +50,8 @@ src_compile() {
bindir=/usr/bin
fi
- export ac_cv_{search_setfilecon,header_selinux_{context,selinux}_h}=$(usex selinux)
+ export ac_cv_search_setfilecon=$(usex selinux -lselinux)
+ export ac_cv_header_selinux_{context,selinux}_h=$(usex selinux)
use static && append-ldflags -static
econf \
--bindir=${bindir} \