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 F2DEC1382DE for ; Mon, 27 Jun 2016 16:09:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3113214088; Mon, 27 Jun 2016 16:09:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B255814088 for ; Mon, 27 Jun 2016 16:09:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3A76340D19 for ; Mon, 27 Jun 2016 16:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5A962417 for ; Mon, 27 Jun 2016 16:09:02 +0000 (UTC) From: "Austin English" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Austin English" Message-ID: <1467043718.d3bce60414f651b5044d8276ad9c3e3f5afe9e15.wizardedit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/, dev-scheme/guile/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch dev-scheme/guile/guile-2.0.0.ebuild X-VCS-Directories: dev-scheme/guile/files/ dev-scheme/guile/ X-VCS-Committer: wizardedit X-VCS-Committer-Name: Austin English X-VCS-Revision: d3bce60414f651b5044d8276ad9c3e3f5afe9e15 X-VCS-Branch: master Date: Mon, 27 Jun 2016 16:09:02 +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: 01a5623c-4f9d-493b-9b00-ef61b8698030 X-Archives-Hash: 763fd3e55669a6d8302688aa68d104a9 commit: d3bce60414f651b5044d8276ad9c3e3f5afe9e15 Author: Austin English gentoo org> AuthorDate: Thu Jun 23 09:01:48 2016 +0000 Commit: Austin English gentoo org> CommitDate: Mon Jun 27 16:08:38 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3bce604 dev-scheme/guile: fix guile-2.0.0 building with clang Also update to EAPI=6 .../files/guile-2.0.0-clang-apicontrol-texi.patch | 12 +++++++++ dev-scheme/guile/guile-2.0.0.ebuild | 31 +++++++++------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch b/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch new file mode 100644 index 0000000..cbd3f46 --- /dev/null +++ b/dev-scheme/guile/files/guile-2.0.0-clang-apicontrol-texi.patch @@ -0,0 +1,12 @@ +--- a/doc/ref/api-control.texi 2016-06-23 03:35:29.973976657 -0500 ++++ b/doc/ref/api-control.texi 2016-06-23 03:33:36.589969005 -0500 +@@ -1492,8 +1492,8 @@ + @deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}) + @deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}, const char *@var{expected}) + @deftypefnx {C Function} void scm_memory_error (char *@var{subr}) +-Throw an error with the various keys described above. + @deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const char *@var{message}, SCM @var{args}) ++Throw an error with the various keys described above. + + In @code{scm_wrong_num_args}, @var{proc} should be a Scheme symbol + which is the name of the procedure incorrectly invoked. The other diff --git a/dev-scheme/guile/guile-2.0.0.ebuild b/dev-scheme/guile/guile-2.0.0.ebuild index 59f04c6..e5204ae 100644 --- a/dev-scheme/guile/guile-2.0.0.ebuild +++ b/dev-scheme/guile/guile-2.0.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=3 -inherit eutils flag-o-matic elisp-common +EAPI=6 +inherit flag-o-matic elisp-common DESCRIPTION="GNU Ubiquitous Intelligent Language for Extensions" HOMEPAGE="https://www.gnu.org/software/guile/" @@ -29,11 +29,15 @@ DEPEND="${RDEPEND} SLOT="2" MAJOR="2.0" +PATCHES=( + "${FILESDIR}/${P}-clang-apicontrol-texi.patch" + ) + src_configure() { # see bug #178499 filter-flags -ftree-vectorize - #will fail for me if posix is disabled or without modules -- hkBst + # will fail for me if posix is disabled or without modules -- hkBst econf \ --disable-error-on-warning \ --disable-static \ @@ -51,26 +55,15 @@ src_configure() { # EMACS=no } -src_compile() { - emake || die "make failed" - - # Above we have disabled the build system's Emacs support; - # for USE=emacs we compile (and install) the files manually - # if use emacs; then - # cd emacs - # make - # elisp-compile *.el || die - # fi -} - src_install() { - einstall || die "install failed" + default - dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS || die + dodoc GUILE-VERSION HACKING # texmacs needs this, closing bug #23493 dodir /etc/env.d - echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile + echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" \ + > "${ED}"/etc/env.d/50guile || die # necessary for registering slib, see bug 206896 keepdir /usr/share/guile/site