commit: e05319dfbb0291d84736b257ca0311c9d19bbb45
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 12:57:50 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 12:57:50 2015 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e05319df
dev-lang/ruby: bump to 2.0.0_p647-r1
Package-Manager: portage-2.2.24
RepoMan-Options: --force
dev-lang/ruby/Manifest | 10 +-
.../files/ruby-1.9.3_p484-add-asm_ioctl_h.patch | 11 --
dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild | 218 ---------------------
...2.0.0_p645.ebuild => ruby-2.0.0_p647-r1.ebuild} | 8 +-
4 files changed, 7 insertions(+), 240 deletions(-)
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 96899fa..f75c6d9 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,9 +1,5 @@
-AUX ruby-1.9.3_p484-add-asm_ioctl_h.patch 320 SHA256
d9f2357a68dfee36e5c3b428dce82234d4bcd42cf134b24d01150946e1af8c9d SHA512
8f55b2749ca63ff1b3f3b0dd0ac548f7de29bc470871637ffb666a534910b089c4290b71df57108a380b22fd92c9c230c65354d0dbad81e70a654b4a94134d89
WHIRLPOOL
b4c2aff2ce64ede5cdd0b2c70180067b0c9a8300d6d7d88ca9c3bb3645053c27229c27ed9ea67b243598c7671465e1d5ab5d2e3bec85977fac7eb421733ea8a7
AUX ruby-add-asm_ioctl_h.patch 338 SHA256
82fa2b35c1a1ae05aaf7e849bd7b6068951f65609a35de1f88fcf83f254666f2 SHA512
eba8f362cda01fed4d38515a1ce03e4c462ddb6adf686de76b3d91bc5d5484661b7be5a9080624a9fa87fffff27b65c746d7ec94d4e27dbef2f9b321fc286be1
WHIRLPOOL
9c1ac98344cd44a3f9523e7dc723ab6dceab3c1c569d2656d03fdbe7677207bbe52ed5436dcd405c33c16d623333219aa6492dcb76d94b0cf833305589312ae2
-DIST ruby-1.9.3-p551.tar.bz2 10049332 SHA256
b0c5e37e3431d58613a160504b39542ec687d473de1d4da983dabcf3c5de771e SHA512
5ea40f8c40cf116030ffdedbe436c1fdbf9a50b7bb44bc890845c9c2a885c34da711bc1a9e9694788c2f4710f7e6e0adc4410aec1ab18a25a27168f25ac3d68c
WHIRLPOOL
a4de6b7300e1f1cb22b01b1fbe0a73928baf6e5b1d083e8eb239e7696703e13774fdcb52bbb7f4253ea75b597663c43a8fbea2df7b77ed95f3fd8b2512ff1f1e
-DIST ruby-2.0.0-p645.tar.xz 8295192 SHA256
875be4f57bdbb2d2be0d64bfd8fc5022f004d55261ead8fd0cdc2e9e415e9f7b SHA512
440f8ea50f51c53f90e42a8dfd7cd41f806b290d5c12c09f84d9159ab9c95e19b036cd8a5dc788844da501b9fcd1fa8ad8352ef7417998debc1b43a61a4ea4dc
WHIRLPOOL
6201a39976f793dd3702ba580aafb881ba6e9f5cbc9d544bdddf508ca86dc14fc2970451a386ba495d16f2f68724197ef089ba02e7d1a9423870a0fa5c39cbc8
-DIST ruby-patches-1.9.3_p551-r1.tar.bz2 3685 SHA256
362d94b77c3408d200c42855868ebb5ddbee287d66bbed8e269255f9cb63418a SHA512
646a1979c1b879ef46cb195204bdcea83215f6407331f92d8caed910e03d1f426bfb203629f4bea307740742757877edae22bf9978b55cbda03921a0c25b8409
WHIRLPOOL
3001b1c6189a882a45125d04b6264e22e0bf2b773c249bf00c2cfc98dec3392ae422913d278aae289767db0aaf8782e1a7dd44e94965aa02893833d5737ad494
-DIST ruby-patches-2.0.0_p645.tar.bz2 2947 SHA256
dc173fe94af215fd2c1823f46140e4f11892dec59ce55b10ffad26b622bb6e4e SHA512
423a4fddfc8d7fd4f5b041989da343bc96ce0c3f22a448cab8cec47d4c458f4deeb83b167a0a3ae71d3be57df9b41151d1cafadd191bd3d3e9b08b32732e36cd
WHIRLPOOL
9c728e95cf01abdb48afc2ff008dc73d341096b253c664297b6780b32821c1ec406c388ce5860b5dd2ce2de862fb80b2ae45d03750045aaf13c371743f97c92e
-EBUILD ruby-1.9.3_p551-r1.ebuild 6239 SHA256
b1862a66d21f017abb64593cb0a198c2b072fb1b64f4009e02da492384f2ca47 SHA512
c8a4a57bf68a1960d57ff96b90427c743da71957c2382f9aee749fb82f6487d7fca8df57dd2b1067204a61b17be92d43ab3b18ac26cfdd77e880c9fa8f9fae8f
WHIRLPOOL
ac7f0986397e5483ebebd10503ad28c21754929cc42d322cc5d5be6b8d59e742a441a8ddd22d7384a7b70efe619756d86f6b161ae43a1e75e8795baf9d02ae1e
-EBUILD ruby-2.0.0_p645.ebuild 6570 SHA256
cef456c8f84457d5676c1a0cf6a5baa6135b7bd8fa644e6dca208436f22c3152 SHA512
ac72f539eb5d96ea1338dca6d4227fe85c942b13909ddff57cfd2027a51bf73cad101eed7acbbe9b8632e9eeb200a1f4111653003eb47f731a88e39d5201a218
WHIRLPOOL
f5d824c21cc385889cf7c1df5769e596eb121e16d5af1fce0aabdb1dad9c6a9a4a08356b76e1aad9b3820f9c36d3fb9045f1f82c87957b205c2410605cbedde5
+DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256
9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512
38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b
WHIRLPOOL
c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
+DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256
7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512
40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6
WHIRLPOOL
ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
+EBUILD ruby-2.0.0_p647-r1.ebuild 6412 SHA256
793e794ac8333125eba8bace90d0dae825ba66f64088ae07f8aa019079668ff1 SHA512
3052910cd789ec498bfc9312944d18b69517313ebb18e193094503c8d510c132da3225895fa52bffc1c5320c5e21d27199052ad88df74b521d9ef1a41c56ceb9
WHIRLPOOL
d9aa2192d62c7cd29857c10fedb8f0750503d6b9b6ea4d61a162721155b3552cc56f9090a40f16b41f58389102d3bc28b1e0ca13cfd5a1530fcef4ffe426807a
MISC metadata.xml 995 SHA256
b802a8c15353181ea4a0f93666e89dbf1cc3f01947311ef9a8cb1663281f257a SHA512
d9aac8c61fcec88cb5ab856bc9f2f16b5e428d8df610b5d56edc6f908ad178790423c1fdebd23e3ff3b210d78389e775b684e9c2a973d86cd701dafa81b51442
WHIRLPOOL
2a28317957c87d390479e4a6ac8ab121200dbaa2bd7de98f58031c17e670c8f096a2c8d9909cc2ca0d02b437ca0b1c61a789a66b39b32ffd731454c2a6e4b65e
diff --git a/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch
b/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch
deleted file mode 100644
index a15fe99..0000000
--- a/dev-lang/ruby/files/ruby-1.9.3_p484-add-asm_ioctl_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar ruby-1.9.3-p484.orig/io.c ruby-1.9.3-p484/io.c
---- ruby-1.9.3-p484.orig/io.c 2013-10-31 14:03:20.000000000 +0000
-+++ ruby-1.9.3-p484/io.c 2014-02-23 13:43:42.508302443 +0000
-@@ -17,6 +17,7 @@
- #include "internal.h"
- #include <ctype.h>
- #include <errno.h>
-+#include <asm/ioctl.h>
-
- #define free(x) xfree(x)
-
diff --git a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
b/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
deleted file mode 100644
index 4e27b1d..0000000
--- a/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.9.3_p551-r1.ebuild,v
1.11 2015/05/27 13:05:51 ago Exp $
-
-EAPI=4
-
-#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}"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-# 1.9.3 still uses 1.9.1
-RUBYVERSION=1.9.1
-
-if [[ -n ${PATCHSET} ]]; then
- if [[ ${PVR} == ${PV} ]]; then
- PATCHSET="${PV}-r0.${PATCHSET}"
- else
- PATCHSET="${PVR}.${PATCHSET}"
- fi
-else
- PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/";
-SRC_URI="mirror://ruby/1.9/${MY_P}.tar.bz2
-
http://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.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 +rdoc rubytests socks5 ssl xemacs
ncurses +readline +yaml" #libedit
-
-# libedit support is removed everywhere because of this upstream bug:
-# http://redmine.ruby-lang.org/issues/show/3698
-
-RDEPEND="
- berkdb? ( sys-libs/db )
- gdbm? ( sys-libs/gdbm )
- ssl? ( dev-libs/openssl:0 )
- socks5? ( >=net-proxy/dante-1.1.13 )
- ncurses? ( sys-libs/ncurses )
- readline? ( sys-libs/readline )
- yaml? ( dev-libs/libyaml )
- virtual/libffi
- sys-libs/zlib
- >=app-eselect/eselect-ruby-20100402
- !<dev-ruby/rdoc-3.9.4
- !<dev-ruby/rubygems-1.8.10-r1"
-# libedit? ( dev-libs/libedit )
-# !libedit? ( readline? ( sys-libs/readline ) )
-
-DEPEND="${RDEPEND}"
-PDEPEND="
- virtual/rubygems[ruby_targets_ruby19]
- rdoc? ( >=dev-ruby/rdoc-3.9.4[ruby_targets_ruby19] )
- xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}/patches"
-
- epatch "${FILESDIR}"/${PN}-1.9.3_p484-add-asm_ioctl_h.patch
- einfo "Unbundling gems..."
- cd "$S"
- rm -r \
- {bin,lib}/rake lib/rake.rb man/rake.1 \
- ext/json \
- bin/gem || die "removal failed"
-
- # 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"
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=
-
- # -fomit-frame-pointer makes ruby segfault, see bug #150413.
- filter-flags -fomit-frame-pointer
- # In many places aliasing rules are broken; play it safe
- # as it's risky with newer compilers to leave it as it is.
- append-flags -fno-strict-aliasing
- # SuperH needs this
- use sh && append-flags -mieee
-
- # Socks support via dante
- if use socks5 ; then
- # Socks support can't be disabled as long as SOCKS_SERVER is
- # set and socks library is present, so need to unset
- # SOCKS_SERVER in that case.
- unset SOCKS_SERVER
- fi
-
- # Increase GC_MALLOC_LIMIT if set (default is 8000000)
- if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
- append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
- fi
-
- # ipv6 hack, bug 168939. Needs --enable-ipv6.
- use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-# if use libedit; then
-# einfo "Using libedit to provide readline extension"
-# myconf="${myconf} --enable-libedit --with-readline"
-# elif use readline; then
-# einfo "Using readline to provide readline extension"
-# myconf="${myconf} --with-readline"
-# else
-# myconf="${myconf} --without-readline"
-# fi
- myconf="${myconf} $(use_with readline)"
-
- # Always disable tk because the module is no longer compatible with
- # stable tcl/tk: https://bugs.gentoo.org/show_bug.cgi?id=500894
- INSTALL="${EPREFIX}/usr/bin/install -c" econf \
- --program-suffix=${MY_SUFFIX} \
- --with-soname=ruby${MY_SUFFIX} \
- --enable-shared \
- --enable-pthread \
- --without-tk \
- $(use_enable socks5 socks) \
- $(use_enable doc install-doc) \
- --enable-ipv6 \
- $(use_enable debug) \
- $(use_with berkdb dbm) \
- $(use_with gdbm) \
- $(use_with ssl openssl) \
- $(use_with ncurses curses) \
- $(use_with yaml psych) \
- ${myconf} \
- --enable-option-checking=no \
- || die "econf failed"
-}
-
-src_compile() {
- emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
- emake -j1 V=1 test || die "make test failed"
-
- elog "Ruby's make test has been run. Ruby also ships with a make check"
- elog "that cannot be run until after ruby has been installed."
- elog
- if use rubytests; then
- elog "You have enabled rubytests, so they will be installed to"
- elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a
user other"
- elog "than root, and you must place them into a writeable
directory."
- elog "Then call: "
- elog
- elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
- else
- elog "Enable the rubytests USE flag to install the make check
tests"
- fi
-}
-
-src_install() {
- # Ruby is involved in the install process, we don't want interference
here.
- unset RUBYOPT
-
- local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo
$(MINIRUBY)'|make -f - getminiruby)
-
-
LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
- RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
- for d in $(find "${S}/ext" -type d) ; do
- RUBYLIB="${RUBYLIB}:$d"
- done
- export LD_LIBRARY_PATH RUBYLIB
-
- emake V=1 DESTDIR="${D}" install || die "make install failed"
-
- # Remove installed rubygems copy
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm
rubygems failed"
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm
rdoc failed"
- rm -r "${D}/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"
- fi
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r sample
- fi
-
- dodoc ChangeLog NEWS doc/NEWS* README* ToDo || die
-
- if use rubytests; then
- pushd test
- insinto /usr/share/${PN}-${SLOT}/test
- doins -r .
- popd
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
- eselect ruby set ruby${MY_SUFFIX}
- fi
-
- elog
- elog "To switch between available Ruby profiles, execute as root:"
- elog "\teselect ruby set ruby(19|20|...)"
- elog
-}
-
-pkg_postrm() {
- eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
similarity index 95%
rename from dev-lang/ruby/ruby-2.0.0_p645.ebuild
rename to dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
index 5e22ea3..5908fd1 100644
--- a/dev-lang/ruby/ruby-2.0.0_p645.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p647-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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_p645.ebuild,v 1.12
2015/05/27 13:05:51 ago Exp $
+# $Id$
EAPI=5
@@ -30,10 +30,10 @@ 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";
+
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2";
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc x86"
IUSE="berkdb debug doc examples gdbm ipv6 +rdoc rubytests socks5 ssl xemacs
ncurses +readline cpu_flags_x86_sse2"
RDEPEND="
@@ -41,7 +41,7 @@ RDEPEND="
gdbm? ( sys-libs/gdbm )
ssl? ( dev-libs/openssl:0 )
socks5? ( >=net-proxy/dante-1.1.13 )
- ncurses? ( sys-libs/ncurses )
+ ncurses? ( sys-libs/ncurses:0= )
readline? ( sys-libs/readline:0 )
dev-libs/libyaml
virtual/libffi
