--- ruby-2.2.3.ebuild +++ ruby-2.2.3-r1.ebuild @@ -28,17 +28,20 @@ DESCRIPTION="An object-oriented scripting language" HOMEPAGE="http://www.ruby-lang.org/" SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz - https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" + https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET%-r*}.tar.bz2" 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 +rdoc rubytests socks5 ssl xemacs ncurses +readline" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline" RDEPEND=" berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) - ssl? ( dev-libs/openssl:0 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) socks5? ( >=net-proxy/dante-1.1.13 ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0 ) @@ -69,6 +72,8 @@ EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ epatch "${WORKDIR}/patches" + epatch "${FILESDIR}"/${PN}-2.2.3-libressl.patch + # We can no longer unbundle all of rake because rubygems now depends # on this. We leave the actual rake code around to bootstrap # rubygems, but remove the bits that would cause a file collision.