From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F32081382C5 for ; Thu, 3 May 2018 08:55:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AB59E0956; Thu, 3 May 2018 08:55:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB83BE0956 for ; Thu, 3 May 2018 08:55:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89484335C60 for ; Thu, 3 May 2018 08:55:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECA652A for ; Thu, 3 May 2018 08:55:06 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1525337707.9ef14aef1b2368b82e01ab4e46e2a05be7559913.nimiux@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-lisp/cmucl/cmucl-21c.ebuild dev-lisp/cmucl/files/21c-build.patch dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch dev-lisp/cmucl/files/21c-execstack-fixes.patch dev-lisp/cmucl/files/cmucl-21c-build.patch dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch X-VCS-Directories: dev-lisp/cmucl/ dev-lisp/cmucl/files/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 9ef14aef1b2368b82e01ab4e46e2a05be7559913 X-VCS-Branch: master Date: Thu, 3 May 2018 08:55:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3f62cf7b-2741-45e8-a9e9-9cb867215717 X-Archives-Hash: b5955dc83bfe3d1fda42ef08bfe7fdad commit: 9ef14aef1b2368b82e01ab4e46e2a05be7559913 Author: Chema Alonso Josa gentoo org> AuthorDate: Thu May 3 08:55:07 2018 +0000 Commit: José María Alonso gentoo org> CommitDate: Thu May 3 08:55:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=9ef14aef dev-lisp/cmucl: Cleanup patches dev-lisp/cmucl/cmucl-21c.ebuild | 16 ++++++++-------- .../21c-customize-lisp-implementation-version.patch | 16 ---------------- .../files/{21c-build.patch => cmucl-21c-build.patch} | 0 ...stack-fixes.patch => cmucl-21c-execstack-fixes.patch} | 0 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild index 15054747..e2175b10 100644 --- a/dev-lisp/cmucl/cmucl-21c.ebuild +++ b/dev-lisp/cmucl/cmucl-21c.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + inherit eutils toolchain-funcs multilib MY_PV=${PV:0:3} @@ -28,9 +29,8 @@ S="${WORKDIR}" TARGET=linux-4 src_prepare() { - eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch - eapply "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch - eapply "${FILESDIR}"/${MY_PV}-build.patch + eapply "${FILESDIR}"/${P}-execstack-fixes.patch + eapply "${FILESDIR}"/${P}-build.patch eapply_user #cp "${FILESDIR}"/os-common.h src/lisp/ || die cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die @@ -39,7 +39,7 @@ src_prepare() { src_compile() { local cmuopts buildimage - if use X; then + if use X ; then cmuopts="" else cmuopts="-u" @@ -61,7 +61,7 @@ src_compile() { (compile-file "modules:defsystem/defsystem") EOF - # documentation + # Documentation if use doc; then pushd src/docs/cmu-user > /dev/null || die "directory src/docs/cmu-user does not exist" emake @@ -86,7 +86,7 @@ src_install() { if use source; then # Necessary otherwise tar will fail dodir /usr/share/common-lisp/source/${PN} - cd "${D}"/usr/share/common-lisp/source/${PN} + cd "${D}"/usr/share/common-lisp/source/${PN} || die tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \ || die "Cannot install sources" fi @@ -100,7 +100,7 @@ src_install() { insinto /etc/common-lisp doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" - # documentation + # Documentation dodoc doc/cmucl/README if use doc; then insinto /usr/share/doc/${PF} diff --git a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch deleted file mode 100644 index 8fc9278a..00000000 --- a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp ---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200 -+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100 -@@ -187,8 +187,10 @@ - - (defun lisp-implementation-version () - "Returns a string describing the implementation version." -- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version -- #+unicode _" Unicode" #-unicode "")) -+ (format nil "~X~A~A" -+ c:byte-fasl-file-version -+ #+unicode "-unicode" #-unicode "" -+ *lisp-implementation-version*)) - - (defun machine-instance () - "Returns a string giving the name of the local machine." diff --git a/dev-lisp/cmucl/files/21c-build.patch b/dev-lisp/cmucl/files/cmucl-21c-build.patch similarity index 100% rename from dev-lisp/cmucl/files/21c-build.patch rename to dev-lisp/cmucl/files/cmucl-21c-build.patch diff --git a/dev-lisp/cmucl/files/21c-execstack-fixes.patch b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch similarity index 100% rename from dev-lisp/cmucl/files/21c-execstack-fixes.patch rename to dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch