diff options
author | Fabian Groffen <grobian@gentoo.org> | 2017-06-21 13:33:38 +0200 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2017-06-21 13:33:38 +0200 |
commit | 7cfd4ca0dadd25456f597a08e328247527659dbd (patch) | |
tree | f0808f2fa1a7bdfc7890b0d7e0c97c2aaef9cd83 /dev-lang/ruby | |
parent | dev-lang/ocaml: migrate to gx86 (diff) | |
download | prefix-7cfd4ca0dadd25456f597a08e328247527659dbd.tar.gz prefix-7cfd4ca0dadd25456f597a08e328247527659dbd.tar.bz2 prefix-7cfd4ca0dadd25456f597a08e328247527659dbd.zip |
dev-lang/ruby: bump to 2.4.1, bug #619414
Package-Manager: Portage-2.3.6-prefix, Repoman-2.3.2
Diffstat (limited to 'dev-lang/ruby')
-rw-r--r-- | dev-lang/ruby/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/ruby/ruby-2.4.1-r2.ebuild (renamed from dev-lang/ruby/ruby-2.0.0_p643.ebuild) | 107 |
2 files changed, 61 insertions, 50 deletions
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index a39d41cd12..98f3bf0a8f 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -1,6 +1,6 @@ -DIST ruby-2.0.0-p643.tar.xz 8318532 SHA256 73f6d939beda8865e12069689ddabd2658b3f637a9adebeee5e374388715c432 SHA512 edcff2154eec9c8a84d4c5eac8ffb370e273a5e949923009756cbc069a7ef52de5c91981bd726ae5043bc2784d8ff5080444bc29d0693abc08ff66a8783a7cbc WHIRLPOOL 973d53a1e357714776159016a792cb24d34b48194547e1f30124003df20221775fd385b16e09aac6a2cab3954c3a2416d65b0c1bc2c12e4f49609d653ea7fbe8 DIST ruby-2.1.5.tar.xz 9371780 SHA256 22ba1eb8d475c9ed7e0541418d86044c1ea4c093ab79c300c38fc0f721afe9a3 SHA512 8a257da64158d49bc2810695baf4b5849ef83e3dde452bf1e4823e52e8261225427d729fce2fb4e9b53d6d17ca9c96d491f242535c2f963738b74f90944e2a0b WHIRLPOOL 7dab5db91e56ba95a221c456fbcebfb86aff038a084b7638f504e91e4c9b45a0ad7ee0296d6531281c33d75a31ee4f5ad05af6567a93034316f3992ebc5d6bf3 DIST ruby-2.2.1.tar.xz 10320352 SHA256 3b2852c07fdc12d0ba2b5698c7587ae2b46141539a526d143da5860b55a626c0 SHA512 853517426cd4735bab42298a13cef6f4864b6f8787c3985eaa39a4d1efb40e121bdb51e874b567f0ec339fe001920bcd165067633992b2be30e7804191559151 WHIRLPOOL fdf6c064470172f366902c6d0896f25dfeea2690c0b184cc42ef65f8389a531ec8209551757cc3654fd4da54cb2055c687d3aca0a9716955586f50446ad0f26d -DIST ruby-patches-2.0.0_p643.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512 423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd WHIRLPOOL 9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e +DIST ruby-2.4.1.tar.xz 9939188 SHA256 4fc8a9992de3e90191de369270ea4b6c1b171b7941743614cc50822ddc1fe654 SHA512 e6fd290b6edd166348b70f0f1c56f7ed9d956c4c1eb91d97d0548041ca4196b9b75ec1ad35c745bdbfd4de195899093e7205d7f02b014ecf1c48e6f31cf25903 WHIRLPOOL b45a6e3bd70e6ef802d084ad87ad0eddd85932e07939bd6ed6a2e6944aa289f231971fedd7d1eece792becb08312f37b80073a2a9df070f61f32747c0708523e DIST ruby-patches-2.1.5.tar.bz2 2310 SHA256 1743dc0cec0adc1a0b5d90b0ed7908f888b8251b7a414049a57e6e32e01e4ad6 SHA512 b695621d210a7afc6704dd480bf3e7fc559174ebf240d2287338d60537ba45e5bf0f5defac6b254064d4b28077e2b97ef23b7eadc1bfa1a6bf2c616e828f937c WHIRLPOOL e9fde062fc04e4e22aec2dc55250f9007c64b07c7d03875b4073c19af9cfb0ae735d6dcb2b65bd1465a457cf0ff0602866600b5af1d520df3efc8a418763ab5b DIST ruby-patches-2.2.1.tar.bz2 2267 SHA256 0ad98acf3d3f9128c2471e360d4cef0c8967ef2feb59c18f8a781a94c13f349f SHA512 af533ae77b0149bceb04d544b2a6f6c0bd4bcbef53912b233452a7eeda1ecb9cd53aed1631ba9414e76eb0f960e9248fb82525ce5caf843aaad2ebf654cf74ce WHIRLPOOL c495f4e95c1709da1c91b5f7b42b9bc03dfed3849fb7b51ac120fbaae1dabdc99e631e60455f86f91f64eb113c9b24cbeb857efc84c128406350938e01bdb291 +DIST ruby-patches-2.4.1-r2.tar.bz2 4030 SHA256 f1beac832d3bd94b8a0be137da845ce96edd574be61f25945150e9a351e4ee73 SHA512 e3f141710a23e4716696fdd5fd898386b32ce6e9d729738591bde8a74f9af8353e0a3f5f9c48403443c6c1ee074b5c2f3b5e9503d96b57de5c6c484ccb337b40 WHIRLPOOL 327404741b8448f7d49ad3ca3cfe915b60881348fc98e18027276f26d4381237f67b7f8d849df765e76184c2f4a92861b585ddf9b25dcb485e4ac5e2b4ad43cd diff --git a/dev-lang/ruby/ruby-2.0.0_p643.ebuild b/dev-lang/ruby/ruby-2.4.1-r2.ebuild index ab1c46d408..abfddaf39a 100644 --- a/dev-lang/ruby/ruby-2.0.0_p643.ebuild +++ b/dev-lang/ruby/ruby-2.4.1-r2.ebuild @@ -1,21 +1,18 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-2.0.0_p643.ebuild,v 1.2 2015/03/31 18:33:50 ulm Exp $ -EAPI=5 +EAPI=6 #PATCHSET=1 inherit autotools eutils flag-o-matic multilib versionator -RUBYPL=$(get_version_component_range 4) - -MY_P="${PN}-$(get_version_component_range 1-3)-${RUBYPL:-0}" +MY_P="${PN}-$(get_version_component_range 1-3)" S=${WORKDIR}/${MY_P} SLOT=$(get_version_component_range 1-2) MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) -RUBYVERSION=2.0.0 +RUBYVERSION=${SLOT}.0 if [[ -n ${PATCHSET} ]]; then if [[ ${PVR} == ${PV} ]]; then @@ -29,71 +26,80 @@ fi DESCRIPTION="An object-oriented scripting language" HOMEPAGE="http://www.ruby-lang.org/" -SRC_URI="mirror://ruby/2.0/${MY_P}.tar.xz - http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz + https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" LICENSE="|| ( Ruby-BSD BSD-2 )" KEYWORDS="~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs ncurses +readline cpu_flags_x86_sse2" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs" RDEPEND=" - berkdb? ( sys-libs/db ) + berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) - ssl? ( dev-libs/openssl ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) socks5? ( >=net-proxy/dante-1.1.13 ) - ncurses? ( sys-libs/ncurses ) - readline? ( sys-libs/readline ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) dev-libs/libyaml virtual/libffi sys-libs/zlib - >=app-eselect/eselect-ruby-20100402 + >=app-eselect/eselect-ruby-20161226 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1" DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24] + >=dev-ruby/minitest-5.10.1[ruby_targets_ruby24] + >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24] + >=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24] + >=dev-ruby/rake-12.0.0[ruby_targets_ruby24] + >=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24] + >=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24] +" + PDEPEND=" - virtual/rubygems[ruby_targets_ruby20] - >=dev-ruby/json-1.7.7[ruby_targets_ruby20] - >=dev-ruby/rake-0.9.6[ruby_targets_ruby20] - rdoc? ( >=dev-ruby/rdoc-4.0.0[ruby_targets_ruby20] ) + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby24] + >=dev-ruby/json-2.0.2[ruby_targets_ruby24] + rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] ) xemacs? ( app-xemacs/ruby-modes )" src_prepare() { epatch "${FILESDIR}/${PN}-1.9.1-prefix.patch" - - if use cpu_flags_x86_sse2 ; then - excluded_patches="012_no_forced_sse2.patch" - fi - - EPATCH_EXCLUDE="${excluded_patches}" EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ epatch "${WORKDIR}/patches" - # 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. einfo "Unbundling gems..." cd "$S" - rm -r \ - {bin,lib}/rake lib/rake.rb man/rake.1 \ - bin/gem || die "removal failed" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. Use explicit version numbers to ensure rm fails when they + # change so we can update dependencies accordingly. + rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die + + einfo "Removing bundled libraries..." + rm -fr ext/fiddle/libffi-3.2.1 || die # Fix a hardcoded lib path in configure script sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ configure.in || die "sed failed" - # Fix hardcoded SHELL var in mkmf library sed -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" -i lib/mkmf.rb + eapply_user + eautoreconf } 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 @@ -120,9 +126,6 @@ src_configure() { use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" # Determine which modules *not* to build depending in the USE flags. - if ! use readline ; then - modules="${modules},readline" - fi if ! use berkdb ; then modules="${modules},dbm" fi @@ -132,11 +135,14 @@ src_configure() { if ! use ssl ; then modules="${modules},openssl" fi - if ! use ncurses ; then - modules="${modules},curses" + if ! use tk ; then + modules="${modules},tk" fi - INSTALL="${EPREFIX}/usr/bin/install -c" econf \ + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ --program-suffix=${MY_SUFFIX} \ --with-soname=ruby${MY_SUFFIX} \ --docdir=${EPREFIX}/usr/share/doc/${P} \ @@ -144,9 +150,13 @@ src_configure() { --enable-pthread \ --disable-rpath \ --with-out-ext="${modules}" \ + $(use_with jemalloc jemalloc) \ $(use_enable socks5 socks) \ $(use_enable doc install-doc) \ --enable-ipv6 \ + $(use_enable static-libs static) \ + $(use_enable static-libs install-static-library) \ + $(use_with static-libs static-linked-ext) \ $(use_enable debug) \ ${myconf} \ --with-readline-dir="${EPREFIX}"/usr \ @@ -187,7 +197,7 @@ src_install() { local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" @@ -196,10 +206,11 @@ src_install() { emake V=1 DESTDIR="${D}" install || die "make install failed" - # Remove installed rubygems copy - rm -r "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" - rm -r "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" - rm -r "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + # Remove installed rubygems and rdoc copy + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" if use doc; then make DESTDIR="${D}" install-doc || die "make install-doc failed" |