Thanks to Luis Ressel for fixing and reporting Bug 517000 - dev-lisp/sbcl should not invoke paxctl directly. sed to disable PaX on second GENESIS stage needs tweak to match whitespace at start of line in sbcl-1.2.2.ebuild. Some trivial edits for some repoman QA reports.

(Portage version: 2.2.11/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

8 files changed, 32 insertions, 31 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index 1cd3faac9570..8a2a33c6c86d 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lisp/sbcl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.207 2014/08/03 04:29:08 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.208 2014/08/04 13:51:11 gienah Exp $
+
+  04 Aug 2014; Mark Wright <gienah@gentoo.org> sbcl-1.0.55-r1.ebuild,
+  sbcl-1.0.55-r2.ebuild, sbcl-1.1.15.ebuild, sbcl-1.1.16.ebuild,
+  sbcl-1.1.17.ebuild, sbcl-1.1.18.ebuild, sbcl-1.2.2.ebuild:
+  Thanks to Luis Ressel for fixing and reporting Bug 517000 - dev-lisp/sbcl
+  should not invoke paxctl directly. sed to disable PaX on second GENESIS stage
+  needs tweak to match whitespace at start of line in sbcl-1.2.2.ebuild. Some
+  trivial edits for some repoman QA reports.
 
 *sbcl-1.2.2 (03 Aug 2014)
 
diff --git a/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild b/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild
index ee43266d40e9..c180bc085fab 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
+# Copyright 1999-2014 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.7 2012/08/29 03:17:11 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.0.55-r1.ebuild,v 1.8 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=3
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -112,11 +112,10 @@ src_compile() {
 
 	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
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.0.55-r2.ebuild b/dev-lisp/sbcl/sbcl-1.0.55-r2.ebuild
index e2b77cbdc7c2..9f255585d302 100644
--- a/dev-lisp/sbcl/sbcl-1.0.55-r2.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.0.55-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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-r2.ebuild,v 1.1 2012/12/17 10:42:50 pchrist Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.0.55-r2.ebuild,v 1.2 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=3
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -114,11 +114,10 @@ src_compile() {
 
 	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
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.1.15.ebuild b/dev-lisp/sbcl/sbcl-1.1.15.ebuild
index 99ecc8f5c066..343457cc6348 100644
--- a/dev-lisp/sbcl/sbcl-1.1.15.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.15.ebuild,v 1.1 2014/01/29 13:37:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.15.ebuild,v 1.2 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -121,11 +121,10 @@ src_compile() {
 
 	if host-is-pax ; then
 		# To disable PaX on hardened systems
-		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.1.16.ebuild b/dev-lisp/sbcl/sbcl-1.1.16.ebuild
index bbd24fa68b1d..51e68f4d0fee 100644
--- a/dev-lisp/sbcl/sbcl-1.1.16.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.16.ebuild,v 1.1 2014/03/09 14:18:01 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.16.ebuild,v 1.2 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -121,11 +121,10 @@ src_compile() {
 
 	if host-is-pax ; then
 		# To disable PaX on hardened systems
-		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.1.17.ebuild b/dev-lisp/sbcl/sbcl-1.1.17.ebuild
index 832d7594e85f..c2171e92a226 100644
--- a/dev-lisp/sbcl/sbcl-1.1.17.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.17.ebuild,v 1.3 2014/04/28 07:44:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.17.ebuild,v 1.4 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -121,11 +121,10 @@ src_compile() {
 
 	if host-is-pax ; then
 		# To disable PaX on hardened systems
-		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.1.18.ebuild b/dev-lisp/sbcl/sbcl-1.1.18.ebuild
index 6aa9653f4130..4daf911eeeec 100644
--- a/dev-lisp/sbcl/sbcl-1.1.18.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.18.ebuild,v 1.2 2014/07/11 08:51:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.1.18.ebuild,v 1.3 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -121,11 +121,10 @@ src_compile() {
 
 	if host-is-pax ; then
 		# To disable PaX on hardened systems
-		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi
 
diff --git a/dev-lisp/sbcl/sbcl-1.2.2.ebuild b/dev-lisp/sbcl/sbcl-1.2.2.ebuild
index d03cabd53cee..b618d3cc9706 100644
--- a/dev-lisp/sbcl/sbcl-1.2.2.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.2.2.ebuild,v 1.1 2014/08/03 04:29:08 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/sbcl-1.2.2.ebuild,v 1.2 2014/08/04 13:51:11 gienah Exp $
 
 EAPI=5
 inherit multilib eutils flag-o-matic pax-utils
@@ -12,7 +12,7 @@ BV_PPC=1.0.28
 BV_SPARC=1.0.28
 BV_ALPHA=1.0.28
 
-DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp."
+DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp"
 HOMEPAGE="http://sbcl.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2
 	x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 )
@@ -121,11 +121,10 @@ src_compile() {
 
 	if host-is-pax ; then
 		# To disable PaX on hardened systems
-		pax-mark -C "${bindir}"/src/runtime/sbcl
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
 
 		# Hack to disable PaX on second GENESIS stage
-		sed -i -e '/load/!s/^echo \/\/doing warm.*$/&\npaxctl -C \.\/src\/runtime\/sbcl\npaxctl -mprexs \.\/src\/runtime\/sbcl/' \
+		sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\    paxmark.sh -mr \.\/src\/runtime\/sbcl' \
 			"${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime"
 	fi