From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E5C2513888F for ; Mon, 12 Oct 2015 23:24:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFCDD21C004; Mon, 12 Oct 2015 23:24:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 23102E07FC for ; Mon, 12 Oct 2015 23:24:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3948E34086E for ; Mon, 12 Oct 2015 23:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E4471F60 for ; Mon, 12 Oct 2015 23:24:11 +0000 (UTC) From: "Ryan Hill" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ryan Hill" Message-ID: <1444692375.db9b115582ff1e2135acda0f3e74d79bc6b093fd.rhill@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/files/guile-1.8.8-readline.patch dev-scheme/guile/guile-1.8.8-r2.ebuild X-VCS-Directories: dev-scheme/guile/files/ dev-scheme/guile/ X-VCS-Committer: rhill X-VCS-Committer-Name: Ryan Hill X-VCS-Revision: db9b115582ff1e2135acda0f3e74d79bc6b093fd X-VCS-Branch: master Date: Mon, 12 Oct 2015 23:24:11 +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: 72770c7b-9095-4e8d-a1c1-50c2df7be296 X-Archives-Hash: ae7a92b4562241ec9d31808788b9ccd8 commit: db9b115582ff1e2135acda0f3e74d79bc6b093fd Author: Ryan Hill gentoo org> AuthorDate: Sat Sep 19 05:58:54 2015 +0000 Commit: Ryan Hill gentoo org> CommitDate: Mon Oct 12 23:26:15 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9b1155 dev-scheme/guile: Make building guile-readline optional (bug #392553) dev-scheme/guile/files/guile-1.8.8-readline.patch | 34 +++++++++++++++++++++++ dev-scheme/guile/guile-1.8.8-r2.ebuild | 8 ++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch new file mode 100644 index 0000000..68f64c52 --- /dev/null +++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch @@ -0,0 +1,34 @@ +Make guile-readline optional + +https://bugs.gentoo.org/392553 + +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ + # + AUTOMAKE_OPTIONS = 1.10 + +-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \ ++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \ + scripts srfi doc examples test-suite benchmark-suite lang am + + bin_SCRIPTS = guile-tools +--- a/configure.in ++++ b/configure.in +@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) + # + #-------------------------------------------------------------------- + +-AC_CONFIG_SUBDIRS(guile-readline) ++GUILE_READLINE= ++AC_ARG_ENABLE([readline], ++ [AS_HELP_STRING([--disable-readline], ++ [disable building guile-readline])], ++ if test "x$enable_readline" != xno; then ++ AC_CONFIG_SUBDIRS([guile-readline]) ++ GUILE_READLINE="guile-readline" ++ fi) ++AC_SUBST([GUILE_READLINE]) + + #-------------------------------------------------------------------- + diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild index 2856054..b638126 100644 --- a/dev-scheme/guile/guile-1.8.8-r2.ebuild +++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild @@ -11,7 +11,8 @@ SRC_URI="mirror://gnu/guile/${P}.tar.gz" LICENSE="LGPL-2.1" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="networking +regex discouraged +deprecated emacs nls debug-freelist debug-malloc debug +threads" +IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads" + RESTRICT="!regex? ( test )" RDEPEND=" @@ -19,7 +20,8 @@ RDEPEND=" dev-libs/libltdl:0= sys-devel/gettext sys-libs/ncurses:0= - emacs? ( virtual/emacs )" + emacs? ( virtual/emacs ) + readline? ( sys-libs/readline:0= )" DEPEND="${RDEPEND} sys-apps/texinfo sys-devel/libtool" @@ -36,6 +38,7 @@ src_prepare() { "${FILESDIR}/${P}-gcc5.patch" \ "${FILESDIR}/${P}-makeinfo-5.patch" \ "${FILESDIR}/${P}-gtexinfo-5.patch" \ + "${FILESDIR}/${P}-readline.patch" \ "${FILESDIR}/${P}-tinfo.patch" \ "${FILESDIR}/${P}-sandbox.patch" @@ -62,6 +65,7 @@ src_configure() { --disable-static \ --enable-posix \ $(use_enable networking) \ + $(use_enable readline) \ $(use_enable regex) \ $(use deprecated || use_enable discouraged) \ $(use_enable deprecated) \