Use USE flag "pax_kernel" instead of host-is-pax() function wrt #417037. tidy a bit

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 15 insertions, 18 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 4f8ed9070e8f..19caef22608f 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.176 2012/05/22 20:54:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.177 2012/05/31 01:59:54 ssuominen Exp $
+
+  31 May 2012; Samuli Suominen <ssuominen@gentoo.org> sbcl-1.0.55-r1.ebuild,
+  metadata.xml:
+  Use USE flag "pax_kernel" instead of host-is-pax() function wrt #417037
 
   22 May 2012; Brent Baude <ranger@gentoo.org> sbcl-1.0.55-r1.ebuild:
   Marking sbcl-1.0.55-r1 ppc for bug 326217
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index d81c4e75cacf..09ab7ee8c679 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -27,10 +27,9 @@ pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
   available for the x86 and amd64 platforms using an NPTL enabled
   GLIBC. SBCL 0.8.17 and later support Unicode.</longdescription>
   <use>
-	<flag name='asdf'>Include support for <pkg>dev-lisp/asdf in SBCL</pkg></flag>
-    <flag name='cobalt'>mips only: use mipsel binary instead of
-    mips big endian binary to bootstrap</flag>
-    <flag name='ldb'>Include support for the SBCL low level
-    debugger</flag>
+    <flag name='asdf'>Include support for <pkg>dev-lisp/asdf in SBCL</pkg></flag>
+    <flag name='cobalt'>mips only: use mipsel binary instead of mips big endian binary to bootstrap</flag>
+    <flag name='ldb'>Include support for the SBCL low level debugger</flag>
+    <flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
index 0e242422e337..8a7e75686423 100644
--- a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild,v 1.4 2012/05/22 20:54:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild,v 1.5 2012/05/31 01:59:54 ssuominen Exp $
 
 EAPI=3
 inherit multilib eutils flag-o-matic pax-utils
@@ -28,11 +28,11 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc ~x86"
-IUSE="+asdf ldb source +threads +unicode debug doc cobalt"
+IUSE="+asdf ldb source +threads +unicode debug doc cobalt pax_kernel"
 
-DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.3 || ( <sys-libs/glibc-2.6[nptl] >=sys-libs/glibc-2.6 ) )
-		asdf? ( >=dev-lisp/gentoo-init-0.1 )"
+DEPEND="doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+	pax_kernel? ( sys-apps/paxctl )"
+RDEPEND="asdf? ( >=dev-lisp/gentoo-init-0.1 )"
 
 # Disable warnings about executable stacks, as this won't be fixed soon by upstream
 QA_EXECSTACK="usr/bin/sbcl"
@@ -114,7 +114,7 @@ src_compile() {
 
 	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
 
-	if host-is-pax ; then
+	if use pax_kernel ; then
 		# To disable PaX on hardened systems
 		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
@@ -198,9 +198,3 @@ EOF
 	echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
 	doenvd "${ENVD}"
 }
-
-pkg_postinst() {
-	einfo "If you are upgrading from versions <1.0.55, remember"
-	einfo "to run:"
-	einfo 'source /etc/profile && env-update'
-}