Version bump

(Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

3 files changed, 370 insertions, 1 deletions

diff --git a/dev-lisp/sbcl/ChangeLog b/dev-lisp/sbcl/ChangeLog
index c7f11d6c4313..b4304d2e4477 100644
--- a/dev-lisp/sbcl/ChangeLog
+++ b/dev-lisp/sbcl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.210 2014/10/20 14:51:55 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lisp/sbcl/ChangeLog,v 1.211 2014/12/20 15:37:16 grozin Exp $
+
+*sbcl-1.2.6 (20 Dec 2014)
+
+  20 Dec 2014; Andrey Grozin <grozin@gentoo.org> +sbcl-1.2.6.ebuild,
+  +files/bsd-sockets-test-1.2.6.patch:
+  Version bump
 
 *sbcl-1.2.4 (20 Oct 2014)
 
diff --git a/dev-lisp/sbcl/files/bsd-sockets-test-1.2.6.patch b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.6.patch
new file mode 100644
index 000000000000..7852979384be
--- /dev/null
+++ b/dev-lisp/sbcl/files/bsd-sockets-test-1.2.6.patch
@@ -0,0 +1,157 @@
+diff -r -U1 sbcl-1.2.6.orig/contrib/sb-bsd-sockets/tests.lisp sbcl-1.2.6/contrib/sb-bsd-sockets/tests.lisp
+--- sbcl-1.2.6.orig/contrib/sb-bsd-sockets/tests.lisp	2014-11-30 00:56:58.000000000 +0600
++++ sbcl-1.2.6/contrib/sb-bsd-sockets/tests.lisp	2014-12-20 20:02:26.863408300 +0600
+@@ -37,11 +37,11 @@
+ ;;; for unknown protocols...
+-#-(and freebsd sb-thread)
+-#-(and dragonfly sb-thread)
+-(deftest get-protocol-by-name/error
+-  (handler-case (get-protocol-by-name "nonexistent-protocol")
+-    (unknown-protocol ()
+-      t)
+-    (:no-error ()
+-      nil))
+-  t)
++;#-(and freebsd sb-thread)
++;#-(and dragonfly sb-thread)
++;(deftest get-protocol-by-name/error
++;  (handler-case (get-protocol-by-name "nonexistent-protocol")
++;    (unknown-protocol ()
++;      t)
++;    (:no-error ()
++;      nil))
++;  t)
+ 
+@@ -93,13 +93,13 @@
+ 
+-#-win32
+-(deftest make-inet6-socket.smoke
+-  (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
+-    (and (> (socket-file-descriptor s) 1) t))
+-  t)
+-
+-#-win32
+-(deftest make-inet6-socket.keyword
+-  (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
+-    (and (> (socket-file-descriptor s) 1) t))
+-  t)
++;#-win32
++;(deftest make-inet6-socket.smoke
++;  (let ((s (make-instance 'inet6-socket :type :stream :protocol (get-protocol-by-name "tcp"))))
++;    (and (> (socket-file-descriptor s) 1) t))
++;  t)
++
++;#-win32
++;(deftest make-inet6-socket.keyword
++;  (let ((s (make-instance 'inet6-socket :type :stream :protocol :tcp)))
++;    (and (> (socket-file-descriptor s) 1) t))
++;  t)
+ 
+@@ -131,22 +131,22 @@
+ 
+-#-win32
+-(deftest inet6-socket-bind
+-    (let* ((tcp (get-protocol-by-name "tcp"))
+-           (address (make-inet6-address "::1"))
+-           (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
+-           (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
+-      (unwind-protect
+-           ;; Given the functions we've got so far, if you can think of a
+-           ;; better way to make sure the bind succeeded than trying it
+-           ;; twice, let me know
+-           (progn
+-             (socket-bind s1 address 0)
+-             (handler-case
+-                 (let ((port (nth-value 1 (socket-name s1))))
+-                   (socket-bind s2 address port)
+-                   nil)
+-               (address-in-use-error () t)))
+-        (socket-close s1)
+-        (socket-close s2)))
+-  t)
++;#-win32
++;(deftest inet6-socket-bind
++;    (let* ((tcp (get-protocol-by-name "tcp"))
++;           (address (make-inet6-address "::1"))
++;           (s1 (make-instance 'inet6-socket :type :stream :protocol tcp))
++;           (s2 (make-instance 'inet6-socket :type :stream :protocol tcp)))
++;      (unwind-protect
++;           ;; Given the functions we've got so far, if you can think of a
++;           ;; better way to make sure the bind succeeded than trying it
++;           ;; twice, let me know
++;           (progn
++;             (socket-bind s1 address 0)
++;             (handler-case
++;                 (let ((port (nth-value 1 (socket-name s1))))
++;                   (socket-bind s2 address port)
++;                   nil)
++;               (address-in-use-error () t)))
++;        (socket-close s1)
++;        (socket-close s2)))
++;  t)
+ 
+@@ -217,33 +217,33 @@
+ 
+-#-win32
+-(deftest simple-local-client
+-    (progn
+-      ;; SunOS (Solaris) and Darwin systems don't have a socket at
+-      ;; /dev/log.  We might also be building in a chroot or
+-      ;; something, so don't fail this test just because the file is
+-      ;; unavailable, or if it's a symlink to some weird character
+-      ;; device.
+-      (when (block nil
+-              (handler-bind ((sb-posix:syscall-error
+-                              (lambda (e)
+-                                (declare (ignore e))
+-                                (return nil))))
+-                (sb-posix:s-issock
+-                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
+-        (let ((s (make-instance 'local-socket :type :datagram)))
+-          (format t "Connecting ~A... " s)
+-          (finish-output)
+-          (handler-case
+-              (socket-connect s "/dev/log")
+-            (sb-bsd-sockets::socket-error ()
+-              (setq s (make-instance 'local-socket :type :stream))
+-              (format t "failed~%Retrying with ~A... " s)
+-              (finish-output)
+-              (socket-connect s "/dev/log")))
+-          (format t "ok.~%")
+-          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
+-            (format stream
+-                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
+-      t)
+-  t)
++;#-win32
++;(deftest simple-local-client
++;    (progn
++;      ;; SunOS (Solaris) and Darwin systems don't have a socket at
++;      ;; /dev/log.  We might also be building in a chroot or
++;      ;; something, so don't fail this test just because the file is
++;      ;; unavailable, or if it's a symlink to some weird character
++;      ;; device.
++;      (when (block nil
++;              (handler-bind ((sb-posix:syscall-error
++;                              (lambda (e)
++;                                (declare (ignore e))
++;                                (return nil))))
++;                (sb-posix:s-issock
++;                 (sb-posix::stat-mode (sb-posix:stat "/dev/log")))))
++;        (let ((s (make-instance 'local-socket :type :datagram)))
++;          (format t "Connecting ~A... " s)
++;          (finish-output)
++;          (handler-case
++;              (socket-connect s "/dev/log")
++;            (sb-bsd-sockets::socket-error ()
++;              (setq s (make-instance 'local-socket :type :stream))
++;              (format t "failed~%Retrying with ~A... " s)
++;              (finish-output)
++;              (socket-connect s "/dev/log")))
++;          (format t "ok.~%")
++;          (let ((stream (socket-make-stream s :input t :output t :buffering :none)))
++;            (format stream
++;                    "<7>bsd-sockets: Don't panic.  We're testing local-domain client code; this message can safely be ignored"))))
++;      t)
++;  t)
+ 
diff --git a/dev-lisp/sbcl/sbcl-1.2.6.ebuild b/dev-lisp/sbcl/sbcl-1.2.6.ebuild
new file mode 100644
index 000000000000..0d5fb3379944
--- /dev/null
+++ b/dev-lisp/sbcl/sbcl-1.2.6.ebuild
@@ -0,0 +1,206 @@
+# 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.6.ebuild,v 1.1 2014/12/20 15:37:16 grozin Exp $
+
+EAPI=5
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.0.58
+BV_AMD64=1.2.6
+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"
+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 )
+	amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 )
+	ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 )
+	sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 )
+	alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+DEPEND="${CDEPEND}
+		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+		pax_kernel? ( sys-apps/paxctl sys-apps/elfix )"
+RDEPEND="${CDEPEND}
+		 elibc_glibc? ( >=sys-libs/glibc-2.6 )"
+
+# Disable warnings about executable stacks, as this won't be fixed soon by upstream
+QA_EXECSTACK="usr/bin/sbcl"
+
+CONFIG="${S}/customize-target-features.lisp"
+ENVD="${T}/50sbcl"
+
+# Prevent ASDF from using the system libraries
+CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)"
+ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)"
+
+usep() {
+	use ${1} && echo "true" || echo "false"
+}
+
+sbcl_feature() {
+	echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}"
+}
+
+sbcl_apply_features() {
+	sed 's/^X//' > "${CONFIG}" <<-'EOF'
+	(lambda (list)
+	X  (flet ((enable  (x) (pushnew x list))
+	X         (disable (x) (setf list (remove x list))))
+	EOF
+	if use x86 || use amd64; then
+		sbcl_feature "$(usep threads)" ":sb-thread"
+	fi
+	sbcl_feature "true" ":sb-ldb"
+	sbcl_feature "false" ":sb-test"
+	sbcl_feature "$(usep unicode)" ":sb-unicode"
+	sbcl_feature "$(usep zlib)" ":sb-core-compression"
+	sbcl_feature "$(usep debug)" ":sb-xref-for-internals"
+	sed 's/^X//' >> "${CONFIG}" <<-'EOF'
+	X    )
+	X  list)
+	EOF
+	cat "${CONFIG}"
+}
+
+src_unpack() {
+	unpack ${A}
+	mv sbcl-*-linux sbcl-binary || die
+	cd "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gentoo-fix_install_man.patch
+	# bug #468482
+	epatch "${FILESDIR}/concurrency-test-${PV}.patch"
+	# bugs #486552, #527666
+	epatch "${FILESDIR}"/bsd-sockets-test-${PV}.patch
+
+	# To make the hardened compiler NOT compile with -fPIE -pie
+	if gcc-specs-pie ; then
+		einfo "Disabling PIE..."
+		epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch
+	fi
+
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die
+
+	use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk
+
+	# Some shells(such as dash) don't have "time" as builtin
+	# and we don't want to DEPEND on sys-process/time
+	sed "s,^time ,," -i make.sh || die
+	sed "s,/lib,/$(get_libdir),g" -i install.sh || die
+	# #define SBCL_HOME ...
+	sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c || die
+
+	find . -type f -name .cvsignore -delete
+}
+
+src_configure() {
+	# customizing SBCL version as per
+	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
+	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
+
+	# applying customizations
+	sbcl_apply_features
+}
+
+src_compile() {
+	local bindir="${WORKDIR}"/sbcl-binary
+
+	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
+
+	if host-is-pax ; then
+		# To disable PaX on hardened systems
+		pax-mark -mr "${bindir}"/src/runtime/sbcl
+
+		# Hack to disable PaX on second GENESIS stage
+		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
+
+	# clear the environment to get rid of non-ASCII strings, see bug 174702
+	# set HOME for paludis
+	env - HOME="${T}" \
+		CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \
+		CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \
+		GNUMAKE=make ./make.sh \
+		"sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \
+		|| die "make failed"
+
+	# need to set HOME because libpango(used by graphviz) complains about it
+	if use doc; then
+		env - HOME="${T}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/manual info html || die "Cannot build manual"
+		env - HOME="${T}" \
+			CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \
+			ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \
+			make -C doc/internals info html || die "Cannot build internal docs"
+	fi
+}
+
+src_test() {
+	ewarn "Unfortunately, it is known that some tests fail eg."
+	ewarn "run-program.impure.lisp. This is an issue of the upstream's"
+	ewarn "development and not of Gentoo's side. Please, before filing"
+	ewarn "any bug(s) search for older submissions. Thank you."
+	time ( cd tests && sh run-tests.sh )
+}
+
+src_install() {
+	# install system-wide initfile
+	dodir /etc/
+	sed 's/^X//' > "${D}"/etc/sbclrc <<-EOF
+	;;; The following is required if you want source location functions to
+	;;; work in SLIME, for example.
+	X
+	(setf (logical-pathname-translations "SYS")
+	X      '(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*")
+	X        ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*")))
+	X
+	;;; Setup ASDF2
+	(load "/etc/common-lisp/gentoo-init.lisp")
+	EOF
+
+	# Install documentation
+	unset SBCL_HOME
+	INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \
+		sh install.sh || die "install.sh failed"
+
+	# rm empty directories lest paludis complain about this
+	find "${D}" -empty -type d -exec rmdir -v {} +
+
+	if use doc; then
+		dohtml -r doc/manual/
+		doinfo doc/manual/*.info*
+		dohtml -r doc/internals/sbcl-internals
+		doinfo doc/internals/sbcl-internals.info
+		docinto internals-notes && dodoc doc/internals-notes/*
+	else
+		rm -Rv "${D}/usr/share/doc/${PF}" || die
+	fi
+
+	dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO
+
+	# install the SBCL source
+	if use source; then
+		./clean.sh
+		cp -av src "${D}/usr/$(get_libdir)/sbcl/" || die
+	fi
+
+	# necessary for running newly-saved images
+	echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}"
+	echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}"
+	doenvd "${ENVD}"
+}