[gentoo-commits] gentoo-x86 commit in eclass: pax-utils.eclass

[Anthony G. Basile (blueness)]

blueness    11/07/03 21:17:10

  Modified:             pax-utils.eclass
  Log:
  Reverted last change

Revision  Changes    Path
1.13                 eclass/pax-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/pax-utils.eclass?r1=1.12&r2=1.13

Index: pax-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pax-utils.eclass	2 Jul 2011 17:03:51 -0000	1.12
+++ pax-utils.eclass	3 Jul 2011 21:17:10 -0000	1.13
@@ -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/eclass/pax-utils.eclass,v 1.12 2011/07/02 17:03:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.13 2011/07/03 21:17:10 blueness Exp $
 
 # @ECLASS: pax-utils.eclass
 # @MAINTAINER:
@@ -25,11 +25,6 @@
 
 inherit eutils
 
-IUSE="hardened"
-
-DEPEND="hardened? ( app-misc/pax-utils
-	sys-apps/paxctl )"
-
 # Default to PT markings.
 PAX_MARKINGS=${PAX_MARKINGS:="PT"}
 
@@ -56,10 +51,6 @@
 # Either ask on the gentoo-hardened mailing list, or CC/assign hardened@g.o on
 # the bug report.
 pax-mark() {
-	# It doesn't make sense to pax-mark on non-hardened systems
-	# so we'll just do nothing.
-	use hardened || return 0;
-
 	local f flags fail=0 failures="" zero_load_alignment
 	# Ignore '-' characters - in particular so that it doesn't matter if
 	# the caller prefixes with -