dev-lang/ruby: add back tk support

Initial patches by  Arfrever Frehtes Taifersar Arahesis
in bug 497130

Package-Manager: portage-2.2.28

diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild
index f49f79df6f221b385ffcc2e0eeca702e73019884..abc19325776cb93c3c6e74076d5f7792290818fa 100644 (file)
--- 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 dea3baeab1f2d0c1e5ffa7208543b3fb0cee170b..3ba1b5ea4f2f9c10577da15fc162429a2c82854e 100644 (file)
--- 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 df7be554468200d86aa3d79e25ce8a8d168bc726..28cec17e6917f7bd73ebccd038b5b4e56636d4e8 100644 (file)
--- 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