From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-887954-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 9B0FA1382AC
for <garchives@archives.gentoo.org>; Mon, 20 Jun 2016 18:40:49 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 127AAE09B7;
Mon, 20 Jun 2016 18:40:48 +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 635B5E09B7
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Jun 2016 18:40:47 +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 8393233D3D0
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Jun 2016 18:40:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0480D2416
for <gentoo-commits@lists.gentoo.org>; Mon, 20 Jun 2016 18:40:43 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1466448028.358fb4c3f5094919d6f4c7222a591dfc79219032.graaff@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ruby/ruby-2.1.10.ebuild dev-lang/ruby/ruby-2.2.5.ebuild dev-lang/ruby/ruby-2.3.1.ebuild
X-VCS-Directories: dev-lang/ruby/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: 358fb4c3f5094919d6f4c7222a591dfc79219032
X-VCS-Branch: master
Date: Mon, 20 Jun 2016 18:40:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 04e3590f-a6ab-4df5-b52c-d64272d7895b
X-Archives-Hash: 1fff664248d9c973d7517e245c9b883a
commit: 358fb4c3f5094919d6f4c7222a591dfc79219032
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 18:38:34 2016 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:40:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358fb4c3
dev-lang/ruby: add back tk support
Initial patches by Arfrever Frehtes Taifersar Arahesis
in bug 497130
Package-Manager: portage-2.2.28
dev-lang/ruby/ruby-2.1.10.ebuild | 18 ++++++++++--------
dev-lang/ruby/ruby-2.2.5.ebuild | 18 ++++++++++--------
dev-lang/ruby/ruby-2.3.1.ebuild | 16 +++++++++-------
3 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild
index f49f79d..abc1932 100644
--- a/dev-lang/ruby/ruby-2.1.10.ebuild
+++ b/dev-lang/ruby/ruby-2.1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,13 +35,17 @@ SRC_URI="mirror://ruby/2.1/${MY_P}.tar.xz
LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
RDEPEND="
berkdb? ( sys-libs/db:= )
gdbm? ( sys-libs/gdbm )
ssl? ( dev-libs/openssl:0 )
socks5? ( >=net-proxy/dante-1.1.13 )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
ncurses? ( sys-libs/ncurses:0= )
readline? ( sys-libs/readline:0 )
dev-libs/libyaml
@@ -80,12 +84,7 @@ src_prepare() {
}
src_configure() {
- local myconf=
-
- # The Tk module can no longer be built because the module code is no
- # longer compatible with newer stable versions.
- # https://bugs.gentoo.org/show_bug.cgi?id=500894
- local modules="tk"
+ local modules= myconf=
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
@@ -127,6 +126,9 @@ src_configure() {
if ! use ncurses ; then
modules="${modules},curses"
fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
# Provide an empty LIBPATHENV because we disable rpath but we do not
# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
diff --git a/dev-lang/ruby/ruby-2.2.5.ebuild b/dev-lang/ruby/ruby-2.2.5.ebuild
index dea3bae..3ba1b5e 100644
--- a/dev-lang/ruby/ruby-2.2.5.ebuild
+++ b/dev-lang/ruby/ruby-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,7 +32,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
RDEPEND="
berkdb? ( sys-libs/db:= )
@@ -43,6 +43,10 @@ RDEPEND="
libressl? ( dev-libs/libressl )
)
socks5? ( >=net-proxy/dante-1.1.13 )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
ncurses? ( sys-libs/ncurses:0= )
readline? ( sys-libs/readline:0 )
dev-libs/libyaml
@@ -93,12 +97,7 @@ src_prepare() {
}
src_configure() {
- local myconf=
-
- # The Tk module can no longer be built because the module code is no
- # longer compatible with newer stable versions.
- # https://bugs.gentoo.org/show_bug.cgi?id=500894
- local modules="tk"
+ local modules= myconf=
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
@@ -140,6 +139,9 @@ src_configure() {
if ! use ncurses ; then
modules="${modules},curses"
fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
# Provide an empty LIBPATHENV because we disable rpath but we do not
# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
diff --git a/dev-lang/ruby/ruby-2.3.1.ebuild b/dev-lang/ruby/ruby-2.3.1.ebuild
index df7be55..28cec17 100644
--- a/dev-lang/ruby/ruby-2.3.1.ebuild
+++ b/dev-lang/ruby/ruby-2.3.1.ebuild
@@ -32,7 +32,7 @@ SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
LICENSE="|| ( Ruby-BSD BSD-2 )"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
RDEPEND="
berkdb? ( sys-libs/db:= )
@@ -43,6 +43,10 @@ RDEPEND="
libressl? ( dev-libs/libressl )
)
socks5? ( >=net-proxy/dante-1.1.13 )
+ tk? (
+ dev-lang/tcl:0=[threads]
+ dev-lang/tk:0=[threads]
+ )
ncurses? ( sys-libs/ncurses:0= )
readline? ( sys-libs/readline:0 )
dev-libs/libyaml
@@ -89,12 +93,7 @@ src_prepare() {
}
src_configure() {
- local myconf=
-
- # The Tk module can no longer be built because the module code is no
- # longer compatible with newer stable versions.
- # https://bugs.gentoo.org/show_bug.cgi?id=500894
- local modules="tk"
+ local modules= myconf=
# -fomit-frame-pointer makes ruby segfault, see bug #150413.
filter-flags -fomit-frame-pointer
@@ -136,6 +135,9 @@ src_configure() {
if ! use ncurses ; then
modules="${modules},curses"
fi
+ if ! use tk ; then
+ modules="${modules},tk"
+ fi
# Provide an empty LIBPATHENV because we disable rpath but we do not
# need LD_LIBRARY_PATH by default since that breaks USE=multitarget