[gentoo-commits] proj/musl:master commit in: dev-lang/ruby/

[Aric Belsito]

commit:     e1a442328b1bf0852bbe8c5ed0150d551ea250e7
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Dec 15 17:35:53 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Dec 15 17:35:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e1a44232

dev-lang/ruby: version bump to 2.4.3

 dev-lang/ruby/Manifest                             |  4 ++--
 dev-lang/ruby/metadata.xml                         | 24 ++++++++--------------
 .../ruby/{ruby-2.4.2.ebuild => ruby-2.4.3.ebuild}  | 16 +++++++--------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index ab202ba..72091c2 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,2 +1,2 @@
-DIST ruby-2.4.2.tar.xz 10046412 SHA256 
748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735 SHA512 
c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595
 WHIRLPOOL 
4117f18e7901700d2cf603ed60cbe9b59ca65359ec359a7616b2cf90c76c25117afe864a8a7b55e7dc52c93377c541a8b497f1b281cdccade97aafa5ca363a5b
-DIST ruby-patches-2.4.2.tar.bz2 3443 SHA256 
621e92c4c14cec458100adf74e122df76663be4f75fc4ea86423a9ac6755ea3e SHA512 
fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 WHIRLPOOL 
306a16b49037a669398fb9c1b7c2b5484860d8749bf4c12d0e5eec02e3a7f7760b48b4a3cd709e0fa2b54f3d8dddff36d7eeb8d53d2d647d59e099b0299b8ed1
+DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 
87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f
 SHA512 
8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09
+DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B 
e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9
 SHA512 
d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed

diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index c946e57..f6ffc09 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer type="project">
-    <email>r...@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <use>
-    <flag name="rubytests">
-      Install ruby tests that can only be run after ruby is installed
-    </flag>
-    <flag name="rdoc">
-      Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
-    </flag>
-    <flag name="jemalloc">
-         Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
-       </flag>
-  </use>
+       <maintainer type="project">
+               <email>r...@gentoo.org</email>
+               <name>Gentoo Ruby Project</name>
+       </maintainer>
+       <use>
+               <flag name="rubytests">Install ruby tests that can only be run 
after ruby is installed</flag>
+               <flag name="rdoc">Install <pkg>dev-ruby/rdoc</pkg> after 
installing Ruby.</flag>
+               <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for 
memory allocation.</flag>
+       </use>
 </pkgmetadata>

diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.3.ebuild
similarity index 92%
rename from dev-lang/ruby/ruby-2.4.2.ebuild
rename to dev-lang/ruby/ruby-2.4.3.ebuild
index b31ed8e..990fac0 100644
--- a/dev-lang/ruby/ruby-2.4.2.ebuild
+++ b/dev-lang/ruby/ruby-2.4.3.ebuild
@@ -198,8 +198,8 @@ src_install() {
 
        local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo 
$(MINIRUBY)'|make -f - getminiruby)
 
-       
LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-       RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+       
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"
        done
@@ -208,10 +208,10 @@ src_install() {
        emake V=1 DESTDIR="${D}" install || die "make install failed"
 
        # Remove installed rubygems and rdoc copy
-       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
+       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"
@@ -233,13 +233,13 @@ src_install() {
 }
 
 pkg_postinst() {
-       if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+       if [[ ! -n $(readlink "${EROOT}"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 "\teselect ruby set ruby(23|24|...)"
        elog
 }